[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 47a5ddc10e8bffd874f520fb6be69872b941468f
by git＠ipfire.org 14 Apr '12
by git＠ipfire.org 14 Apr '12
14 Apr '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 47a5ddc10e8bffd874f520fb6be69872b941468f (commit)
from d72c8258c21fc52ee258ecb67ea0cd3a732032fa (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 47a5ddc10e8bffd874f520fb6be69872b941468f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Apr 14 20:09:57 2012 +0200
pakfire: Update to 0.9.22.
Split into more little packages to not have
too many crap around.
-----------------------------------------------------------------------
Summary of changes:
pakfire/pakfire.nm | 75 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3a418a6..26c7bc5 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
###############################################################################
name = pakfire
-version = 0.9.21
+version = 0.9.22
release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -43,6 +43,12 @@ build
cd %{DIR_APP}/python/src/ && python -c "import _pakfire"
cd %{DIR_APP}/python/src/ && python -c "import _lzma"
end
+
+ install_cmds
+ # Remove all example repository definitions.
+ # Those will be solely provided by system-release.
+ rm -rfv %{BUILDROOT}%{sysconfdir}/pakfire/repos/*
+ end
end
packages
@@ -54,26 +60,33 @@ packages
package %{name}-common
requires
+ pygpgme
python-progressbar
python-urlgrabber
system-release
end
files
+ %{sysconfdir}/pakfire/general.conf
+ %{bindir}/pakfire-key
/usr/lib/pakfire/pakfire-multicall.py
%{libdir}/python*/site-packages/pakfire*
/usr/share/locale
end
+ configfiles = %{sysconfdir}/pakfire/general.conf
end
-
+
package %{name}-builder
- summary = The pakfire builder.
+ summary = The Pakfire builder.
description
The tools that are needed to build new pakfire packages.
end
groups += Build
requires
+ # For --rpm-requires.
+ bash >= 4.2-7
+
%{name} = %{thisver}
quality-agent = %{thisver}
cpio
@@ -81,17 +94,64 @@ packages
end
provides = pakfire-build = %{thisver}
obsoletes = pakfire-build < %{thisver}
- conflicts = build-essentials
+
+ conflicts
+ build-essentials
+ systemd-devel < 38
+ end
+
+ configfiles
+ /etc/pakfire/builder.conf
+ /etc/pakfire/distros
+ end
files
+ /etc/pakfire/builder.conf
+ /etc/pakfire/distros
%{libdir}/libpakfire_preload.so
- /usr/bin/pakfire-builder
- /usr/bin/pakfire-server
+ %{bindir}/pakfire-builder
+ %{bindir}/pakfire-server
/usr/lib/pakfire/*
!/usr/lib/pakfire/pakfire-multicall.py
end
end
+ package %{name}-client
+ summary = The Pakfire XMLRPC client.
+ description
+ The pakfire client has the power to create build jobs
+ and communicate with the Pakfire Build Service.
+ end
+
+ requires
+ pakfire-common = %{thisver}
+ end
+
+ files
+ %{sysconfdir}/pakfire/client.conf
+ %{bindir}/pakfire-client
+ end
+ configfiles = %{sysconfdir}/pakfire/client.conf
+ end
+
+ package %{name}-daemon
+ summary = The Pakfire daemon.
+ description
+ The Pakfire daemon takes build jobs from the
+ Pakfire Build Service and compiles them.
+ end
+
+ requires
+ pakfire-builder = %{thisver}
+ end
+
+ files
+ %{sysconfdir}/pakfire/daemon.conf
+ %{bindir}/pakfire-daemon
+ end
+ configfiles = %{sysconfdir}/pakfire/daemon.conf
+ end
+
package quality-agent
arch = noarch
@@ -104,7 +164,8 @@ packages
end
files
- /usr/lib/pakfire/quality-agent*
+ /usr/lib/pakfire/quality-agent
+ /usr/lib/quality-agent*
end
requires
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d72c8258c21fc52ee258ecb67ea0cd3a732032fa
by git＠ipfire.org 13 Apr '12
by git＠ipfire.org 13 Apr '12
13 Apr '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 d72c8258c21fc52ee258ecb67ea0cd3a732032fa (commit)
from 4cf37d600be0113d91ce012e4172d9b2451f2e34 (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 d72c8258c21fc52ee258ecb67ea0cd3a732032fa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 13 18:19:32 2012 +0200
gcc: Force the patch to properly enable the SSP.
-----------------------------------------------------------------------
Summary of changes:
gcc/gcc.nm | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index ed1b500..a87a9bf 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_cloog_ppl = 1
name = gcc
version = 4.6.3
-release = 3
+release = 4
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Development/Compilers
@@ -112,7 +112,8 @@ build
end
# CFLAGS for hardening.
- HARD_CFLAGS = -DEFAULT_PIE_SSP -DEFAULT_RELRO -DEFAULT_BIND_NOW
+ HARD_CFLAGS = -DEFAULT_PIE -DEFAULT_SSP -DEFAULT_PIE_SSP -DEFAULT_ESP_SPP \
+ -DENABLE_ESP_SSP -DEFAULT_RELRO -DEFAULT_BIND_NOW
prepare_cmds
mkdir -v %{DIR_SRC}/gcc-build
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4cf37d600be0113d91ce012e4172d9b2451f2e34
by git＠ipfire.org 12 Apr '12
by git＠ipfire.org 12 Apr '12
12 Apr '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 4cf37d600be0113d91ce012e4172d9b2451f2e34 (commit)
from 360584c3be07814d44c80ada548620dc13730576 (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 4cf37d600be0113d91ce012e4172d9b2451f2e34
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Apr 12 21:36:54 2012 +0200
attr: Fix installation.
-----------------------------------------------------------------------
Summary of changes:
attr/attr.nm | 12 ++++++--
.../patches/attr-2.4.46-build.patch | 28 +++++++++----------
2 files changed, 22 insertions(+), 18 deletions(-)
copy acl/patches/acl-2.2.39-build.patch => attr/patches/attr-2.4.46-build.patch (53%)
Difference in files:
diff --git a/attr/attr.nm b/attr/attr.nm
index a1bc9d5..2a9b2f0 100644
--- a/attr/attr.nm
+++ b/attr/attr.nm
@@ -5,7 +5,7 @@
name = attr
version = 2.4.43
-release = 5
+release = 6
groups = System/Filesystems
url = http://oss.sgi.com/projects/xfs/
@@ -13,7 +13,7 @@ license = GPLv2+ LGPLv2+
summary = Tools for extended attribute support.
description
- A set of tools for manipulating extended attributes on filesystem \
+ A set of tools for manipulating extended attributes on filesystem
objects.
end
@@ -30,7 +30,13 @@ build
--enable-shared
make_build_targets += LIBTOOL="libtool --tag=CC"
- make_install_targets += install-libs install-dev
+ make_install_targets += install-lib install-dev
+
+ install_cmds
+ # Fix absolute symlink.
+ rm -rvf %{BUILDROOT}%{libdir}/libattr.so
+ ln -svf libattr.so.1 %{BUILDROOT}%{libdir}/libattr.so
+ end
end
packages
diff --git a/attr/patches/attr-2.4.46-build.patch b/attr/patches/attr-2.4.46-build.patch
new file mode 100644
index 0000000..44d5c26
--- /dev/null
+++ b/attr/patches/attr-2.4.46-build.patch
@@ -0,0 +1,38 @@
+diff -Nur a/include/builddefs.in b/include/builddefs.in
+--- a/include/builddefs.in 2008-06-30 07:38:27.000000000 +0200
++++ b/include/builddefs.in 2012-04-12 22:20:47.479076688 +0200
+@@ -27,14 +27,14 @@
+ PKG_VERSION = @pkg_version@
+ PKG_PLATFORM = @pkg_platform@
+ PKG_DISTRIBUTION= @pkg_distribution@
+-PKG_BIN_DIR = @bindir@
+-PKG_SBIN_DIR = @sbindir@
+-PKG_LIB_DIR = @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@
+-PKG_INC_DIR = @includedir@/attr
+-PKG_MAN_DIR = @mandir@
+-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
+-PKG_LOCALE_DIR = @datadir@/locale
++PKG_BIN_DIR = $(DESTDIR)@bindir@
++PKG_SBIN_DIR = $(DESTDIR)@sbindir@
++PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@
++PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_INC_DIR = $(DESTDIR)@includedir@/attr
++PKG_MAN_DIR = $(DESTDIR)@mandir@
++PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@
++PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale
+
+ CC = @cc@
+ AWK = @awk@
+diff -Nur a/include/buildmacros b/include/buildmacros
+--- a/include/buildmacros 2008-06-30 07:22:18.000000000 +0200
++++ b/include/buildmacros 2012-04-12 22:21:18.737379800 +0200
+@@ -27,7 +27,7 @@
+ $(LFILES:.l=.o) \
+ $(YFILES:%.y=%.tab.o)
+
+-INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL = $(TOPDIR)/install-sh
+
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 360584c3be07814d44c80ada548620dc13730576
by git＠ipfire.org 12 Apr '12
by git＠ipfire.org 12 Apr '12
12 Apr '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 360584c3be07814d44c80ada548620dc13730576 (commit)
via 8a6455271d3f0c1a9092c505854632720f9dfc83 (commit)
via 051ef3b79ca1b06e30719124a24f2c39075a17a1 (commit)
via 07d3ccd7aa4b4b3045f062e9430962cb4157f0ff (commit)
via 4aea08722b7b33fb4fd4513874bded8d327873f6 (commit)
via 9c2ea1479d55f6c3e60f5e90f82da46fee459ad8 (commit)
via 0a409d3966073ed74a980185a0f9405d37e53942 (commit)
via 8e3b0c7278bdf48f2bcda79a3d627f6c073d7359 (commit)
via bc803683c28418b0bc43609a76856b7da94362d9 (commit)
via 45993d51c1170d8a52ec6aa471287e54411c84d8 (commit)
via 99a954bb8f395237d5d21e2e5166b80e5a48ea56 (commit)
via ec32c152c08dd478a48a2fb902e20b66593181b2 (commit)
via 238c2cb8aa9cef912fd8b3a2717dac07b4b1df2d (commit)
via ea9f253863e8ad285ddc3b43b4572d780ba8fff4 (commit)
via 4286b9f6dc0ffdc229ecd40ba0436b95cb948210 (commit)
via 59c988f928b54a49324d3223b37c6562739a0743 (commit)
via 84c0f915f706689998dfe11733c8bef658bbc3ec (commit)
via 1d4e1316eca289cab86d942c25ff6d6f56c34cba (commit)
via 350fa3e785be6a9b9f84b7c5c209e7d544b71764 (commit)
via ea0765d27bc8dd5b206b41de34c9ae6f3bc512ae (commit)
from 43c6c1f9e2127642da787133f4ad189b27286d17 (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 360584c3be07814d44c80ada548620dc13730576
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:56:57 2012 +0200
popt: Move libs to /usr.
commit 8a6455271d3f0c1a9092c505854632720f9dfc83
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:55:56 2012 +0200
mdadm: Move everything to /usr.
commit 051ef3b79ca1b06e30719124a24f2c39075a17a1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:55:30 2012 +0200
ncurses: Move libs to /usr.
commit 07d3ccd7aa4b4b3045f062e9430962cb4157f0ff
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:54:50 2012 +0200
lvm2: Move everything to /usr.
commit 4aea08722b7b33fb4fd4513874bded8d327873f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:54:20 2012 +0200
tar: Move tools to /usr.
commit 9c2ea1479d55f6c3e60f5e90f82da46fee459ad8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:53:34 2012 +0200
libidn: Move libs to /usr.
commit 0a409d3966073ed74a980185a0f9405d37e53942
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:52:34 2012 +0200
libgpg-error: Move libs to /usr.
commit 8e3b0c7278bdf48f2bcda79a3d627f6c073d7359
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:51:45 2012 +0200
libgcrypt: Move libs to /usr.
commit bc803683c28418b0bc43609a76856b7da94362d9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:51:08 2012 +0200
libcap-ng: Move libs to /usr.
commit 45993d51c1170d8a52ec6aa471287e54411c84d8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:49:38 2012 +0200
dmraid: Move everything to /usr.
commit 99a954bb8f395237d5d21e2e5166b80e5a48ea56
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:47:56 2012 +0200
cryptsetup-luks: Move everything to /usr.
commit ec32c152c08dd478a48a2fb902e20b66593181b2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:47:12 2012 +0200
avahi: Move everything to /usr.
commit 238c2cb8aa9cef912fd8b3a2717dac07b4b1df2d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:46:45 2012 +0200
attr: Move everything to /usr.
commit ea9f253863e8ad285ddc3b43b4572d780ba8fff4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 12 14:45:58 2012 +0200
acl: Move everything to /usr.
commit 4286b9f6dc0ffdc229ecd40ba0436b95cb948210
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 11 19:21:05 2012 +0200
kmod: Move all to /usr.
commit 59c988f928b54a49324d3223b37c6562739a0743
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 11 16:55:08 2012 +0200
nspr: Move libs to /usr.
commit 84c0f915f706689998dfe11733c8bef658bbc3ec
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 11 14:39:12 2012 +0200
ethtool: Move tool to /usr.
commit 1d4e1316eca289cab86d942c25ff6d6f56c34cba
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 11 13:28:51 2012 +0200
gcc: Update to newer version of PIE patchset.
commit 350fa3e785be6a9b9f84b7c5c209e7d544b71764
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 10 15:43:52 2012 +0200
cpio: Move tool to /usr.
commit ea0765d27bc8dd5b206b41de34c9ae6f3bc512ae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 10 15:41:38 2012 +0200
ed: Move tool to /usr.
-----------------------------------------------------------------------
Summary of changes:
acl/acl.nm | 16 +-
attr/attr.nm | 17 +-
avahi/avahi.nm | 6 +-
cpio/cpio.nm | 3 +-
cryptsetup-luks/cryptsetup-luks.nm | 11 +-
dmraid/dmraid.nm | 11 +-
ed/ed.nm | 14 +-
ethtool/ethtool.nm | 7 +-
gcc/gcc.nm | 4 +-
...7.patch => gcc-4.6.3-piepatches-20120408.patch} | 292 +++++++++++++-------
kmod/kmod.nm | 32 +--
libcap-ng/libcap-ng.nm | 11 +-
libgcrypt/libgcrypt.nm | 11 +-
libgpg-error/libgpg-error.nm | 11 +-
libidn/libidn.nm | 12 +-
lvm2/lvm2.nm | 13 +-
mdadm/mdadm.nm | 8 +-
ncurses/ncurses.nm | 10 +-
nspr/nspr.nm | 12 +-
popt/popt.nm | 13 +-
tar/tar.nm | 3 +-
21 files changed, 238 insertions(+), 279 deletions(-)
rename gcc/patches/{gcc-4.6.0-piepatches-20110407.patch => gcc-4.6.3-piepatches-20120408.patch} (74%)
Difference in files:
diff --git a/acl/acl.nm b/acl/acl.nm
index 8c6f0c4..adf7075 100644
--- a/acl/acl.nm
+++ b/acl/acl.nm
@@ -5,7 +5,7 @@
name = acl
version = 2.2.51
-release = 1
+release = 2
groups = System/Filesystems
url = http://oss.sgi.com/projects/xfs/
@@ -29,7 +29,7 @@ build
end
configure_options += \
- --bindir=/bin \
+ --libexecdir=%{libdir} \
--disable-static
make_build_targets += LIBTOOL="libtool --tag=CC"
@@ -38,17 +38,7 @@ build
make tests
end
- install_cmds
- mkdir -pv %{BUILDROOT}%{libdir}
- install -v -m0755 libacl/.libs/libacl.so.1.1.0 %{BUILDROOT}%{libdir}
- ln -vsf libacl.so.1.1.0 %{BUILDROOT}%{libdir}/libacl.so.1
- ln -vsf libacl.so.1 %{BUILDROOT}%{libdir}/libacl.so
-
- # Install headers.
- mkdir -pv %{BUILDROOT}%{includedir}/{acl,sys}
- cp -vf include/libacl.h %{BUILDROOT}%{includedir}/acl/
- cp -vf include/acl.h %{BUILDROOT}%{includedir}/sys/
- end
+ make_install_targets += install-dev install-lib
end
packages
diff --git a/attr/attr.nm b/attr/attr.nm
index 740d88f..a1bc9d5 100644
--- a/attr/attr.nm
+++ b/attr/attr.nm
@@ -5,7 +5,7 @@
name = attr
version = 2.4.43
-release = 4
+release = 5
groups = System/Filesystems
url = http://oss.sgi.com/projects/xfs/
@@ -26,22 +26,11 @@ build
end
configure_options += \
+ --libexecdir=%{libdir} \
--enable-shared
make_build_targets += LIBTOOL="libtool --tag=CC"
-
- install_cmds
- # Install libraries.
- mkdir -pv %{BUILDROOT}%{libdir}
- install -v -m0755 libattr/.libs/libattr.so.1.1.0 %{BUILDROOT}/%{libdir}
- ln -vsf libattr.so.1.1.0 %{BUILDROOT}/%{libdir}/libattr.so.1
- ln -vsf libattr.so.1 %{BUILDROOT}%{libdir}/libattr.so
-
- # Install includes.
- mkdir -pv %{BUILDROOT}%{includedir}/attr
- cp -vf include/{attributes.h,error_context.h,libattr.h,xattr.h} \
- %{BUILDROOT}%{includedir}/attr/
- end
+ make_install_targets += install-libs install-dev
end
packages
diff --git a/avahi/avahi.nm b/avahi/avahi.nm
index a0d4e98..fe6839d 100644
--- a/avahi/avahi.nm
+++ b/avahi/avahi.nm
@@ -5,7 +5,7 @@
name = avahi
version = 0.6.30
-release = 1
+release = 2
groups = Networking/Zeroconf
url = http://avahi.org/
@@ -41,10 +41,6 @@ build
end
configure_options += \
- --bindir=/bin \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var \
--with-distro=none \
--disable-gdbm \
--disable-qt3 \
diff --git a/cpio/cpio.nm b/cpio/cpio.nm
index 7b21d84..111dcc8 100644
--- a/cpio/cpio.nm
+++ b/cpio/cpio.nm
@@ -5,7 +5,7 @@
name = cpio
version = 2.11
-release = 1
+release = 2
groups = System/Packaging
url = http://www.gnu.org/software/cpio/
@@ -25,7 +25,6 @@ sources = %{thisapp}.tar.bz2
build
configure_options += \
- --bindir=/bin \
--libexecdir=/tmp \
--with-rmt=/usr/sbin/rmt
diff --git a/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm
index 0fbad75..d57dea9 100644
--- a/cryptsetup-luks/cryptsetup-luks.nm
+++ b/cryptsetup-luks/cryptsetup-luks.nm
@@ -5,7 +5,7 @@
name = cryptsetup-luks
version = 1.1.0
-release = 2
+release = 3
groups = System/Filesystems
url = http://cryptsetup.googlecode.com/
@@ -32,16 +32,7 @@ build
DIR_APP = %{DIR_SRC}/cryptsetup-%{version}
configure_options += \
- --sbindir=/sbin \
- --libdir=/%{lib} \
--disable-static
-
- install_cmds
- rm -rvf %{BUILDROOT}/%{lib}/cryptsetup{,.la,.so}
- mkdir -pv %{BUILDROOT}%{libdir}
- mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
- ln -svf ../../%{lib}/libcryptsetup.so.1 %{BUILDROOT}%{libdir}/libcryptsetup.so
- end
end
packages
diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm
index a8d2a04..f0fbf17 100644
--- a/dmraid/dmraid.nm
+++ b/dmraid/dmraid.nm
@@ -5,7 +5,7 @@
name = dmraid
version = 1.0.0.rc15
-release = 3
+release = 4
groups = System/Filesystems
url = http://people.redhat.com/heinzm/sw/dmraid
@@ -30,11 +30,9 @@ build
DIR_APP = %{DIR_SRC}/%{name}/%{version}
PARALLELISMFLAGS = # Disabled
- make_install_targets += sbindir=%{BUILDROOT}/sbin
+ make_install_targets += sbindir=%{BUILDROOT}%{sbindir}
configure_options += \
- --sbindir=/sbin \
- --libdir=/%{lib} \
--disable-static \
--disable-static_link \
--enable-libselinux
@@ -44,11 +42,6 @@ build
end
install_cmds
- mkdir -pv %{BUILDROOT}/{,usr}/%{lib}
- install -v -m 755 lib/libdmraid.so \
- %{BUILDROOT}/%{lib}/libdmraid.so.%{version}
- ln -svf ../../%{lib}/libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so
-
# Install development headers.
mkdir -pv %{BUILDROOT}%{includedir}/dmraid
install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/
diff --git a/ed/ed.nm b/ed/ed.nm
index fe1f115..e24d6d7 100644
--- a/ed/ed.nm
+++ b/ed/ed.nm
@@ -5,7 +5,7 @@
name = ed
version = 1.5
-release = 3
+release = 4
groups = Application/Text
url = http://www.gnu.org/software/ed/
@@ -22,23 +22,11 @@ end
source_dl =
build
- configure_options += \
- --exec-prefix=/
-
make_build_target = CFLAGS="%{CFLAGS}"
-
- install
- # Create directory for man pages
- mkdir -pv %{BUILDROOT}/usr/share/man/man1
-
- make install bindir=/bin mandir=/usr/share/man \
- DESTDIR=%{BUILDROOT}
- end
end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/ethtool/ethtool.nm b/ethtool/ethtool.nm
index 1f7d906..a51ea7f 100644
--- a/ethtool/ethtool.nm
+++ b/ethtool/ethtool.nm
@@ -5,7 +5,7 @@
name = ethtool
version = 2.6.34
-release = 2
+release = 3
groups = Applications/System
url = http://sourceforge.net/projects/gkernel/
@@ -20,11 +20,6 @@ end
source_dl =
-build
- configure_options += \
- --sbindir=/sbin
-end
-
packages
package %{name}
groups += Base
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index bfe183f..ed1b500 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_cloog_ppl = 1
name = gcc
version = 4.6.3
-release = 2
+release = 3
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Development/Compilers
@@ -40,7 +40,7 @@ patches = \
gcc46-ppl-0.10.patch \
gcc46-Woverlength-string.patch0 \
gcc46-Woverlength-string-asm.patch0 \
- gcc-4.6.0-piepatches-20110407.patch
+ gcc-4.6.3-piepatches-20120408.patch
build
requires
diff --git a/gcc/patches/gcc-4.6.0-piepatches-20110407.patch b/gcc/patches/gcc-4.6.0-piepatches-20110407.patch
deleted file mode 100644
index a9ffaba..0000000
--- a/gcc/patches/gcc-4.6.0-piepatches-20110407.patch
+++ /dev/null
@@ -1,791 +0,0 @@
-diff -Nur gcc-4.6.0-vanilla/configure gcc-4.6.0/configure
---- gcc-4.6.0-vanilla/configure 2011-03-16 19:27:36.000000000 +0100
-+++ gcc-4.6.0/configure 2011-04-07 19:17:55.383923352 +0200
-@@ -668,6 +668,7 @@
- CFLAGS
- CC
- target_subdir
-+enable_esp
- host_subdir
- build_subdir
- build_libsubdir
-@@ -1459,6 +1460,11 @@
- --disable-libquadmath-support
- disable libquadmath support for Fortran
- --enable-libada build libada directory
-+ --enable-esp
-+ Enable Stack protector, Position independent executable as
-+ default if we have suppot for it when compiling
-+ and link with -z relro and -z now as default.
-+ Linux targets supported i*86, x86_64, powerpc, powerpc64, ia64 and arm
- --enable-libssp build libssp directory
- --enable-build-with-cxx build with C++ compiler instead of C compiler
- --disable-ppl-version-check
-@@ -3040,6 +3046,25 @@
- noconfigdirs="$noconfigdirs gnattools"
- fi
-
-+# Check whether --enable-esp was given and target have the support.
-+# Check whether --enable-esp or --disable-esp was given.
-+if test "${enable_esp+set}" = set; then
-+ enableval="$enable_esp"
-+
-+ case $target in
-+ i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux*)
-+ enable_esp=yes
-+ ;;
-+ *)
-+ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported on this $target target." >&5
-+echo "$as_me: error: *** --enable-esp is not supported on this $target target." >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ esac
-+
-+fi;
-+
-+
- # Check whether --enable-libssp was given.
- if test "${enable_libssp+set}" = set; then :
- enableval=$enable_libssp; ENABLE_LIBSSP=$enableval
-@@ -14199,6 +14224,9 @@
- *) stage1_cflags="-g -J" ;;
- esac ;;
- esac
-+if test x$enable_esp = xyes; then
-+ stage1_cflags="$stage1_cflags -fno-stack-protector"
-+fi
-
- # This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
- if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then
-diff -Nur gcc-4.6.0-vanilla/gcc/config/gnu-user.h gcc-4.6.0/gcc/config/gnu-user.h
---- gcc-4.6.0-vanilla/gcc/config/gnu-user.h 2011-01-12 15:29:14.000000000 +0100
-+++ gcc-4.6.0/gcc/config/gnu-user.h 2011-04-07 19:19:31.962715700 +0200
-@@ -41,7 +41,11 @@
- provides part of the support for getting C++ file-scope static
- object constructed before entering `main'. */
-
--#if defined HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
-+#define GNU_USER_TARGET_STARTFILE_SPEC \
-+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s \
-+ %{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
- #define GNU_USER_TARGET_STARTFILE_SPEC \
- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
- crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
-diff -Nur gcc-4.6.0-vanilla/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h
---- gcc-4.6.0-vanilla/gcc/config/rs6000/linux64.h 2011-03-07 08:50:23.000000000 +0100
-+++ gcc-4.6.0/gcc/config/rs6000/linux64.h 2011-04-07 19:19:26.658727069 +0200
-@@ -193,7 +193,7 @@
- #endif
-
- #define ASM_SPEC32 "-a32 \
--%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
-+%{mrelocatable} %{mrelocatable-lib} %{fpic|fPIC|fpie|fPIE:-K PIC} \
- %{memb} %{!memb: %{msdata=eabi: -memb}} \
- %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
- %{mcall-freebsd: -mbig} \
-diff -Nur gcc-4.6.0-vanilla/gcc/config/rs6000/sysv4.h gcc-4.6.0/gcc/config/rs6000/sysv4.h
---- gcc-4.6.0-vanilla/gcc/config/rs6000/sysv4.h 2011-03-07 08:50:23.000000000 +0100
-+++ gcc-4.6.0/gcc/config/rs6000/sysv4.h 2011-04-07 19:19:31.963715695 +0200
-@@ -800,7 +800,12 @@
- %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
- %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
-
--#ifdef HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
-+#define STARTFILE_LINUX_SPEC "\
-+%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-+%{mnewlib:ecrti.o%s;:crti.o%s} \
-+%{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
- #define STARTFILE_LINUX_SPEC "\
- %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
- %{mnewlib:ecrti.o%s;:crti.o%s} \
-diff -Nur gcc-4.6.0-vanilla/gcc/config.in gcc-4.6.0/gcc/config.in
---- gcc-4.6.0-vanilla/gcc/config.in 2011-03-25 18:07:00.000000000 +0100
-+++ gcc-4.6.0/gcc/config.in 2011-04-07 19:18:10.478890819 +0200
-@@ -58,6 +58,12 @@
- #endif
-
-
-+/* Define to 1 to enable crtbeginTS.o. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_CRTBEGINTS
-+#endif
-+
-+
- /* Define to 1 to specify that we are using the BID decimal floating point
- format instead of DPD */
- #ifndef USED_FOR_TARGET
-@@ -77,6 +83,12 @@
- #endif
-
-
-+/* Define to 1 to enable esp. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_ESP
-+#endif
-+
-+
- /* Define to 1 to enable fixed-point arithmetic extension to C. */
- #ifndef USED_FOR_TARGET
- #undef ENABLE_FIXED_POINT
-diff -Nur gcc-4.6.0-vanilla/gcc/configure gcc-4.6.0/gcc/configure
---- gcc-4.6.0-vanilla/gcc/configure 2011-02-28 16:36:37.000000000 +0100
-+++ gcc-4.6.0/gcc/configure 2011-04-07 19:17:55.388923340 +0200
-@@ -677,6 +677,8 @@
- HOST_LIBS
- GGC
- libgcc_visibility
-+enable_esp
-+enable_crtbeginTS
- gcc_cv_readelf
- gcc_cv_objdump
- ORIGINAL_NM_FOR_TARGET
-@@ -25608,6 +25610,50 @@
- ;;
- esac
-
-+echo "$as_me:$LINENO: checking linker -z now support" >&5
-+echo $ECHO_N "checking linker -z now support... $ECHO_C" >&6
-+if test "${gcc_cv_ld_now+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ gcc_cv_ld_now=no
-+if test $in_tree_ld = yes ; then
-+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
-+ && test $in_tree_ld_is_elf = yes; then
-+ gcc_cv_ld_now=yes
-+ fi
-+elif test x$gcc_cv_ld != x; then
-+ # Check if linker supports -z now options
-+ if $gcc_cv_ld --help 2>/dev/null | grep now > /dev/null; then
-+ gcc_cv_ld_now=yes
-+ fi
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $gcc_cv_ld_now" >&5
-+echo "${ECHO_T}$gcc_cv_ld_now" >&6
-+
-+echo "$as_me:$LINENO: checking linker -z relro support" >&5
-+echo $ECHO_N "checking linker -z relro support... $ECHO_C" >&6
-+if test "${gcc_cv_ld_relro+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ gcc_cv_ld_relro=no
-+if test $in_tree_ld = yes ; then
-+ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
-+ && test $in_tree_ld_is_elf = yes; then
-+ gcc_cv_ld_relro=yes
-+ fi
-+elif test x$gcc_cv_ld != x; then
-+ # Check if linker supports -z relro and -z norelro options
-+ if $gcc_cv_ld --help 2>/dev/null | grep relro > /dev/null; then
-+ gcc_cv_ld_relro=yes
-+ fi
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $gcc_cv_ld_relro" >&5
-+echo "${ECHO_T}$gcc_cv_ld_relro" >&6
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --build-id support" >&5
- $as_echo_n "checking linker --build-id support... " >&6; }
- if test "${gcc_cv_ld_buildid+set}" = set; then :
-@@ -25792,6 +25838,74 @@
-
- fi
-
-+if test x$enable_esp = xyes ; then
-+case $target in
-+ ia64*-*-linux*)
-+ if test x$gcc_cv_ld_now = xyes; then
-+ enable_esp_ld=yes
-+ else
-+ enable_esp_ld=no
-+ fi
-+ ;;
-+ *-*-linux*)
-+ if test x$gcc_cv_ld_relro = xyes && test x$gcc_cv_ld_now = xyes; then
-+ enable_esp_ld=yes
-+ else
-+ enable_esp_ld=no
-+ fi
-+ ;;
-+ *)
-+ enable_esp_ld=no
-+ ;;
-+ esac
-+else
-+ enable_espf_ld=no
-+fi
-+if test x$enable_esp_ld = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define ENABLE_ESP 1
-+_ACEOF
-+
-+fi
-+
-+if test x$enable_esp = xyes && test x$enable_esp_ld = xno; then
-+ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&5
-+echo "$as_me: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+echo "$as_me:$LINENO: checking for crtbeginTS.o support" >&5
-+echo $ECHO_N "checking for crtbeginTS.o support... $ECHO_C" >&6
-+if test "${enable_crtbeginTS+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test x$enable_esp = xyes ; then
-+ case "$target" in
-+ ia64*-*-linux*)
-+ enable_crtbeginTS=no ;;
-+ *-*-linux*)
-+ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then
-+ enable_crtbeginTS=yes
-+ fi
-+ ;;
-+ *) enable_crtbeginTS=no ;;
-+ esac
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $enable_crtbeginTS" >&5
-+echo "${ECHO_T}$enable_crtbeginTS" >&6
-+
-+if test x$enable_crtbeginTS = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define ENABLE_CRTBEGINTS 1
-+_ACEOF
-+
-+fi
-+
- # Check if TFmode long double should be used by default or not.
- # Some glibc targets used DFmode long double, but with glibc 2.4
- # and later they can use TFmode.
-diff -Nur gcc-4.6.0-vanilla/gcc/cp/lang-specs.h gcc-4.6.0/gcc/cp/lang-specs.h
---- gcc-4.6.0-vanilla/gcc/cp/lang-specs.h 2011-03-06 17:27:57.000000000 +0100
-+++ gcc-4.6.0/gcc/cp/lang-specs.h 2011-04-07 19:19:04.828773916 +0200
-@@ -47,7 +47,7 @@
- %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
- cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(esp_options) %2\
- %{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}}%V}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
-@@ -58,7 +58,7 @@
- %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
- cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(esp_options) %2\
- %{!fsyntax-only:%(invoke_as)}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {".ii", "@c++-cpp-output", 0, 0, 0},
-diff -Nur gcc-4.6.0-vanilla/gcc/esp.h gcc-4.6.0/gcc/esp.h
---- gcc-4.6.0-vanilla/gcc/esp.h 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.0/gcc/esp.h 2011-04-07 19:19:14.329753502 +0200
-@@ -0,0 +1,145 @@
-+/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
-+ * Version 20100527.1
-+ * Magnus Granberg (Zorry) <zorry(a)gentoo.org> */
-+#ifndef GCC_ESP_H
-+#define GCC_ESP_H
-+
-+/* This file will add -fstack-protector-all, -fPIE, -pie and -z now
-+ as default if the defines and the spec allow it.
-+ Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
-+ to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
-+ This will add some unsupported upstream commands options as -nopie and -nonow.
-+ -D__KERNEL__ is added so we don't have -fPIE, -pie and -fstack-protector-all when building kernels.
-+ ESP_CC1_SPEC is added to CC1_SPEC.
-+ ESP_CC1_STRICT_OVERFLOW_SPEC is added so we don't disable the strict-overflow check.
-+ ESP_LINK_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile and -static.
-+ ENABLE_CRTBEGINTS add support for crtbeginTS.o, build -static with -fPIE or -fpie.
-+*/
-+#ifdef ENABLE_ESP
-+
-+ /* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass */
-+ #define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict_overflow)"
-+ #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+ #define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}"
-+ #else
-+ #define ESP_CC1_SSP_SPEC ""
-+ #endif
-+ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+ #define ESP_CC1_PIE_SPEC "%{!nopie: }"
-+ #else
-+ #define ESP_CC1_PIE_SPEC ""
-+ #endif
-+ #define ESP_CC1_STRICT_OVERFLOW_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}"
-+
-+ /* ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
-+ -z now will be added if we don't have -vanilla spec. We do a -pie incompatible check
-+ Don't remove the specs in the end */
-+ #define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) "
-+ #define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
-+
-+ /* We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options. */
-+ #define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
-+
-+ /* ESP_OPTIONS_SPEC is added to the compiler spec in gcc/gcc.c */
-+ #define ESP_OPTIONS_SPEC "%(esp_options_ssp)"
-+
-+ /* ESP_CPP_OPTIONS_SPEC is added to the cpp_options spec in gcc/gcc.c
-+ For precompiling headers. */
-+ #define ESP_CPP_OPTIONS_SPEC "%(esp_options_ssp)"
-+
-+ /* This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
-+ -fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined. */
-+ #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+ #define ESP_OPTIONS_SSP_SPEC \
-+ "%{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs: %{!fno-stack-protector: \
-+ %{!fstack-protector:%{!fstack-protector-all:-fstack-protector-all}}}}}}"
-+ #else
-+ #define ESP_OPTIONS_SSP_SPEC ""
-+ #endif
-+
-+ /* If EFAULT_PIE or EFAULT_PIE_SSP is defined we will add -fPIE -pie */
-+ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+
-+ /* This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static
-+ -nostdlib -nostartfiles. */
-+ /* With ENABLE_CRTBEGINTS we don't need to check for -static */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define ESP_OPTIONS_PIE_SPEC \
-+ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+ %{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }"
-+ #else
-+ #define ESP_OPTIONS_PIE_SPEC \
-+ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+ %{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}"
-+ #endif
-+
-+ /* This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib
-+ -nostartfiles */
-+ /* With ENABLE_CRTBEGINTS we don't need to check for -static
-+ and we add -pie only to get the start and endfiles. -pie will not go to the linker. */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define ESP_LINK_PIE_SPEC \
-+ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \
-+ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}"
-+ #else
-+ #define ESP_LINK_PIE_SPEC \
-+ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \
-+ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}"
-+ #endif
-+
-+ /* This will check if -pie is set when (-static) -pg -p -profile. If set it will make gcc print out
-+ "-pie and (static)|pg|p|profile are incompatible when linking" */
-+ /* With ENABLE_CRTBEGINTS we don't need to check for -static */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define ESP_LINK_PIE_CHECK_SPEC \
-+ "%{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible when linking}}"
-+ #else
-+ #define ESP_LINK_PIE_CHECK_SPEC \
-+ "%{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible when linking}}"
-+ #endif
-+
-+ /* We don't pass -pie to the linker when -static. */
-+ #ifdef ENABLE_CRTBEGINTS
-+ #define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link)"
-+ #else
-+ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+ #endif
-+
-+ #else
-+ #define ESP_OPTIONS_PIE_SPEC ""
-+ #define ESP_LINK_PIE_CHECK_SPEC ""
-+ #define ESP_LINK_PIE_SPEC ""
-+ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+ #endif
-+
-+ /* We add extra spec name's to the EXTRA_SPECS list */
-+ #define ESP_EXTRA_SPECS \
-+ { "esp_cc1", ESP_CC1_SPEC }, \
-+ { "esp_cc1_pie", ESP_CC1_PIE_SPEC }, \
-+ { "esp_cc1_ssp", ESP_CC1_SSP_SPEC }, \
-+ { "esp_cc1_strict_overflow", ESP_CC1_STRICT_OVERFLOW_SPEC }, \
-+ { "esp_link", ESP_LINK_SPEC }, \
-+ { "esp_link_now", ESP_LINK_NOW_SPEC }, \
-+ { "esp_link_pie", ESP_LINK_PIE_SPEC }, \
-+ { "esp_link_pie_check", ESP_LINK_PIE_CHECK_SPEC }, \
-+ { "esp_command_options", ESP_COMMAND_OPTIONS_SPEC }, \
-+ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }, \
-+ { "esp_options", ESP_OPTIONS_SPEC }, \
-+ { "esp_options_pie", ESP_OPTIONS_PIE_SPEC }, \
-+ { "esp_options_ssp", ESP_OPTIONS_SSP_SPEC }
-+
-+ static const char *esp_command_options_spec = ESP_COMMAND_OPTIONS_SPEC;
-+ static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC;
-+
-+#else /* If not ESP_ENABLE defined do this. */
-+
-+ #define ESP_OPTIONS_SPEC ""
-+ #define ESP_CPP_OPTIONS_SPEC ""
-+
-+ /* We add extra spec name's to the EXTRA_SPECS list */
-+ #define ESP_EXTRA_SPECS \
-+ { "esp_options", ESP_OPTIONS_SPEC }, \
-+ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }
-+
-+#endif
-+#endif /* End GCC_ESP_H */
-diff -Nur gcc-4.6.0-vanilla/gcc/gcc.c gcc-4.6.0/gcc/gcc.c
---- gcc-4.6.0-vanilla/gcc/gcc.c 2011-02-23 03:04:43.000000000 +0100
-+++ gcc-4.6.0/gcc/gcc.c 2011-04-07 19:19:04.828773916 +0200
-@@ -44,6 +44,7 @@
- #include "flags.h"
- #include "opts.h"
- #include "vec.h"
-+#include "esp.h" /* for --enable-esp support */
-
- /* By default there is no special suffix for target executables. */
- /* FIXME: when autoconf is fixed, remove the host check - dj */
-@@ -690,7 +691,9 @@
-
- static const char *asm_debug;
- static const char *cpp_spec = CPP_SPEC;
-+#ifndef ENABLE_ESP
- static const char *cc1_spec = CC1_SPEC;
-+#endif
- static const char *cc1plus_spec = CC1PLUS_SPEC;
- static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
- static const char *link_ssp_spec = LINK_SSP_SPEC;
-@@ -751,7 +754,7 @@
- static const char *cpp_options =
- "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
- %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\
-- %{undef} %{save-temps*:-fpch-preprocess}";
-+ %{undef} %{save-temps*:-fpch-preprocess} %(esp_cpp_options)";
-
- /* This contains cpp options which are not passed when the preprocessor
- output will be used by another program. */
-@@ -925,9 +928,9 @@
- %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
- %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
- cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
-- %(cc1_options)}\
-+ %(cc1_options) %(esp_options)}\
- %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
-- cc1 %(cpp_unique_options) %(cc1_options)}}}\
-+ cc1 %(cpp_unique_options) %(cc1_options) %(esp_options)}}}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
- {"-",
- "%{!E:%e-E or -x required when input is from standard input}\
-@@ -950,7 +953,7 @@
- %W{o*:--output-pch=%*}}%V}}}}}}", 0, 0, 0},
- {".i", "@cpp-output", 0, 0, 0},
- {"@cpp-output",
-- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(esp_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {".s", "@assembler", 0, 0, 0},
- {"@assembler",
- "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1203,18 +1206,23 @@
- INIT_STATIC_SPEC ("sysroot_hdrs_suffix_spec", &sysroot_hdrs_suffix_spec),
- };
-
--#ifdef EXTRA_SPECS /* additional specs needed */
-+/* EXTRA_SPECS needs to be defined */
-+#ifndef EXTRA_SPECS
-+#define EXTRA_SPECS
-+#endif
-+
-+/* EXTRA_SPECS and ESP_EXTRA_SPECS add additional specs */
- /* Structure to keep track of just the first two args of a spec_list.
-- That is all that the EXTRA_SPECS macro gives us. */
-+ That is all that the EXTRA_SPECS and ESP_EXTRA_SPECS macro gives us. */
- struct spec_list_1
- {
- const char *const name;
- const char *const ptr;
- };
-
--static const struct spec_list_1 extra_specs_1[] = { EXTRA_SPECS };
-+/* ESP_EXTRA_SPECS before EXTRA_SPECS */
-+static const struct spec_list_1 extra_specs_1[] = { ESP_EXTRA_SPECS, EXTRA_SPECS };
- static struct spec_list *extra_specs = (struct spec_list *) 0;
--#endif
-
- /* List of dynamically allocates specs that have been defined so far. */
-
-@@ -1306,7 +1314,6 @@
- if (verbose_flag)
- fnotice (stderr, "Using built-in specs.\n");
-
--#ifdef EXTRA_SPECS
- extra_specs = XCNEWVEC (struct spec_list, ARRAY_SIZE (extra_specs_1));
-
- for (i = ARRAY_SIZE (extra_specs_1) - 1; i >= 0; i--)
-@@ -1319,7 +1326,6 @@
- sl->ptr_spec = &sl->ptr;
- next = sl;
- }
--#endif
-
- for (i = ARRAY_SIZE (static_specs) - 1; i >= 0; i--)
- {
-@@ -6418,6 +6424,12 @@
- gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
-
-+#ifdef ENABLE_ESP
-+ /* Process ESP_COMMAND_OPTIONS_SPEC, adding any new options to the end
-+ of the command line. */
-+ do_self_spec (esp_command_options_spec);
-+#endif
-+
- /* Now we have the specs.
- Set the `valid' bits for switches that match anything in any spec. */
-
-diff -Nur gcc-4.6.0-vanilla/gcc/Makefile.in gcc-4.6.0/gcc/Makefile.in
---- gcc-4.6.0-vanilla/gcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/gcc/Makefile.in 2011-04-07 19:18:24.186861296 +0200
-@@ -642,6 +642,14 @@
- INHIBIT_LIBC_CFLAGS = -Dinhibit_libc
- endif
-
-+# We don't want to compile the compiler with -fPIE.
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ESP_NOPIE_CFLAGS = -fno-PIE
-+else
-+ESP_NOPIE_CFLAGS=
-+endif
-+
- # Options to use when compiling libgcc2.a.
- #
- LIBGCC2_DEBUG_CFLAGS = -g
-@@ -662,7 +670,7 @@
- CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
- -finhibit-size-directive -fno-inline -fno-exceptions \
- -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
-- -fno-stack-protector \
-+ -fno-stack-protector $(ESP_NOPIE_CFLAGS) \
- $(INHIBIT_LIBC_CFLAGS)
-
- # Additional sources to handle exceptions; overridden by targets as needed.
-@@ -693,6 +701,12 @@
- # The rules for compiling them should be in the t-* file for the machine.
- EXTRA_PARTS = @extra_parts@
-
-+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
-+enable_crtbeginTS = @enable_crtbeginTS@
-+ifeq ($(enable_crtbeginTS),yes)
-+EXTRA_PARTS += crtbeginTS.o
-+endif
-+
- # List of extra object files that should be compiled and linked with
- # compiler proper (cc1, cc1obj, cc1plus).
- EXTRA_OBJS = @extra_objs@
-@@ -996,7 +1010,7 @@
-
- # This is the variable actually used when we compile. If you change this,
- # you probably want to update BUILD_CFLAGS in configure.ac
--ALL_CFLAGS = $(T_CFLAGS) $(CFLAGS-$@) \
-+ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \
- $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@
-
- # The C++ version.
-@@ -1920,9 +1934,10 @@
- echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars
- echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars
- echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars
-- echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars
-+ echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS) $(ESP_NOPIE_CFLAGS)' >> tmp-libgcc.mvars
- echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars
- echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars
-+ echo enable_crtbeginTS = '$(enable_crtbeginTS)' >> tmp-libgcc.mvars
-
- mv tmp-libgcc.mvars libgcc.mvars
-
-@@ -1982,9 +1997,19 @@
- $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
- gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
- $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+ $(ESP_NOPIE_CFLAGS) \
- -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
- -o $(T)crtbeginT$(objext)
-
-+# This is a version of crtbegin for -static -fPIE links if esp is enable.
-+ifeq ($(enable_crtbeginTS),yes)
-+$(T)crtbeginTS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
-+ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-+ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
-+ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \
-+ -o $(T)crtbeginTS$(objext)
-+endif
-+
- # Compile the start modules crt0.o and mcrt0.o that are linked with
- # every program
- $(T)crt0.o: s-crt0 ; @true
-diff -Nur gcc-4.6.0-vanilla/gcc/objc/lang-specs.h gcc-4.6.0/gcc/objc/lang-specs.h
---- gcc-4.6.0-vanilla/gcc/objc/lang-specs.h 2011-03-06 17:27:57.000000000 +0100
-+++ gcc-4.6.0/gcc/objc/lang-specs.h 2011-04-07 19:19:04.831773909 +0200
-@@ -30,9 +30,9 @@
- %{traditional|traditional-cpp:\
- %eGNU Objective C no longer supports traditional compilation}\
- %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
-- cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\
-+ cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}\
- %{!save-temps*:%{!no-integrated-cpp:\
-- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
-+ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objective-c-header",
- "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\
-@@ -41,18 +41,18 @@
- %{traditional|traditional-cpp:\
- %eGNU Objective C no longer supports traditional compilation}\
- %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
-- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ cc1obj -fpreprocessed %b.mi %(cc1_options)%(esp_options) %{print-objc-runtime-info} %{gen-decls}\
- -o %g.s %{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}%V}\
- %{!save-temps*:%{!no-integrated-cpp:\
-- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
- -o %g.s %{!o*:--output-pch=%i.gch}\
- %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
- {".mi", "@objective-c-cpp-output", 0, 0, 0},
- {"@objective-c-cpp-output",
-- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objc-cpp-output",
- "%nobjc-cpp-output is deprecated; please use objective-c-cpp-output instead\n\
-- %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
-+ %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-diff -Nur gcc-4.6.0-vanilla/gcc/objcp/lang-specs.h gcc-4.6.0/gcc/objcp/lang-specs.h
---- gcc-4.6.0-vanilla/gcc/objcp/lang-specs.h 2011-03-06 17:27:57.000000000 +0100
-+++ gcc-4.6.0/gcc/objcp/lang-specs.h 2011-04-07 19:19:04.829773913 +0200
-@@ -36,7 +36,7 @@
- %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
- cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(esp_options) %2\
- -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {"@objective-c++",
-@@ -46,16 +46,16 @@
- %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
- cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
-- %(cc1_options) %2\
-+ %(cc1_options) %(esp_options) %2\
- %{!fsyntax-only:%(invoke_as)}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- {".mii", "@objective-c++-cpp-output", 0, 0, 0},
- {"@objective-c++-cpp-output",
- "%{!M:%{!MM:%{!E:\
-- cc1objplus -fpreprocessed %i %(cc1_options) %2\
-+ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
- {"@objc++-cpp-output",
- "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-output instead\n\
- %{!M:%{!MM:%{!E:\
-- cc1objplus -fpreprocessed %i %(cc1_options) %2\
-+ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-diff -Nur gcc-4.6.0-vanilla/gcc/varasm.c gcc-4.6.0/gcc/varasm.c
---- gcc-4.6.0-vanilla/gcc/varasm.c 2011-02-28 16:36:37.000000000 +0100
-+++ gcc-4.6.0/gcc/varasm.c 2011-04-07 19:18:52.338800740 +0200
-@@ -6022,7 +6022,11 @@
- bool is_local;
-
- is_local = targetm.binds_local_p (decl);
-- if (!flag_shlib)
-+ #ifdef ENABLE_ESP
-+ if (!flag_pic)
-+ #else
-+ if (!flag_shlib)
-+ #endif
- {
- if (is_local)
- kind = TLS_MODEL_LOCAL_EXEC;
-diff -Nur gcc-4.6.0-vanilla/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
---- gcc-4.6.0-vanilla/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/libgcc/Makefile.in 2011-04-07 19:18:24.190861287 +0200
-@@ -298,6 +298,12 @@
- gen-hide-list = echo > \$@
- endif
-
-+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
-+enable_libgcc_crtbeginTS = $(enable_crtbeginTS)
-+ifeq ($(enable_libgcc_crtbeginTS),yes)
-+EXTRA_PARTS += crtbeginTS.o
-+endif
-+
- ifneq ($(EXTRA_PARTS),)
- extra-parts = libgcc-extra-parts
- INSTALL_PARTS = $(EXTRA_PARTS)
-@@ -849,6 +855,13 @@
- crtbeginT.o: $(gcc_srcdir)/crtstuff.c
- $(crt_compile) $(CRTSTUFF_T_CFLAGS) \
- -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
-+
-+# This is a version of crtbegin for -static -fPIE links.
-+ifeq ($(enable_libgcc_crtbeginTS),yes)
-+crtbeginTS.o: $(gcc_srcdir)/crtstuff.c
-+ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
-+ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
-+endif
- endif
-
- # Build extra startfiles in the libgcc directory.
-diff -Nur gcc-4.6.0-vanilla/libmudflap/configure gcc-4.6.0/libmudflap/configure
---- gcc-4.6.0-vanilla/libmudflap/configure 2011-02-13 12:45:53.000000000 +0100
-+++ gcc-4.6.0/libmudflap/configure 2011-04-07 19:17:55.399923318 +0200
-@@ -652,6 +652,7 @@
- MAINTAINER_MODE_FALSE
- MAINTAINER_MODE_TRUE
- am__untar
-+enable_esp
- am__tar
- AMTAR
- am__leading_dot
-diff -Nur gcc-4.6.0-vanilla/Makefile.in gcc-4.6.0/Makefile.in
---- gcc-4.6.0-vanilla/Makefile.in 2011-02-12 13:02:24.000000000 +0100
-+++ gcc-4.6.0/Makefile.in 2011-04-07 19:18:24.184861300 +0200
-@@ -356,9 +356,17 @@
- BUILD_PREFIX = @BUILD_PREFIX@
- BUILD_PREFIX_1 = @BUILD_PREFIX_1@
-
-+# Some stuff don't compile with SSP
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ESP_NOSSP_CFLAGS = -fno-stack-protector
-+else
-+ESP_NOSSP_CFLAGS=
-+endif
-+
- # Flags to pass to stage2 and later makes. They are defined
- # here so that they can be overridden by Makefile fragments.
--BOOT_CFLAGS= -g -O2
-+BOOT_CFLAGS= -g -O2 $(ESP_NOSSP_CFLAGS)
- BOOT_LDFLAGS=
- BOOT_ADAFLAGS=-gnatpg -gnata
-
-@@ -403,9 +411,9 @@
-
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBCFLAGS = $(CFLAGS)
-+LIBCFLAGS = $(CFLAGS) $(ESP_NOSSP_CFLAGS)
- CXXFLAGS = @CXXFLAGS@
--LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates $(ESP_NOSSP_CFLAGS)
- GOCFLAGS = $(CFLAGS)
-
- TFLAGS =
diff --git a/gcc/patches/gcc-4.6.3-piepatches-20120408.patch b/gcc/patches/gcc-4.6.3-piepatches-20120408.patch
new file mode 100644
index 0000000..f69e205
--- /dev/null
+++ b/gcc/patches/gcc-4.6.3-piepatches-20120408.patch
@@ -0,0 +1,885 @@
+git://git.overlays.gentoo.org/proj/hardened-gccpatchset.git
+
+diff -Nur gcc-4.6.3.vanilla/configure gcc-4.6.3/configure
+--- gcc-4.6.3.vanilla/configure 2011-12-18 11:03:44.000000000 +0100
++++ gcc-4.6.3/configure 2012-04-09 12:23:07.039817993 +0200
+@@ -668,6 +668,7 @@
+ CFLAGS
+ CC
+ target_subdir
++enable_esp
+ host_subdir
+ build_subdir
+ build_libsubdir
+@@ -1459,6 +1460,11 @@
+ --disable-libquadmath-support
+ disable libquadmath support for Fortran
+ --enable-libada build libada directory
++ --enable-esp
++ Enable Stack protector, Position independent executable as
++ default if we have suppot for it when compiling
++ and link with -z relro and -z now as default.
++ Linux targets supported i*86, x86_64, powerpc, powerpc64, ia64 and arm.
+ --enable-libssp build libssp directory
+ --enable-build-with-cxx build with C++ compiler instead of C compiler
+ --disable-ppl-version-check
+@@ -3039,6 +3045,25 @@
+ noconfigdirs="$noconfigdirs gnattools"
+ fi
+
++# Check whether --enable-esp was given and target have the support.
++# Check whether --enable-esp or --disable-esp was given.
++if test "${enable_esp+set}" = set; then
++ enableval="$enable_esp"
++
++ case $target in
++ i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux*)
++ enable_esp=yes
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported on this $target target." >&5
++echo "$as_me: error: *** --enable-esp is not supported on this $target target." >&2;}
++ { (exit 1); exit 1; }; }
++ ;;
++ esac
++
++fi;
++
++
+ # Check whether --enable-libssp was given.
+ if test "${enable_libssp+set}" = set; then :
+ enableval=$enable_libssp; ENABLE_LIBSSP=$enableval
+@@ -14168,6 +14193,9 @@
+ *) stage1_cflags="-g -J" ;;
+ esac ;;
+ esac
++if test x$enable_esp = xyes; then
++ stage1_cflags="$stage1_cflags -fno-stack-protector"
++fi
+
+ # This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
+ if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then
+diff -Nur gcc-4.6.3.vanilla/gcc/config/gnu-user.h gcc-4.6.3/gcc/config/gnu-user.h
+--- gcc-4.6.3.vanilla/gcc/config/gnu-user.h 2011-01-12 15:29:14.000000000 +0100
++++ gcc-4.6.3/gcc/config/gnu-user.h 2012-04-09 12:25:51.598251886 +0200
+@@ -41,7 +41,11 @@
+ provides part of the support for getting C++ file-scope static
+ object constructed before entering `main'. */
+
+-#if defined HAVE_LD_PIE
++#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINP)
++#define GNU_USER_TARGET_STARTFILE_SPEC \
++ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s \
++ %{static:%{pie:crtbeginP.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
++#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINP)
+ #define GNU_USER_TARGET_STARTFILE_SPEC \
+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
+ crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
+diff -Nur gcc-4.6.3.vanilla/gcc/config/rs6000/linux64.h gcc-4.6.3/gcc/config/rs6000/linux64.h
+--- gcc-4.6.3.vanilla/gcc/config/rs6000/linux64.h 2011-03-07 08:50:23.000000000 +0100
++++ gcc-4.6.3/gcc/config/rs6000/linux64.h 2012-04-09 12:25:39.139032665 +0200
+@@ -193,7 +193,7 @@
+ #endif
+
+ #define ASM_SPEC32 "-a32 \
+-%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
++%{mrelocatable} %{mrelocatable-lib} %{fpic|fPIC|fpie|fPIE:-K PIC} \
+ %{memb} %{!memb: %{msdata=eabi: -memb}} \
+ %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+ %{mcall-freebsd: -mbig} \
+diff -Nur gcc-4.6.3.vanilla/gcc/config/rs6000/sysv4.h gcc-4.6.3/gcc/config/rs6000/sysv4.h
+--- gcc-4.6.3.vanilla/gcc/config/rs6000/sysv4.h 2011-03-07 08:50:23.000000000 +0100
++++ gcc-4.6.3/gcc/config/rs6000/sysv4.h 2012-04-09 12:25:51.599251502 +0200
+@@ -800,7 +800,12 @@
+ %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
+ %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
+
+-#ifdef HAVE_LD_PIE
++#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINP)
++#define STARTFILE_LINUX_SPEC "\
++%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
++%{mnewlib:ecrti.o%s;:crti.o%s} \
++%{static:%{pie:crtbeginP.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
++#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINP)
+ #define STARTFILE_LINUX_SPEC "\
+ %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
+ %{mnewlib:ecrti.o%s;:crti.o%s} \
+diff -Nur gcc-4.6.3.vanilla/gcc/config.in gcc-4.6.3/gcc/config.in
+--- gcc-4.6.3.vanilla/gcc/config.in 2012-03-01 13:03:46.000000000 +0100
++++ gcc-4.6.3/gcc/config.in 2012-04-09 12:24:09.220535670 +0200
+@@ -58,6 +58,12 @@
+ #endif
+
+
++/* Define to 1 to enable crtbeginP.o. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_CRTBEGINP
++#endif
++
++
+ /* Define to 1 to specify that we are using the BID decimal floating point
+ format instead of DPD */
+ #ifndef USED_FOR_TARGET
+@@ -77,6 +83,18 @@
+ #endif
+
+
++/* Define to 1 to enable esp. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_ESP
++#endif
++
++
++/* Define to 1 to enable esp ssp. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_ESP_SSP
++#endif
++
++
+ /* Define to 1 to enable fixed-point arithmetic extension to C. */
+ #ifndef USED_FOR_TARGET
+ #undef ENABLE_FIXED_POINT
+diff -Nur gcc-4.6.3.vanilla/gcc/configure gcc-4.6.3/gcc/configure
+--- gcc-4.6.3.vanilla/gcc/configure 2011-11-20 22:24:07.000000000 +0100
++++ gcc-4.6.3/gcc/configure 2012-04-09 12:24:09.229532218 +0200
+@@ -677,6 +677,8 @@
+ HOST_LIBS
+ GGC
+ libgcc_visibility
++enable_esp
++enable_crtbeginP
+ gcc_cv_readelf
+ gcc_cv_objdump
+ ORIGINAL_NM_FOR_TARGET
+@@ -25606,6 +25608,50 @@
+ ;;
+ esac
+
++echo "$as_me:$LINENO: checking linker -z now support" >&5
++echo $ECHO_N "checking linker -z now support... $ECHO_C" >&6
++if test "${gcc_cv_ld_now+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ gcc_cv_ld_now=no
++if test $in_tree_ld = yes ; then
++ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
++ && test $in_tree_ld_is_elf = yes; then
++ gcc_cv_ld_now=yes
++ fi
++elif test x$gcc_cv_ld != x; then
++ # Check if linker supports -z now options
++ if $gcc_cv_ld --help 2>/dev/null | grep now > /dev/null; then
++ gcc_cv_ld_now=yes
++ fi
++fi
++
++fi
++echo "$as_me:$LINENO: result: $gcc_cv_ld_now" >&5
++echo "${ECHO_T}$gcc_cv_ld_now" >&6
++
++echo "$as_me:$LINENO: checking linker -z relro support" >&5
++echo $ECHO_N "checking linker -z relro support... $ECHO_C" >&6
++if test "${gcc_cv_ld_relro+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ gcc_cv_ld_relro=no
++if test $in_tree_ld = yes ; then
++ if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \
++ && test $in_tree_ld_is_elf = yes; then
++ gcc_cv_ld_relro=yes
++ fi
++elif test x$gcc_cv_ld != x; then
++ # Check if linker supports -z relro and -z norelro options
++ if $gcc_cv_ld --help 2>/dev/null | grep relro > /dev/null; then
++ gcc_cv_ld_relro=yes
++ fi
++fi
++
++fi
++echo "$as_me:$LINENO: result: $gcc_cv_ld_relro" >&5
++echo "${ECHO_T}$gcc_cv_ld_relro" >&6
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --build-id support" >&5
+ $as_echo_n "checking linker --build-id support... " >&6; }
+ if test "${gcc_cv_ld_buildid+set}" = set; then :
+@@ -25790,6 +25836,113 @@
+
+ fi
+
++if test x$enable_esp = xyes ; then
++case $target in
++ ia64*-*-linux*)
++ if test x$gcc_cv_ld_now = xyes; then
++ enable_esp_ld=yes
++ else
++ enable_esp_ld=no
++ fi
++ ;;
++ *-*-linux*)
++ if test x$gcc_cv_ld_relro = xyes && test x$gcc_cv_ld_now = xyes; then
++ enable_esp_ld=yes
++ else
++ enable_esp_ld=no
++ fi
++ ;;
++ *)
++ enable_esp_ld=no
++ ;;
++ esac
++else
++ enable_espf_ld=no
++fi
++if test x$enable_esp_ld = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_ESP 1
++_ACEOF
++
++fi
++
++if test x$enable_esp = xyes && test x$enable_esp_ld = xno; then
++ { { echo "$as_me:$LINENO: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&5
++echo "$as_me: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
++echo "$as_me:$LINENO: checking for crtbeginP.o support" >&5
++echo $ECHO_N "checking for crtbeginP.o support... $ECHO_C" >&6
++if test "${enable_crtbeginP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++if test x$enable_esp = xyes ; then
++ case "$target" in
++ ia64*-*-linux*)
++ enable_crtbeginP=no ;;
++ *-*-linux*)
++ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then
++ enable_crtbeginP=yes
++ fi
++ ;;
++ *) enable_crtbeginP=no ;;
++ esac
++fi
++
++fi
++echo "$as_me:$LINENO: result: $enable_crtbeginP" >&5
++echo "${ECHO_T}$enable_crtbeginP" >&6
++
++if test x$enable_crtbeginP = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_CRTBEGINP 1
++_ACEOF
++
++fi
++
++
++# Check if we have SSP support. if uClibc we need 0.9.32 or newer and TLS.
++echo "$as_me:$LINENO: checking for SSP support" >&5
++echo $ECHO_N "checking for SSP support... $ECHO_C" >&6
++if test "${enable_esp_SSP+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test x$enable_esp = xyes && test x$gcc_cv_libc_provides_ssp = xyes \
++ && test x$set_have_as_tls = xyes; then
++ if $EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC__[ ]+1' \
++ $target_header_dir/features.h > /dev/null; then
++ if test -f $target_header_dir/bits/uClibc_config.h && \
++ $EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC_SUBLEVEL__[ ]+([3-9][2-9]|[4-9][0-9])' \
++ $target_header_dir/bits/uClibc_config.h > /dev/null && \
++ $EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC_HAS_TLS__[ ]+1' \
++ $target_header_dir/bits/uClibc_config.h > /dev/null; then
++ enable_esp_SSP=yes
++ else
++ enable_esp_SSP=no
++ fi
++ else
++ enable_esp_SSP=yes
++ fi
++ else
++ enable_esp_SSP=no
++ fi
++fi
++echo "$as_me:$LINENO: result: $enable_esp_SSP" >&5
++echo "${ECHO_T}$enable_esp_SSP" >&6
++
++if test x$$enable_esp_SSP = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_ESP_SSP 1
++_ACEOF
++
++fi
++
++
+ # Check if TFmode long double should be used by default or not.
+ # Some glibc targets used DFmode long double, but with glibc 2.4
+ # and later they can use TFmode.
+diff -Nur gcc-4.6.3.vanilla/gcc/cp/lang-specs.h gcc-4.6.3/gcc/cp/lang-specs.h
+--- gcc-4.6.3.vanilla/gcc/cp/lang-specs.h 2011-03-06 17:27:57.000000000 +0100
++++ gcc-4.6.3/gcc/cp/lang-specs.h 2012-04-09 12:25:11.222744541 +0200
+@@ -47,7 +47,7 @@
+ %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
+ cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
+ %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2\
++ %(cc1_options) %(esp_options) %2\
+ %{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\
+ %W{o*:--output-pch=%*}}%V}}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+@@ -58,7 +58,7 @@
+ %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
+ cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
+ %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2\
++ %(cc1_options) %(esp_options) %2\
+ %{!fsyntax-only:%(invoke_as)}}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+ {".ii", "@c++-cpp-output", 0, 0, 0},
+diff -Nur gcc-4.6.3.vanilla/gcc/doc/invoke.texi gcc-4.6.3/gcc/doc/invoke.texi
+--- gcc-4.6.3.vanilla/gcc/doc/invoke.texi 2012-01-03 17:43:38.000000000 +0100
++++ gcc-4.6.3/gcc/doc/invoke.texi 2012-04-09 12:26:06.709453504 +0200
+@@ -8185,6 +8185,11 @@
+ @opindex fstack-protector-all
+ Like @option{-fstack-protector} except that all functions are protected.
+
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}
++or @option{-nostdlib} or @option{-nodefaultlibs} or
++@option{-fstack-protector} are found.
++
+ @item -fsection-anchors
+ @opindex fsection-anchors
+ Try to reduce the number of symbolic address calculations by using
+@@ -9090,6 +9095,12 @@
+ that were used to generate code (@option{-fpie}, @option{-fPIE},
+ or model suboptions) when you specify this option.
+
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
++or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
++@option{-nostartfiles} or @option{-shared} or @option{-pg} or @option{-p}
++are found.
++
+ @item -rdynamic
+ @opindex rdynamic
+ Pass the flag @option{-export-dynamic} to the ELF linker, on targets
+@@ -18099,6 +18110,11 @@
+ @code{__pie__} and @code{__PIE__}. The macros have the value 1
+ for @option{-fpie} and 2 for @option{-fPIE}.
+
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
++or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
++@option{-nostartfiles} or @option{-shared} are found.
++
+ @item -fno-jump-tables
+ @opindex fno-jump-tables
+ Do not use jump tables for switch statements even where it would be
+diff -Nur gcc-4.6.3.vanilla/gcc/esp.h gcc-4.6.3/gcc/esp.h
+--- gcc-4.6.3.vanilla/gcc/esp.h 1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/gcc/esp.h 2012-04-09 12:25:25.376313618 +0200
+@@ -0,0 +1,145 @@
++/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
++ * Version 20120403.2
++ * Magnus Granberg (Zorry) <zorry(a)gentoo.org> */
++#ifndef GCC_ESP_H
++#define GCC_ESP_H
++
++/* This file will add -fstack-protector-all, -fPIE, -pie and -z now
++ as default if the defines and the spec allow it.
++ Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
++ to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
++ This will add some unsupported upstream commands options as -nopie and -nonow.
++ -D__KERNEL__ is added so we don't have -fPIE, -pie and -fstack-protector-all when building kernels.
++ ESP_CC1_SPEC is added to CC1_SPEC.
++ ESP_CC1_STRICT_OVERFLOW_SPEC is added so we don't disable the strict-overflow check.
++ ESP_LINK_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile and -static.
++ ENABLE_CRTBEGINP add support for crtbeginP.o, build -static with -fPIE or -fpie.
++*/
++#ifdef ENABLE_ESP
++
++ /* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass */
++ #define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict_overflow)"
++ #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
++ #define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}"
++ #else
++ #define ESP_CC1_SSP_SPEC ""
++ #endif
++ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
++ #define ESP_CC1_PIE_SPEC "%{!nopie: }"
++ #else
++ #define ESP_CC1_PIE_SPEC ""
++ #endif
++ #define ESP_CC1_STRICT_OVERFLOW_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}"
++
++ /* ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
++ -z now will be added if we don't have -vanilla spec. We do a -pie incompatible check
++ Don't remove the specs in the end */
++ #define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) "
++ #define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
++
++ /* We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options. */
++ #define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
++
++ /* ESP_OPTIONS_SPEC is added to the compiler spec in gcc/gcc.c */
++ #define ESP_OPTIONS_SPEC "%(esp_options_ssp)"
++
++ /* ESP_CPP_OPTIONS_SPEC is added to the cpp_options spec in gcc/gcc.c
++ For precompiling headers. */
++ #define ESP_CPP_OPTIONS_SPEC "%(esp_options_ssp)"
++
++ /* This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
++ -fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined. */
++ #if ( defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP ) ) && defined ( ENABLE_ESP_SSP )
++ #define ESP_OPTIONS_SSP_SPEC \
++ "%{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs: %{!fno-stack-protector: \
++ %{!fstack-protector:%{!fstack-protector-all:-fstack-protector-all}}}}}}"
++ #else
++ #define ESP_OPTIONS_SSP_SPEC ""
++ #endif
++
++ /* If EFAULT_PIE or EFAULT_PIE_SSP is defined we will add -fPIE -pie */
++ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
++
++ /* This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static
++ -nostdlib -nostartfiles. */
++ /* With ENABLE_CRTBEGINP we don't need to check for -static */
++ #ifdef ENABLE_CRTBEGINP
++ #define ESP_OPTIONS_PIE_SPEC \
++ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
++ %{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }"
++ #else
++ #define ESP_OPTIONS_PIE_SPEC \
++ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
++ %{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}"
++ #endif
++
++ /* This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib
++ -nostartfiles */
++ /* With ENABLE_CRTBEGINP we don't need to check for -static
++ and we add -pie only to get the start and endfiles. -pie will not go to the linker. */
++ #ifdef ENABLE_CRTBEGINP
++ #define ESP_LINK_PIE_SPEC \
++ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \
++ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}"
++ #else
++ #define ESP_LINK_PIE_SPEC \
++ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \
++ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}"
++ #endif
++
++ /* This will check if -pie is set when (-static) -pg -p -profile. If set it will make gcc print out
++ "-pie and (static)|pg|p|profile are incompatible when linking" */
++ /* With ENABLE_CRTBEGINP we don't need to check for -static */
++ #ifdef ENABLE_CRTBEGINP
++ #define ESP_LINK_PIE_CHECK_SPEC \
++ "%{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible when linking}}"
++ #else
++ #define ESP_LINK_PIE_CHECK_SPEC \
++ "%{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible when linking}}"
++ #endif
++
++ /* We don't pass -pie to the linker when -static. */
++ #ifdef ENABLE_CRTBEGINP
++ #define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link)"
++ #else
++ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
++ #endif
++
++ #else
++ #define ESP_OPTIONS_PIE_SPEC ""
++ #define ESP_LINK_PIE_CHECK_SPEC ""
++ #define ESP_LINK_PIE_SPEC ""
++ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
++ #endif
++
++ /* We add extra spec name's to the EXTRA_SPECS list */
++ #define ESP_EXTRA_SPECS \
++ { "esp_cc1", ESP_CC1_SPEC }, \
++ { "esp_cc1_pie", ESP_CC1_PIE_SPEC }, \
++ { "esp_cc1_ssp", ESP_CC1_SSP_SPEC }, \
++ { "esp_cc1_strict_overflow", ESP_CC1_STRICT_OVERFLOW_SPEC }, \
++ { "esp_link", ESP_LINK_SPEC }, \
++ { "esp_link_now", ESP_LINK_NOW_SPEC }, \
++ { "esp_link_pie", ESP_LINK_PIE_SPEC }, \
++ { "esp_link_pie_check", ESP_LINK_PIE_CHECK_SPEC }, \
++ { "esp_command_options", ESP_COMMAND_OPTIONS_SPEC }, \
++ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }, \
++ { "esp_options", ESP_OPTIONS_SPEC }, \
++ { "esp_options_pie", ESP_OPTIONS_PIE_SPEC }, \
++ { "esp_options_ssp", ESP_OPTIONS_SSP_SPEC }
++
++ static const char *esp_command_options_spec = ESP_COMMAND_OPTIONS_SPEC;
++ static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC;
++
++#else /* If not ESP_ENABLE defined do this. */
++
++ #define ESP_OPTIONS_SPEC ""
++ #define ESP_CPP_OPTIONS_SPEC ""
++
++ /* We add extra spec name's to the EXTRA_SPECS list */
++ #define ESP_EXTRA_SPECS \
++ { "esp_options", ESP_OPTIONS_SPEC }, \
++ { "esp_cpp_options", ESP_CPP_OPTIONS_SPEC }
++
++#endif
++#endif /* End GCC_ESP_H */
+diff -Nur gcc-4.6.3.vanilla/gcc/gcc.c gcc-4.6.3/gcc/gcc.c
+--- gcc-4.6.3.vanilla/gcc/gcc.c 2011-02-23 03:04:43.000000000 +0100
++++ gcc-4.6.3/gcc/gcc.c 2012-04-09 12:25:11.222744541 +0200
+@@ -44,6 +44,7 @@
+ #include "flags.h"
+ #include "opts.h"
+ #include "vec.h"
++#include "esp.h" /* for --enable-esp support */
+
+ /* By default there is no special suffix for target executables. */
+ /* FIXME: when autoconf is fixed, remove the host check - dj */
+@@ -690,7 +691,9 @@
+
+ static const char *asm_debug;
+ static const char *cpp_spec = CPP_SPEC;
++#ifndef ENABLE_ESP
+ static const char *cc1_spec = CC1_SPEC;
++#endif
+ static const char *cc1plus_spec = CC1PLUS_SPEC;
+ static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
+ static const char *link_ssp_spec = LINK_SSP_SPEC;
+@@ -751,7 +754,7 @@
+ static const char *cpp_options =
+ "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
+ %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\
+- %{undef} %{save-temps*:-fpch-preprocess}";
++ %{undef} %{save-temps*:-fpch-preprocess} %(esp_cpp_options)";
+
+ /* This contains cpp options which are not passed when the preprocessor
+ output will be used by another program. */
+@@ -925,9 +928,9 @@
+ %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
+ %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
+ cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
+- %(cc1_options)}\
++ %(cc1_options) %(esp_options)}\
+ %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
+- cc1 %(cpp_unique_options) %(cc1_options)}}}\
++ cc1 %(cpp_unique_options) %(cc1_options) %(esp_options)}}}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
+ {"-",
+ "%{!E:%e-E or -x required when input is from standard input}\
+@@ -950,7 +953,7 @@
+ %W{o*:--output-pch=%*}}%V}}}}}}", 0, 0, 0},
+ {".i", "@cpp-output", 0, 0, 0},
+ {"@cpp-output",
+- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
++ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(esp_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ {".s", "@assembler", 0, 0, 0},
+ {"@assembler",
+ "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
+@@ -1203,18 +1206,23 @@
+ INIT_STATIC_SPEC ("sysroot_hdrs_suffix_spec", &sysroot_hdrs_suffix_spec),
+ };
+
+-#ifdef EXTRA_SPECS /* additional specs needed */
++/* EXTRA_SPECS needs to be defined */
++#ifndef EXTRA_SPECS
++#define EXTRA_SPECS
++#endif
++
++/* EXTRA_SPECS and ESP_EXTRA_SPECS add additional specs */
+ /* Structure to keep track of just the first two args of a spec_list.
+- That is all that the EXTRA_SPECS macro gives us. */
++ That is all that the EXTRA_SPECS and ESP_EXTRA_SPECS macro gives us. */
+ struct spec_list_1
+ {
+ const char *const name;
+ const char *const ptr;
+ };
+
+-static const struct spec_list_1 extra_specs_1[] = { EXTRA_SPECS };
++/* ESP_EXTRA_SPECS before EXTRA_SPECS */
++static const struct spec_list_1 extra_specs_1[] = { ESP_EXTRA_SPECS, EXTRA_SPECS };
+ static struct spec_list *extra_specs = (struct spec_list *) 0;
+-#endif
+
+ /* List of dynamically allocates specs that have been defined so far. */
+
+@@ -1306,7 +1314,6 @@
+ if (verbose_flag)
+ fnotice (stderr, "Using built-in specs.\n");
+
+-#ifdef EXTRA_SPECS
+ extra_specs = XCNEWVEC (struct spec_list, ARRAY_SIZE (extra_specs_1));
+
+ for (i = ARRAY_SIZE (extra_specs_1) - 1; i >= 0; i--)
+@@ -1319,7 +1326,6 @@
+ sl->ptr_spec = &sl->ptr;
+ next = sl;
+ }
+-#endif
+
+ for (i = ARRAY_SIZE (static_specs) - 1; i >= 0; i--)
+ {
+@@ -6418,6 +6424,12 @@
+ gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
+ spec_version, dir_separator_str, NULL);
+
++#ifdef ENABLE_ESP
++ /* Process ESP_COMMAND_OPTIONS_SPEC, adding any new options to the end
++ of the command line. */
++ do_self_spec (esp_command_options_spec);
++#endif
++
+ /* Now we have the specs.
+ Set the `valid' bits for switches that match anything in any spec. */
+
+diff -Nur gcc-4.6.3.vanilla/gcc/Makefile.in gcc-4.6.3/gcc/Makefile.in
+--- gcc-4.6.3.vanilla/gcc/Makefile.in 2011-08-20 09:51:09.000000000 +0200
++++ gcc-4.6.3/gcc/Makefile.in 2012-04-09 12:23:38.285405919 +0200
+@@ -642,6 +642,14 @@
+ INHIBIT_LIBC_CFLAGS = -Dinhibit_libc
+ endif
+
++# We don't want to compile the compiler with -fPIE.
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++ESP_NOPIE_CFLAGS = -fno-PIE
++else
++ESP_NOPIE_CFLAGS=
++endif
++
+ # Options to use when compiling libgcc2.a.
+ #
+ LIBGCC2_DEBUG_CFLAGS = -g
+@@ -662,7 +670,7 @@
+ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
+ -finhibit-size-directive -fno-inline -fno-exceptions \
+ -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
+- -fno-stack-protector \
++ -fno-stack-protector $(ESP_NOPIE_CFLAGS) \
+ $(INHIBIT_LIBC_CFLAGS)
+
+ # Additional sources to handle exceptions; overridden by targets as needed.
+@@ -693,6 +701,12 @@
+ # The rules for compiling them should be in the t-* file for the machine.
+ EXTRA_PARTS = @extra_parts@
+
++# We add crtbeginP.o to the EXTRA_PARTS list if enable_crtbeginP = yes
++enable_crtbeginP = @enable_crtbeginP@
++ifeq ($(enable_crtbeginP),yes)
++EXTRA_PARTS += crtbeginP.o
++endif
++
+ # List of extra object files that should be compiled and linked with
+ # compiler proper (cc1, cc1obj, cc1plus).
+ EXTRA_OBJS = @extra_objs@
+@@ -996,12 +1010,12 @@
+
+ # This is the variable actually used when we compile. If you change this,
+ # you probably want to update BUILD_CFLAGS in configure.ac
+-ALL_CFLAGS = $(T_CFLAGS) $(CFLAGS-$@) \
++ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \
+ $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@
+
+ # The C++ version.
+-ALL_CXXFLAGS = $(T_CFLAGS) $(CXXFLAGS) $(INTERNAL_CFLAGS) \
+- $(COVERAGE_FLAGS) $(WARN_CXXFLAGS) @DEFS@
++ALL_CXXFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CXXFLAGS) \
++ $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CXXFLAGS) @DEFS@
+
+ # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro
+ # puts -I options in CPPFLAGS, our include files in the srcdir will always
+@@ -1920,9 +1934,10 @@
+ echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars
+ echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars
+ echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars
+- echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars
++ echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS) $(ESP_NOPIE_CFLAGS)' >> tmp-libgcc.mvars
+ echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars
+ echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars
++ echo enable_crtbeginP = '$(enable_crtbeginP)' >> tmp-libgcc.mvars
+
+ mv tmp-libgcc.mvars libgcc.mvars
+
+@@ -1982,9 +1997,19 @@
+ $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
++ $(ESP_NOPIE_CFLAGS) \
+ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
+ -o $(T)crtbeginT$(objext)
+
++# This is a version of crtbegin for -static -fPIE links if esp is enable.
++ifeq ($(enable_crtbeginP),yes)
++$(T)crtbeginP.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
++ gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
++ $(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
++ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \
++ -o $(T)crtbeginP$(objext)
++endif
++
+ # Compile the start modules crt0.o and mcrt0.o that are linked with
+ # every program
+ $(T)crt0.o: s-crt0 ; @true
+diff -Nur gcc-4.6.3.vanilla/gcc/objc/lang-specs.h gcc-4.6.3/gcc/objc/lang-specs.h
+--- gcc-4.6.3.vanilla/gcc/objc/lang-specs.h 2011-03-06 17:27:57.000000000 +0100
++++ gcc-4.6.3/gcc/objc/lang-specs.h 2012-04-09 12:25:11.224743774 +0200
+@@ -30,9 +30,9 @@
+ %{traditional|traditional-cpp:\
+ %eGNU Objective C no longer supports traditional compilation}\
+ %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
+- cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\
++ cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}\
+ %{!save-temps*:%{!no-integrated-cpp:\
+- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
++ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ {"@objective-c-header",
+ "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\
+@@ -41,18 +41,18 @@
+ %{traditional|traditional-cpp:\
+ %eGNU Objective C no longer supports traditional compilation}\
+ %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
+- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++ cc1obj -fpreprocessed %b.mi %(cc1_options)%(esp_options) %{print-objc-runtime-info} %{gen-decls}\
+ -o %g.s %{!o*:--output-pch=%i.gch}\
+ %W{o*:--output-pch=%*}%V}\
+ %{!save-temps*:%{!no-integrated-cpp:\
+- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
+ -o %g.s %{!o*:--output-pch=%i.gch}\
+ %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
+ {".mi", "@objective-c-cpp-output", 0, 0, 0},
+ {"@objective-c-cpp-output",
+- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ {"@objc-cpp-output",
+ "%nobjc-cpp-output is deprecated; please use objective-c-cpp-output instead\n\
+- %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++ %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+diff -Nur gcc-4.6.3.vanilla/gcc/objcp/lang-specs.h gcc-4.6.3/gcc/objcp/lang-specs.h
+--- gcc-4.6.3.vanilla/gcc/objcp/lang-specs.h 2011-03-06 17:27:57.000000000 +0100
++++ gcc-4.6.3/gcc/objcp/lang-specs.h 2012-04-09 12:25:11.223744157 +0200
+@@ -36,7 +36,7 @@
+ %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
+ cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
+ %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2\
++ %(cc1_options) %(esp_options) %2\
+ -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+ {"@objective-c++",
+@@ -46,16 +46,16 @@
+ %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
+ cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
+ %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+- %(cc1_options) %2\
++ %(cc1_options) %(esp_options) %2\
+ %{!fsyntax-only:%(invoke_as)}}}}",
+ CPLUSPLUS_CPP_SPEC, 0, 0},
+ {".mii", "@objective-c++-cpp-output", 0, 0, 0},
+ {"@objective-c++-cpp-output",
+ "%{!M:%{!MM:%{!E:\
+- cc1objplus -fpreprocessed %i %(cc1_options) %2\
++ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ {"@objc++-cpp-output",
+ "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-output instead\n\
+ %{!M:%{!MM:%{!E:\
+- cc1objplus -fpreprocessed %i %(cc1_options) %2\
++ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+diff -Nur gcc-4.6.3.vanilla/gcc/varasm.c gcc-4.6.3/gcc/varasm.c
+--- gcc-4.6.3.vanilla/gcc/varasm.c 2011-12-09 20:11:01.000000000 +0100
++++ gcc-4.6.3/gcc/varasm.c 2012-04-09 12:24:55.766675254 +0200
+@@ -6028,7 +6028,11 @@
+ bool is_local;
+
+ is_local = targetm.binds_local_p (decl);
+- if (!flag_shlib)
++ #ifdef ENABLE_ESP
++ if (!flag_pic)
++ #else
++ if (!flag_shlib)
++ #endif
+ {
+ if (is_local)
+ kind = TLS_MODEL_LOCAL_EXEC;
+diff -Nur gcc-4.6.3.vanilla/libgcc/Makefile.in gcc-4.6.3/libgcc/Makefile.in
+--- gcc-4.6.3.vanilla/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100
++++ gcc-4.6.3/libgcc/Makefile.in 2012-04-09 12:23:38.286405535 +0200
+@@ -298,6 +298,12 @@
+ gen-hide-list = echo > \$@
+ endif
+
++# We add crtbeginP.o to the EXTRA_PARTS list if enable_crtbeginP = yes
++enable_libgcc_crtbeginP = $(enable_crtbeginP)
++ifeq ($(enable_libgcc_crtbeginP),yes)
++EXTRA_PARTS += crtbeginP.o
++endif
++
+ ifneq ($(EXTRA_PARTS),)
+ extra-parts = libgcc-extra-parts
+ INSTALL_PARTS = $(EXTRA_PARTS)
+@@ -849,6 +855,13 @@
+ crtbeginT.o: $(gcc_srcdir)/crtstuff.c
+ $(crt_compile) $(CRTSTUFF_T_CFLAGS) \
+ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
++
++# This is a version of crtbegin for -static -fPIE links.
++ifeq ($(enable_libgcc_crtbeginP),yes)
++crtbeginP.o: $(gcc_srcdir)/crtstuff.c
++ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
++ -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
++endif
+ endif
+
+ # Build extra startfiles in the libgcc directory.
+diff -Nur gcc-4.6.3.vanilla/libmudflap/configure gcc-4.6.3/libmudflap/configure
+--- gcc-4.6.3.vanilla/libmudflap/configure 2011-11-20 22:24:07.000000000 +0100
++++ gcc-4.6.3/libmudflap/configure 2012-04-09 12:23:07.050818345 +0200
+@@ -652,6 +652,7 @@
+ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ am__untar
++enable_esp
+ am__tar
+ AMTAR
+ am__leading_dot
+diff -Nur gcc-4.6.3.vanilla/Makefile.in gcc-4.6.3/Makefile.in
+--- gcc-4.6.3.vanilla/Makefile.in 2012-01-02 12:02:10.000000000 +0100
++++ gcc-4.6.3/Makefile.in 2012-04-09 12:23:38.283406686 +0200
+@@ -356,9 +356,17 @@
+ BUILD_PREFIX = @BUILD_PREFIX@
+ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
+
++# Some stuff don't compile with SSP
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++ESP_NOSSP_CFLAGS = -fno-stack-protector
++else
++ESP_NOSSP_CFLAGS=
++endif
++
+ # Flags to pass to stage2 and later makes. They are defined
+ # here so that they can be overridden by Makefile fragments.
+-BOOT_CFLAGS= -g -O2
++BOOT_CFLAGS= -g -O2 $(ESP_NOSSP_CFLAGS)
+ BOOT_LDFLAGS=
+ BOOT_ADAFLAGS=-gnatpg -gnata
+
+@@ -403,9 +411,9 @@
+
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBCFLAGS = $(CFLAGS)
++LIBCFLAGS = $(CFLAGS) $(ESP_NOSSP_CFLAGS)
+ CXXFLAGS = @CXXFLAGS@
+-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
++LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates $(ESP_NOSSP_CFLAGS)
+ GOCFLAGS = $(CFLAGS)
+
+ TFLAGS =
diff --git a/kmod/kmod.nm b/kmod/kmod.nm
index 1801775..8bea457 100644
--- a/kmod/kmod.nm
+++ b/kmod/kmod.nm
@@ -5,7 +5,7 @@
name = kmod
version = 7
-release = 1
+release = 2
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Kernel
@@ -30,37 +30,33 @@ build
end
configure_options += \
- --bindir=/bin \
- --with-rootprefix= \
- --with-rootlibdir=/%{lib} \
--with-xz \
--with-zlib
# The testsuite does generate lots of errors.
install_cmds
- # Remove all man pages (because there are not corresponding
- # binaries, yet).
- rm -rvf %{BUILDROOT}%{mandir}
-
- mkdir -pv %{BUILDROOT}/lib/modprobe.d
+ mkdir -pv %{BUILDROOT}%{prefix}/lib/modprobe.d
mkdir -pv %{BUILDROOT}%{sysconfdir}/modprobe.d
mkdir -pv %{BUILDROOT}%{sysconfdir}/depmod.d
- mkdir -pv %{BUILDROOT}/sbin
- ln -svf ../bin/kmod %{BUILDROOT}/sbin/modprobe
- ln -svf ../bin/kmod %{BUILDROOT}/sbin/modinfo
- ln -svf ../bin/kmod %{BUILDROOT}/sbin/insmod
- ln -svf ../bin/kmod %{BUILDROOT}/sbin/rmmod
- ln -svf ../bin/kmod %{BUILDROOT}/sbin/depmod
- ln -svf ../bin/kmod %{BUILDROOT}/sbin/lsmod
- ln -svf kmod %{BUILDROOT}/bin/lsmod
+ mkdir -pv %{BUILDROOT}%{sbindir}
+ ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/modprobe
+ ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/modinfo
+ ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/insmod
+ ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/rmmod
+ ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/depmod
+ ln -svf ../bin/kmod %{BUILDROOT}%{sbindir}/lsmod
end
end
packages
package %{name}
- provides = module-init-tools = 4.0-1
+ provides
+ module-init-tools = 4.0-1
+ /sbin/modprobe
+ end
+
obsoletes = module-init-tools < 4.0-1
end
diff --git a/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm
index d0a015f..7e968c1 100644
--- a/libcap-ng/libcap-ng.nm
+++ b/libcap-ng/libcap-ng.nm
@@ -5,7 +5,7 @@
name = libcap-ng
version = 0.6.6
-release = 2
+release = 3
groups = System/Libraries
url = http://people.redhat.com/sgrubb/libcap-ng
@@ -25,15 +25,6 @@ build
python
end
- install_cmds
- # Move libraries to lib
- mkdir -pv %{BUILDROOT}/%{lib}
- mv -vf %{BUILDROOT}%{libdir}/libcap-ng.so.* %{BUILDROOT}/%{lib}/
-
- # Recreate symlink
- ln -svf ../../%{lib}/libcap-ng.so.0 %{BUILDROOT}%{libdir}/libcap-ng.so
- end
-
# XXX Testsuite is broken by the package developers
#def test
# make check
diff --git a/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm
index ab21d03..7f26939 100644
--- a/libgcrypt/libgcrypt.nm
+++ b/libgcrypt/libgcrypt.nm
@@ -5,7 +5,7 @@
name = libgcrypt
version = 1.5.0
-release = 2
+release = 3
groups = System/Libraries
url = http://www.gnupg.org/
@@ -28,14 +28,7 @@ build
end
configure_options += \
- --libdir=/%{lib} \
- --enable-noexecstack \
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{libdir}
- rm -vf %{BUILDROOT}/%{lib}/libgcrypt.so
- ln -sfv ../../%{lib}/libgcrypt.so.11 %{BUILDROOT}%{libdir}/libgcrypt.so
- end
+ --enable-noexecstack
end
packages
diff --git a/libgpg-error/libgpg-error.nm b/libgpg-error/libgpg-error.nm
index 5147094..9263df4 100644
--- a/libgpg-error/libgpg-error.nm
+++ b/libgpg-error/libgpg-error.nm
@@ -5,7 +5,7 @@
name = libgpg-error
version = 1.9
-release = 2
+release = 3
groups = System/Libraries
url = http://www.gnupg.org/
@@ -25,15 +25,6 @@ build
requires
gcc-c++
end
-
- configure_options += \
- --libdir=/%{lib}
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{libdir}
- rm -vf %{BUILDROOT}/%{lib}/libgpg-error.so
- ln -sfv ../../%{lib}/libgpg-error.so.0 %{BUILDROOT}%{libdir}/libgpg-error.so
- end
end
packages
diff --git a/libidn/libidn.nm b/libidn/libidn.nm
index fbd566d..f56544c 100644
--- a/libidn/libidn.nm
+++ b/libidn/libidn.nm
@@ -5,7 +5,7 @@
name = libidn
version = 1.24
-release = 1
+release = 2
groups = System/Libraries
url = http://www.gnu.org/software/libidn/
@@ -23,7 +23,6 @@ source_dl = http://ftp.gnu.org/gnu/libidn/
build
configure_options += \
- --libdir=/%{lib} \
--disable-csharp \
--disable-static
@@ -31,15 +30,6 @@ build
export LD_LIBRARY_PATH=$(pwd)/lib/.libs
make -C tests check
end
-
- install
- make install DESTDIR=%{BUILDROOT} \
- pkgconfigdir=%{libdir}/pkgconfig
-
- mkdir -pv %{BUILDROOT}%{libdir}
- rm -vf %{BUILDROOT}/%{lib}/libidn.so
- ln -svf ../../%{lib}/libidn.so.11.6.7 %{BUILDROOT}%{libdir}/libidn.so
- end
end
packages
diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm
index 3022043..d8e09b2 100644
--- a/lvm2/lvm2.nm
+++ b/lvm2/lvm2.nm
@@ -5,7 +5,7 @@
name = lvm2
version = 2.02.54
-release = 2
+release = 3
thisapp = LVM2.%{version}
groups = System/Base
@@ -34,18 +34,7 @@ build
end
configure_options += \
- --bindir=/bin \
- --sbindir=/sbin \
- --exec-prefix=/ \
- --libdir=/%{lib} \
--enable-pkgconfig
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{libdir}
- rm -vf %{BUILDROOT}/%{lib}/libdevmapper.so
- ln -svf libdevmapper.so.1.02 %{BUILDROOT}/%{lib}/libdevmapper.so.1
- ln -svf ../../%{lib}/libdevmapper.so.1 %{BUILDROOT}%{libdir}/libdevmapper.so
- end
end
packages
diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm
index 8e0073e..a166010 100644
--- a/mdadm/mdadm.nm
+++ b/mdadm/mdadm.nm
@@ -5,7 +5,7 @@
name = mdadm
version = 3.2.2
-release = 1
+release = 2
groups = System/Base
url = http://www.kernel.org/pub/linux/utils/raid/mdadm/
@@ -35,12 +35,10 @@ build
build
make %{PARALLELISMFLAGS} CXFLAGS="%{CFLAGS}" \
- CWFLAGS= SYSCONFDIR="/etc" MDASSEMBLE_AUTO=1
+ CWFLAGS= SYSCONFDIR="%{sysconfdir}" MDASSEMBLE_AUTO=1
end
- install
- make install BINDIR=/sbin DESTDIR=%{BUILDROOT}
-
+ install_cmds
mkdir -pv %{BUILDROOT}/var/run/mdadm
chmod 700 %{BUILDROOT}/var/run/mdadm
end
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 0f1cc84..683c6a8 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -5,7 +5,7 @@
name = ncurses
version = 5.9
-release = 6
+release = 7
groups = System/Base
url = http://invisible-island.net/ncurses/ncurses.html
@@ -27,7 +27,6 @@ build
end
configure_options += \
- --mandir=/usr/share/man \
--with-shared \
--without-debug \
--without-ada \
@@ -68,13 +67,6 @@ build
chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.*
- # move lib{ncurses{,w},tinfo}.so.* to /lib*
- mkdir -pv %{BUILDROOT}/%{lib}
- mv -v %{BUILDROOT}%{libdir}/lib{ncurses{,w},tinfo}.so.* %{BUILDROOT}/%{lib}
- for l in %{BUILDROOT}%{libdir}/lib{ncurses{,w},tinfo}.so; do
- ln -sf $(echo %{libdir} | \
- sed 's,\(^/\|\)[^/][^/]*,..,g')/%{lib}/$(readlink $l) $l
- done
mkdir -pv %{BUILDROOT}/{etc,lib}/terminfo
# move few basic terminfo entries to /lib
diff --git a/nspr/nspr.nm b/nspr/nspr.nm
index bc357df..c23b137 100644
--- a/nspr/nspr.nm
+++ b/nspr/nspr.nm
@@ -5,7 +5,7 @@
name = nspr
version = 4.8.9
-release = 1
+release = 2
groups = System/Libraries
url = http://www.mozilla.org/projects/nspr/
@@ -56,7 +56,6 @@ build
end
configure_options += \
- --libdir=/%{lib} \
--includedir=/usr/include/nspr4 \
--enable-optimize="%{CFLAGS}" \
--disable-debug
@@ -70,7 +69,6 @@ build
install_cmds
mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}}
- mkdir -pv %{BUILDROOT}/%{lib}
mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
cp -vf %{DIR_APP}/config/nspr-config-pc \
@@ -87,11 +85,6 @@ build
< %{DIR_SOURCE}/nspr.pc.in \
> %{BUILDROOT}%{libdir}/pkgconfig/nspr.pc
- #mv -v %{BUILDROOT}/usr/lib/lib{nspr,plc.plds}4.so %{BUILDROOT}/lib/
- ln -svf ../../%{lib}/libnspr4.so %{BUILDROOT}%{libdir}/libnspr4.so
- ln -svf ../../%{lib}/libplc4.so %{BUILDROOT}%{libdir}/libplc4.so
- ln -svf ../../%{lib}/libplds4.so %{BUILDROOT}%{libdir}/libplds4.so
-
# Remove unneeded stuff
rm -rfv \
%{BUILDROOT}/usr/bin/compile-et.pl \
@@ -106,6 +99,9 @@ packages
package %{name}-devel
template DEVEL
+
+ # libs are not versioned.
+ files += !%{libdir}/*.so
end
package %{name}-debuginfo
diff --git a/popt/popt.nm b/popt/popt.nm
index 5bf894a..92de3e9 100644
--- a/popt/popt.nm
+++ b/popt/popt.nm
@@ -5,7 +5,7 @@
name = popt
version = 1.15
-release = 2
+release = 3
groups = System/Libraries
url = http://www.rpm5.org/
@@ -20,17 +20,6 @@ end
source_dl =
-build
- configure_options += \
- --libdir=/%{lib}
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{libdir}
- rm -vf %{BUILDROOT}/%{lib}/libpopt.so
- ln -sfv ../../%{lib}/libpopt.so.0.0.0 %{BUILDROOT}%{libdir}/libpopt.so
- end
-end
-
packages
package %{name}
diff --git a/tar/tar.nm b/tar/tar.nm
index 3cce8df..b582477 100644
--- a/tar/tar.nm
+++ b/tar/tar.nm
@@ -5,7 +5,7 @@
name = tar
version = 1.26
-release = 3
+release = 4
groups = System/Packaging
url = http://www.gnu.org/software/tar/
@@ -39,7 +39,6 @@ build
end
configure_options += \
- --bindir=/bin \
--libexecdir=/usr/sbin \
--enable-selinux \
FORCE_UNSAFE_CONFIGURE=1
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. de887913ee5c688b8500ec7f6dbe376ce436d492
by git＠ipfire.org 10 Apr '12
by git＠ipfire.org 10 Apr '12
10 Apr '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 de887913ee5c688b8500ec7f6dbe376ce436d492 (commit)
from 5cbbd5f1ed37c0c465378916716319d63234a294 (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 de887913ee5c688b8500ec7f6dbe376ce436d492
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 10 20:21:37 2012 +0200
samba: security update to 3.5.14. (CVE-2012-1182).
Further information can be found in the security advisory:
http://www.samba.org/samba/security/CVE-2012-1182
-----------------------------------------------------------------------
Summary of changes:
lfs/samba | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/lfs/samba b/lfs/samba
index 781a342..9708a9a 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER = 3.5.13
+VER = 3.5.14
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 38
+PAK_VER = 39
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ceb91e31218e337ae8d47b35f03518ca
+$(DL_FILE)_MD5 = a97f5647face6e9214d5c42903412474
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 43c6c1f9e2127642da787133f4ad189b27286d17
by git＠ipfire.org 09 Apr '12
by git＠ipfire.org 09 Apr '12
09 Apr '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 43c6c1f9e2127642da787133f4ad189b27286d17 (commit)
via 81ea5ef61eb8dee16f77eb7c59cea13177af0a31 (commit)
via 26a9a8e84fa47f6f0185fc79a938c089eefb59ad (commit)
from 316bfb6ede68f5e94b884193706a321c95afc959 (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 43c6c1f9e2127642da787133f4ad189b27286d17
Merge: 26a9a8e 81ea5ef
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 9 13:27:09 2012 +0200
Merge remote-tracking branch 'arne_f/automake'
commit 81ea5ef61eb8dee16f77eb7c59cea13177af0a31
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 9 13:16:00 2012 +0200
automake: Update to 1.11.4
Bugfix release. Fixes #10076.
commit 26a9a8e84fa47f6f0185fc79a938c089eefb59ad
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Apr 8 18:48:21 2012 +0200
setools: Increase rel that hasn't been done on last commit.
I've forgot to increase the release nummer on my last commit:
ffbea52f30df9877471a9b01493a603492b40a4e
-----------------------------------------------------------------------
Summary of changes:
automake/automake.nm | 2 +-
setools/setools.nm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/automake/automake.nm b/automake/automake.nm
index 6921d92..6ec57cc 100644
--- a/automake/automake.nm
+++ b/automake/automake.nm
@@ -4,7 +4,7 @@
###############################################################################
name = automake
-version = 1.11.3
+version = 1.11.4
release = 1
arch = noarch
diff --git a/setools/setools.nm b/setools/setools.nm
index 393f5c0..bec628c 100644
--- a/setools/setools.nm
+++ b/setools/setools.nm
@@ -5,7 +5,7 @@
name = setools
version = 3.3.7
-release = 1
+release = 2
groups = System/Base
url = http://oss.tresys.com/projects/setools
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. ab378a41994392ffdbd7e169d15a94dff59aa175
by git＠ipfire.org 09 Apr '12
by git＠ipfire.org 09 Apr '12
09 Apr '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, kernel-update has been updated
via ab378a41994392ffdbd7e169d15a94dff59aa175 (commit)
via fdec4318350a85de39a2bef8a0ea32fdb89d8cab (commit)
via 6560ecaa51f5493aa5674825d1d1b7bc9e464184 (commit)
via 5cbbd5f1ed37c0c465378916716319d63234a294 (commit)
via 8969d075e06a687b8878e9ed1b41133a0f015b05 (commit)
via b7d1e1c4a4ce1bfc1cf87dd5f305110fc009df29 (commit)
via 2d40b8174bb5c7e7f9424439e622c936de87bfc5 (commit)
via 2c0a849f7a7c388bf53072e5fc335b4f97488ba0 (commit)
via f028065fd15c1984db770724bdfb35fa5e0635fa (commit)
via a4826680bc8a58f169327d97da60005dbdc47e0d (commit)
via 844d37795d6166d4017327b550804d47591b09f1 (commit)
via ef5d80c0336c2e484220906d35b75ae93984d57c (commit)
via 67ab1d620624ba3d02ffd94c80cbdb9d1872131c (commit)
via 25a063e66dd06b43685dcd6cc779a6ad71b125b6 (commit)
via 88511b6145749525957565b11b227b207e1f5a65 (commit)
via d2bbe7f46e107c8a94aa84aaa32f570fde298426 (commit)
via 5d934a73dcbbdb1e4dfa7219eb40bbb34e2cc9c7 (commit)
via 16ada955ac658c59f8a2d96acb305699c224482e (commit)
via 8cbc8e01b382df53d9882d7a7e0970287575ad08 (commit)
via 0f0a5a6e5ffee29fa9e63b267d13232d5d8ffe49 (commit)
via 524fc726215f527803423b0af51364ff5904221e (commit)
via 870f68d7f2c8cdd6febf5a1706c52deca992ce86 (commit)
via 42fb65f0f3f78c706d0406f40b6989f3d40e4cae (commit)
via 818f3344652cc151fbe12cdd245f832b80a69fde (commit)
via 2b965cc53472e3e6fed9e743c20f4520d62aa1f5 (commit)
via a183bc774feed70363adfd872edd5c9fcfa2eae6 (commit)
via 863b1f5fb6d6affa023ace41c745f2299ca9f87f (commit)
via 9b33fb7e82ee7dc4e6e7b96ceb14ca874d71784c (commit)
via 343740678ab5617d10102e426a460dceea59d895 (commit)
from f3d2db8c749d0803a919f92e767f1bfd6aea2f95 (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 ab378a41994392ffdbd7e169d15a94dff59aa175
Merge: f3d2db8 fdec431
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 9 12:22:03 2012 +0200
Merge branch 'next' into kernel-update
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{54 => 58}/filelists/GeoIP | 0
.../rootfiles/core/58/filelists/armv5tel/cryptodev | 2 +
config/rootfiles/core/58/filelists/files | 3 +
.../rootfiles/{common => core/58/filelists}/hwdata | 2 +-
config/rootfiles/core/58/filelists/i586/cryptodev | 3 +
config/rootfiles/core/58/update.sh | 15 +-
config/rootfiles/core/{55 => 59}/exclude | 0
.../rootfiles/core/{58 => 59}/filelists/Net-Telnet | 0
config/rootfiles/core/{58 => 59}/filelists/files | 1 -
config/rootfiles/core/{52 => 59}/meta | 0
config/rootfiles/core/{58 => 59}/update.sh | 17 +-
lfs/GeoIP | 4 +-
lfs/pound | 3 +-
make.sh | 4 +-
src/hwdata/pci.ids | 1037 ++++++++++++++------
src/hwdata/usb.ids | 332 ++++++-
.../Pound-2.6-reneg-ciphers-altnames-nosslv2.patch | 452 +++++++++
17 files changed, 1505 insertions(+), 370 deletions(-)
copy config/rootfiles/core/{54 => 58}/filelists/GeoIP (100%)
create mode 100644 config/rootfiles/core/58/filelists/armv5tel/cryptodev
copy config/rootfiles/{common => core/58/filelists}/hwdata (100%)
create mode 100644 config/rootfiles/core/58/filelists/i586/cryptodev
copy config/rootfiles/core/{55 => 59}/exclude (100%)
copy config/rootfiles/core/{58 => 59}/filelists/Net-Telnet (100%)
copy config/rootfiles/core/{58 => 59}/filelists/files (93%)
copy config/rootfiles/core/{52 => 59}/meta (100%)
copy config/rootfiles/core/{58 => 59}/update.sh (89%)
create mode 100644 src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
Difference in files:
diff --git a/config/rootfiles/core/58/filelists/GeoIP b/config/rootfiles/core/58/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/58/filelists/armv5tel/cryptodev b/config/rootfiles/core/58/filelists/armv5tel/cryptodev
new file mode 100644
index 0000000..6870588
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/armv5tel/cryptodev
@@ -0,0 +1,2 @@
+lib/modules/2.6.32.45-ipfire-versatile/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-kirkwood/extra/cryptodev.ko
diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
index 047127e..19d98e5 100644
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@ -1,7 +1,10 @@
etc/system-release
etc/issue
etc/vimrc
+<<<<<<< HEAD
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
+=======
+>>>>>>> master
diff --git a/config/rootfiles/core/58/filelists/hwdata b/config/rootfiles/core/58/filelists/hwdata
new file mode 100644
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
diff --git a/config/rootfiles/core/58/filelists/i586/cryptodev b/config/rootfiles/core/58/filelists/i586/cryptodev
new file mode 100644
index 0000000..da29a79
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/i586/cryptodev
@@ -0,0 +1,3 @@
+lib/modules/2.6.32.45-ipfire/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-pae/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-xen/extra/cryptodev.ko
diff --git a/config/rootfiles/core/58/update.sh b/config/rootfiles/core/58/update.sh
index d05fb84..ccec4b0 100644
--- a/config/rootfiles/core/58/update.sh
+++ b/config/rootfiles/core/58/update.sh
@@ -51,9 +51,16 @@ fi
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
-#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
+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
@@ -67,7 +74,7 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
sync
# This update need a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
#
#Finish
diff --git a/config/rootfiles/core/59/exclude b/config/rootfiles/core/59/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/core/59/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/59/filelists/Net-Telnet b/config/rootfiles/core/59/filelists/Net-Telnet
new file mode 120000
index 0000000..66ca926
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/Net-Telnet
@@ -0,0 +1 @@
+../../../common/Net-Telnet
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/files b/config/rootfiles/core/59/filelists/files
new file mode 100644
index 0000000..16464c7
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/files
@@ -0,0 +1,6 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
diff --git a/config/rootfiles/core/59/meta b/config/rootfiles/core/59/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/59/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/update.sh
new file mode 100644
index 0000000..5a3cc2a
--- /dev/null
+++ b/config/rootfiles/core/59/update.sh
@@ -0,0 +1,82 @@
+#!/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=59
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#Extract files
+
+#
+#Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#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/lfs/GeoIP b/lfs/GeoIP
index 653d654..271bab6 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
include Config
VER = 1.17
-DATVER = 06122011
+DATVER = 03032012
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 = 78baa14e4e271f5fb9f75e5ff1169950
+GeoIP.dat-$(DATVER).gz_MD5 = 98ba2a5c177cdfa8da6f9fab524e948d
install : $(TARGET)
diff --git a/lfs/pound b/lfs/pound
index 1b9e523..f2a7f5f 100644
--- a/lfs/pound
+++ b/lfs/pound
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pound
-PAK_VER = 3
+PAK_VER = 4
DEPS = ""
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/pound-2.6.patch
+ cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/make.sh b/make.sh
index da98e28..b1b8514 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="58" # Core Level (Filename)
-PAKFIRE_CORE="57" # Core Level (PAKFIRE)
+CORE="59" # Core Level (Filename)
+PAKFIRE_CORE="58" # 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
diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index f13551b..27618a6 100644
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,11 +1,11 @@
#
# List of PCI ID's
#
-# Version: 2011.11.09
-# Date: 2011-11-09 03:15:02
+# Version: 2012.04.04
+# Date: 2012-04-04 03:15:01
#
# Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the
-# PCI ID Project at http://pciids.sf.net/.
+# PCI ID Project at http://pci-ids.ucw.cz/.
#
# New data are always welcome, especially if they are accurate. If you have
# anything to contribute, please follow the instructions at the web site.
@@ -93,7 +93,7 @@
8519 OV519 series
05e3 CyberDoor
0701 CBD516
-066f Sigmatel Inc.
+066f SigmaTel
3410 SMTP3410
3500 SMTP3500
0675 Dynalink
@@ -383,6 +383,7 @@
1028 1f35 PERC H710 Adapter
1028 1f37 PERC H710 Mini (for blades)
1028 1f38 PERC H710 Mini (for monolithics)
+ 8086 3513 RMS25PB080 RAID Controller
005c SAS1064A PCI-X Fusion-MPT SAS
005d MegaRAID SAS-3 3108 [Invader]
005e SAS1066 PCI-X Fusion-MPT SAS
@@ -423,7 +424,7 @@
0065 SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor]
006e SAS2308 PCI-Express Fusion-MPT SAS-2
0070 SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire]
- 0071 MR SAS HBA
+ 0071 MR SAS HBA 2004
0072 SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon]
1028 1f1c 6Gbps SAS HBA Adapter
1028 1f1d PERC H200 Adapter
@@ -432,7 +433,7 @@
1028 1f20 PERC H200 Embedded
1028 1f22 Internal Tape Adapter
8086 350f RMS2LL040 RAID Controller
- 0073 MegaRAID SAS 9240
+ 0073 MegaRAID SAS 2008 [Falcon]
1000 9240 MegaRAID SAS 9240-8i
1000 9241 MegaRAID SAS 9240-4i
1014 03b1 ServeRAID M1015 SAS/SATA Controller
@@ -446,6 +447,8 @@
1054 3035 LSI MegaRAID SAS 9240-8i
1137 0072 2004 iMR ROMB
1137 0073 2008 ROMB
+ 1137 00b0 UCSC RAID SAS 2008M-8i
+ 1137 00b1 UCSC RAID SAS 2008M-8i
15d9 0400 Supermicro SMC2008-iMR
1734 1177 RAID Ctrl SAS 6G 0/1 (D2607)
8086 350d RMS2AF040 RAID Controller
@@ -462,6 +465,8 @@
1000 9262 MegaRAID SAS 9262-8i
1000 9263 MegaRAID SAS 9261-8i
1000 9264 MegaRAID SAS 9264-8i
+ 1000 9267 MegaRAID SAS 9260CV-4i
+ 1000 9268 MegaRAID SAS 9260CV-8i
1000 9275 MegaRAID SAS 9280-8ex
1000 9276 MR9260-16i
1000 9280 MegaRAID SAS 9280-8e
@@ -496,6 +501,7 @@
0085 SAS2208 PCI-Express Fusion-MPT SAS-2
0086 SAS2308 PCI-Express Fusion-MPT SAS-2
0087 SAS2308 PCI-Express Fusion-MPT SAS-2
+ 1590 0044 H220i
008f 53c875J
1092 8000 FirePort 40 SCSI Controller
1092 8760 FirePort 40 Dual SCSI Host Adapter
@@ -531,7 +537,7 @@
8086 3008 MegaRAID RAID Controller SRCS28X
8086 3431 MegaRAID RAID Controller Alief SROMBU42E
8086 3499 MegaRAID RAID Controller Harwich SROMBU42E
- 0411 MegaRAID SAS
+ 0411 MegaRAID SAS 1068
1000 1001 MegaRAID SAS 8408E
1000 1002 MegaRAID SAS 8480E
1000 1003 MegaRAID SAS 8344ELP
@@ -550,7 +556,7 @@
8086 3500 SROMBSAS18E RAID Controller
8086 3501 SROMBSAS18E RAID Controller
8086 3504 SROMBSAS18E RAID Controller
- 0413 MegaRAID SAS Verde ZCR
+ 0413 MegaRAID SAS 1068 [Verde ZCR]
1000 1005 MegaRAID SAS 8300XLP
0621 FC909 Fibre Channel Adapter
0622 FC929 Fibre Channel Adapter
@@ -599,12 +605,14 @@
0016 PCI-MFB Analogue I/O board
0017 PROTO-3 PCI Prototyping board
9100 INI-9100/9100W SCSI Host
-1002 ATI Technologies Inc
+# nee ATI Technologies Inc.
+1002 Advanced Micro Devices [AMD] nee ATI
1314 Wrestler HDMI Audio [Radeon HD 6250/6310]
+ 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
3150 M24 1P [Radeon Mobility X600]
103c 0934 nx8220
3151 M24 [FireMV 2400]
- 3152 M22 [Radeon Mobility X300]
+ 3152 RV370 [Mobility Radeon X300]
3154 M24GL [Mobility FireGL V3200]
3171 M24 [FireMV 2400] (Secondary)
3e50 RV380 0x3e50 [Radeon X600]
@@ -759,7 +767,7 @@
1458 b005 Gigabyte GA-MA69G-S3H Motherboard
1462 7327 K9AG Neo2
17f2 5999 KI690-AM2 Motherboard
- 4381 SB600 Raid-5 SATA
+ 4381 SB400 SATA Controller (RAID 5 mode)
4382 SB600 AC97 Audio
4383 SBx00 Azalia (Intel HDA)
103c 1611 Pavilion DM1Z-3000
@@ -942,9 +950,9 @@
1002 0084 Rage 3D Pro AGP 2x XPERT 98
1002 0087 Rage 3D IIC
1002 475a Rage IIC AGP
- 4964 Radeon RV250 Id [Radeon 9000]
- 4965 Radeon RV250 Ie [Radeon 9000]
- 4966 Radeon RV250 If [Radeon 9000]
+ 4964 RV250 Id [Radeon 9000]
+ 4965 RV250 Ie [Radeon 9000]
+ 4966 R250 If [Radeon 9000]
10f1 0002 RV250 If [Tachyon G9000 PRO]
148c 2039 RV250 If [Radeon 9000 Pro "Evil Commando"]
1509 9a00 RV250 If [Radeon 9000 "AT009"]
@@ -953,7 +961,7 @@
174b 7192 RV250 If [Radeon 9000 "Atlantis"]
17af 2005 RV250 If [Excalibur Radeon 9000 Pro]
17af 2006 RV250 If [Excalibur Radeon 9000]
- 4967 Radeon RV250 Ig [Radeon 9000]
+ 4967 RV250 Ig [Radeon 9000]
496e RV250 [Radeon 9000] (Secondary)
4a48 R420 JH [Radeon X800]
4a49 R420 JI [Radeon X800PRO]
@@ -961,7 +969,7 @@
4a4b R420 JK [Radeon X800]
4a4c R420 JL [Radeon X800]
4a4d R420 JM [FireGL X3]
- 4a4e M18 JN [Radeon Mobility 9800]
+ 4a4e R420 JN [Mobility Radeon 9800]
4a4f R420 [Radeon X800 AGP]
4a50 R420 JP [Radeon X800XT]
4a54 R420 [Radeon X800 VE]
@@ -1016,7 +1024,7 @@
1033 8112 Versa Note VXi
4c53 Rage Mobility L
4c54 264LT [Mach64 LT]
- 4c57 Radeon Mobility M7 LW [Radeon Mobility 7500]
+ 4c57 RV200 [Mobility Radeon 7500]
1014 0517 ThinkPad T30
1014 0530 ThinkPad T42 2373-4WU
1028 00e6 Radeon Mobility M7 LW (Dell Inspiron 8100)
@@ -1024,7 +1032,7 @@
1043 1622 Mobility Radeon M7 (L3C/S)
144d c006 Radeon Mobility M7 LW in vpr Matrix 170B4
4c58 Radeon RV200 LX [Mobility FireGL 7800 M7]
- 4c59 Radeon Mobility M6 LY
+ 4c59 RV100 LY [Mobility Radeon 7000]
0e11 b111 Evo N600c
1014 0235 ThinkPad A30/A30p (2652/2653)
1014 0239 ThinkPad X22/X23/X24
@@ -1032,7 +1040,7 @@
104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
104d 8140 PCG-Z1SP laptop
1509 1930 Medion MD9703
- 4c5a Radeon Mobility M6 LZ
+ 4c5a RV100 LZ [Mobility Radeon 7000]
4c64 Radeon RV250 Ld [Radeon Mobility 9000 M9]
4c65 Radeon RV250 Le [Radeon Mobility 9000 M9]
4c66 Radeon RV250 [Mobility FireGL 9000]
@@ -1064,10 +1072,10 @@
144d c00c P35 notebook
1462 0311 MSI M510A
1734 1055 Amilo M1420W
- 4e51 M10 NQ [Radeon Mobility 9600]
+ 4e51 RV350 NQ [Mobility Radeon 9600]
4e52 RV350 [Mobility Radeon 9600 M10]
144d c00c P35 notebook
- 4e53 M10 NS [Radeon Mobility 9600]
+ 4e53 RV350 NS [Mobility Radeon 9600]
4e54 M10 NT [FireGL Mobility T2]
4e56 M11 NV [FireGL Mobility T2e]
4e64 Radeon R300 [Radeon 9700 Pro] (Secondary)
@@ -1157,7 +1165,7 @@
514f Radeon R200 QO [Radeon 8500LE]
5154 R200 QT [Radeon 8500]
5155 R200 QU [Radeon 9100]
- 5157 Radeon RV200 QW [Radeon 7500]
+ 5157 RV200 QW [Radeon 7500]
1002 013a Radeon 7500
1002 0f2b ALL-IN-WONDER VE PCI
1002 103a Dell Optiplex GX260
@@ -1169,8 +1177,8 @@
174b 7147 RV200 QW [Sapphire Radeon 7500LE]
174b 7161 Radeon RV200 QW [Radeon 7500 LE]
17af 0202 RV200 QW [Excalibur Radeon 7500LE]
- 5158 Radeon RV200 QX [Radeon 7500]
- 5159 Radeon RV100 QY [Radeon 7000/VE]
+ 5158 RV200 QX [Radeon 7500]
+ 5159 RV100 QY [Radeon 7000/VE]
1002 000a Radeon 7000/Radeon VE
1002 000b Radeon 7000
1002 0038 Radeon 7000/Radeon VE
@@ -1195,7 +1203,7 @@
174b 7c28 Sapphire Radeon VE 7000 DDR
1787 0202 RV100 QY [Excalibur Radeon 7000]
17ee 1001 Radeon 7000 64MB DDR + DVI
- 515a Radeon RV100 QZ [Radeon 7000/VE]
+ 515a RV100 QZ [Radeon 7000/VE]
515e ES1000
1028 01bb PowerEdge 1955 Embedded ATI ES1000
1028 01df PowerEdge SC440
@@ -1265,11 +1273,11 @@
5453 Rage 128 Pro Ultra TS
5454 Rage 128 Pro Ultra TT
5455 Rage 128 Pro Ultra TU
- 5460 M22 [Mobility Radeon X300]
+ 5460 RV370 [Mobility Radeon X300]
1775 1100 CR11/VR11 Single Board Computer
- 5461 M22 [Mobility Radeon X300]
- 5462 M24 [Radeon Mobility X600]
- 5464 M22 [FireGL GL]
+ 5461 RV370 [Mobility Radeon X300]
+ 5462 RV380 [Mobility Radeon X600]
+ 5464 RV370 [Mobility FireGL V3100]
5548 R423 UH [Radeon X800 (PCIE)]
5549 R423 UI [Radeon X800PRO (PCIE)]
554a R423 UJ [Radeon X800LE (PCIE)]
@@ -1480,6 +1488,7 @@
5e6d RV410 [Radeon X700 (PCIE)] (Secondary)
148c 2117 PowerColor Bravo X700
5f57 R423 [Radeon X800XT (PCIE)]
+ 6707 Cayman LE GL [FirePro V5900]
6718 Cayman XT [Radeon HD 6970]
6719 Cayman PRO [Radeon HD 6950]
671d Antilles [AMD Radeon HD 6990]
@@ -1492,6 +1501,7 @@
6741 Whistler [AMD Radeon HD 6600M Series]
6742 Whistler LE [AMD Radeon HD 6625M Graphics]
6743 Whistler [Radeon E6760]
+ 6749 Turks [FirePro V4900]
6750 Turks [AMD Radeon HD 6570]
6751 Turks [Radeon HD 7600A Series]
6758 Turks [Radeon HD 6670]
@@ -1510,6 +1520,9 @@
6798 Tahiti XT [Radeon HD 7970]
6799 New Zealand [Radeon HD 7990]
679a Tahiti PRO [Radeon HD 7950]
+ 6800 WIMBLEDON XT [Radeon HD 7970M]
+ 6818 PITCAIRN [Radeon HD 7800]
+ 6819 PITCAIRN PRO [Radeon HD 7800 Series]
6840 Thames XT/GL [Radeon HD 7600M Series]
6841 Thames [Radeon 7500M/7600M Series]
6843 Thames [Radeon HD 7670M]
@@ -1735,6 +1748,7 @@
9480 M96 [Mobility Radeon HD 4650]
103c 3628 ATI Mobility Radeon HD 4650 [dv6-1190en]
9485 RV740 Pro [Radeon HD 4770]
+ 9488 RV730 XT [Mobility Radeon HD 4670]
9489 M96 XT [Mobility FireGL V5725]
9490 RV730XT [Radeon HD 4670]
174b e880 Radeon HD 4670 512MB DDR3
@@ -1763,10 +1777,10 @@
94c9 Mobility Radeon HD 2400
1002 94c9 Radeon HD2400
94cb Radeon E2400
- 94cc RV 610LE PCI [Radeon HD 2400]
- 9501 Radeon HD 3870
+ 94cc RV610 LE [Radeon HD 2400 Pro PCI]
+ 9501 RV670 [Radeon HD 3870]
174b e620 Sapphire Radeon HD 3870 PCIe 2.0
- 9504 Mobility Radeon HD 3850
+ 9504 RV670 [Mobility Radeon HD 3850]
9505 RV670PRO [Radeon HD 3850]
9507 RV670 [Radeon HD 3850]
9508 M88 XT Mobility Radeon HD 3870]
@@ -1777,15 +1791,15 @@
9540 RV710 [Radeon HD 4550]
954f RV710 [Radeon HD 4350]
1462 1618 R4350 MD512H (MS-V161)
- 9552 M92 LP [Mobility Radeon HD 4300 Series]
- 9553 M92 [Mobility Radeon HD 4500/5100 Series]
+ 9552 RV710 [Mobility Radeon HD 4300 Series]
+ 9553 RV710 [Mobility Radeon HD 4500/5100 Series]
1179 ff82 Satellite L505-13T GPU (Mobility Radeon HD 5145)
- 9555 M93 [Mobility Radeon HD 4300/4500 Series]
+ 9555 RV710 [Mobility Radeon HD 4300/4500 Series]
103c 1411 ProBook 4720s GPU (Mobility Radeon HD 4350)
- 9559 Mobility Radeon HD 3600 Series
- 955f M92 [Mobility Radeon HD 4330]
- 9581 M76 [Radeon Mobility HD 2600 Series]
- 9583 M76XT [Mobility Radeon HD 2600 XT]
+ 9559 RV635 [Mobility Radeon HD 3600 Series]
+ 955f RV710 [Mobility Radeon HD 4330]
+ 9581 RV630 [Mobility Radeon HD 2600]
+ 9583 RV630 [Mobility Radeon HD 2600 XT]
9586 RV 630 XT AGP [Radeon HD 2600 XT AGP]
9587 RV630 PRO AGP [Radeon HD 2600 PRO AGP]
9588 RV630 [Radeon HD 2600XT]
@@ -1795,16 +1809,16 @@
958d RV630 [FireGL V3600]
9591 RV635 [Mobility Radeon HD 3650]
1002 9591 Mobility Radeon HD 3650
- 9593 Radeon Mobility HD 3670
+ 9593 RV635 [Mobility Radeon HD 3670]
9595 M86GL [Mobility FireGL V5700]
9596 RV635 PRO AGP [Radeon HD 3650]
1043 0028 EAH3650 SILENT/HTDI/512M/A
- 9598 Mobility Radeon HD 3600 Series
+ 9598 RV630 [Radeon HD 3600 Series]
1002 9598 Mobility Radeon HD 3600
1043 01d6 EAH3650 Silent
95c0 RV620 PRO [Radeon HD 3470]
1002 95c0 Mobility Radeon HD 3470
- 95c4 Mobility Radeon HD 3400 Series
+ 95c4 RV620 [Mobility Radeon HD 3400 Series]
1002 95c4 Mobility Radeon HD 3400
95c5 RV620 LE [Radeon HD 3450]
95c6 RV620 LE AGP [Radeon HD 3450]
@@ -1823,6 +1837,9 @@
9614 RS780D [Radeon HD 3300]
9615 RS780E [Radeon HD 3200]
9616 RS780L [Radeon HD 3000]
+ 9640 BeaverCreek [Radeon HD 6550D]
+ 9641 BeaverCreek [Mobility Radeon HD 6620G]
+ 964a BeaverCreek [Radeon HD 6530D]
970f RS880 HDMI Audio [Radeon HD 4200 Series]
1043 83a2 M4A785TD Motherboard
1043 843e M5A88-V EVO
@@ -1837,12 +1854,13 @@
9802 Wrestler [Radeon HD 6310]
9804 Wrestler [Radeon HD 6250]
9806 Wrestler [Radeon HD 6320]
+ 9807 Wrestler [Radeon HD 6290]
aa00 R600 Audio Device [Radeon HD 2900 Series]
- aa08 RV630/M76 audio device [Radeon HD 2600 Series]
- aa10 RV610 audio device [Radeon HD 2400 PRO]
+ aa08 RV630 audio device [Radeon HD 2600 Series]
+ aa10 RV610 HDMI Audio [Radeon HD 2350/2400 Series]
174b aa10 Sapphire HD 2400 PRO audio device
18bc aa10 GeCube Radeon HD 2400 PRO HDCP-capable digital-only audio device
- aa18 Radeon HD 3870 Audio device
+ aa18 RV670/680 HDMI Audio [Radeon HD 3690/3800 Series]
aa20 RV635 HDMI Audio [Radeon HD 3600 Series]
aa28 RV620 HDMI Audio [Radeon HD 3400 Series]
aa30 RV770 HDMI Audio [Radeon HD 4850/4870]
@@ -1852,14 +1870,19 @@
174b aa38 R700 Audio Device [Radeon HD 4000 Series]
aa50 Cypress HDMI Audio [Radeon HD 5800 Series]
aa58 Juniper HDMI Audio [Radeon HD 5700 Series]
- aa60 Redwood HDMI Audio [Radeon HD 5600 Series]
+# 5500, 5600 and mobile 5700 series
+ aa60 Redwood HDMI Audio [Radeon HD 5000 Series]
1025 033d Mobility Radeon HD 5650
1025 0347 Aspire 7740G
- aa68 Manhattan HDMI Audio [Mobility Radeon HD 5000 Series]
+ aa68 Cedar HDMI Audio [Radeon HD 5400/6300 Series]
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]
aa98 Caicos HDMI Audio [Radeon HD 6400 Series]
174b aa98 Sapphire HD 6450 1GB DDR3
+ aaa0 Tahiti XT HDMI Audio [Radeon HD 7970 Series]
ac00 Theater 600 Pro
ac02 TV Wonder HD 600 PCIe
ac12 Theater HD T507 (DVB-T) TV tuner/capture device
@@ -2259,7 +2282,7 @@
1014 033b PCIe2 6Gb SAS RAID Adapter Quad-port (57B4)
1014 0355 PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57B1)
1014 0357 PCIe2 6Gb SAS Adapter Quad-port (57C6)
- 1014 035d PCIe2 3.6GB Cache 6Gb SAS RAID & SSD Adapter (575D)
+ 1014 035d PCIe3 1.8GB Cache RAID SAS Adapter Quad-port 6GB (57C8)
1014 035e PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57CE)
3022 QLA3022 Network Adapter
4022 QLA3022 Network Adapter
@@ -2347,6 +2370,21 @@
1302 Family 11h Processor DRAM Controller
1303 Family 11h Processor Miscellaneous Control
1304 Family 11h Processor Link Control
+ 1400 Family 15h (Models 10h-1fh) Processor Function 0
+ 1401 Family 15h (Models 10h-1fh) Processor Function 1
+ 1402 Family 15h (Models 10h-1fh) Processor Function 2
+ 1403 Family 15h (Models 10h-1fh) Processor Function 3
+ 1404 Family 15h (Models 10h-1fh) Processor Function 4
+ 1405 Family 15h (Models 10h-1fh) Processor Function 5
+ 1410 Family 15h (Models 10h-1fh) Processor Root Complex
+ 1412 Family 15h (Models 10h-1fh) Processor Root Port
+ 1413 Family 15h (Models 10h-1fh) Processor Root Port
+ 1414 Family 15h (Models 10h-1fh) Processor Root Port
+ 1415 Family 15h (Models 10h-1fh) Processor Root Port
+ 1416 Family 15h (Models 10h-1fh) Processor Root Port
+ 1417 Family 15h (Models 10h-1fh) Processor Root Port
+ 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
1512 Family 14h Processor Root Port
1513 Family 14h Processor Root Port
@@ -2672,7 +2710,7 @@
00cf AIC-7899P U160/m
1028 0106 PowerEdge 4600
1028 0121 PowerEdge 2650
-102b Matrox Graphics, Inc.
+102b Matrox Electronics Systems Ltd.
# DJ: I've a suspicion that 0010 is a duplicate of 0d10.
0010 MGA-I [Impression?]
0100 MGA 1064SG [Mystique]
@@ -2913,10 +2951,46 @@
102b 0101 Millenium P690 PCI
102b 0140 Millenium P690 LP PCIe x1
102b 0180 Display Wall IP Decode 128 MB
+ 4164 Morphis QxT frame grabber
+ 43b4 Morphis Qxt encoding engine
+ 4510 Morphis COM port
4536 VIA Framegrabber
- 4cdc Morphis Vision System Jpeg2000
- 4fc5 Morphis Vision System
- 5e10 Morphis Vision System Aux/IO
+ 4686 Concord GX (customized Intel 82541)
+ 475b Solios eCL/XCL-B frame grabber
+ 475d Vio frame grabber family
+ 102b 4b90 Vio Duo frame grabber (single channel)
+ 102b 4b91 Vio Duo frame grabber
+ 102b 4b92 Vio Analog frame grabber
+ 102b 4b93 Vio SDI Frame Grabber
+ 102b 4b94 Vio DVI-A frame grabber
+ 475f Solios (single-Full) CL frame grabber
+ 102b 475f Solios eCL/XCL-F frame grabber
+ 102b 4d5f Solios eV-CL (single-Full) frame grabber
+ 102b 4e5f Solios eM-CL (single-Full) frame grabber
+ 47a1 Solios eA/XA frame grabber
+ 102b 4be0 Solios eA/XA (single) frame grabber
+ 102b 4be1 Solios eA/XA (dual) frame grabber
+ 102b 4be2 Solios eA/XA (quad) frame grabber
+ 47a2 Solios COM port
+ 47c1 Solios (dual-Base/single-Medium) CL frame grabber
+ 102b 0000 Solios frame grabber
+ 102b 4b80 Solios eCL/XCL (single-Medium) frame grabber
+ 102b 4b81 Solios eCL/XCL (dual-Base) frame grabber
+ 102b 4d80 Solios eV-CL (single-Medium) frame grabber
+ 102b 4d81 Solios eV-CL (dual-Base) frame grabber
+ 102b 4e80 Solios eM-CL (single-Medium) frame grabber
+ 102b 4e81 Solios eM-CL (dual-Base) frame grabber
+ 47c2 Solios COM port
+ 4949 Radient frame grabber family
+ 102b 0010 Radient eCL (Single-full) frame grabber
+ 102b 0020 Radient eCL (Dual-base) frame grabber
+ 102b 0030 Radient eCL (Dual-full) frame grabber
+ 102b 0040 Radient eCL (Quad-base) frame grabber
+ 102b 0050 Radient eCL (Golden) frame grabber
+ 4cdc Morphis JPEG2000 accelerator
+ 4f54 Morphis (e)Quad frame grabber
+ 4fc5 Morphis (e)Dual frame grabber
+ 5e10 Morphis aux I/O
6573 Shark 10/100 Multiport SwitchNIC
102c Chips and Technologies
00b8 F64310
@@ -3005,7 +3079,7 @@
003e NAPCCARD Cardbus Controller
0046 PowerVR PCX2 [midas]
005a Vrc5074 [Nile 4]
- 0063 Firewarden
+ 0063 uPD72862 [Firewarden] IEEE1394 OHCI 1.0 Link Controller
0067 PowerVR Neon 250 Chipset
1010 0020 PowerVR Neon 250 AGP 32Mb
1010 0080 PowerVR Neon 250 AGP 16Mb
@@ -3021,17 +3095,17 @@
009b Vrc5476
00a5 VRC4173
00a6 VRC5477 AC97
- 00cd IEEE 1394 [OrangeLink] Host Controller
+ 00cd uPD72870 [Firewarden] IEEE1394a OHCI 1.0 Link/3-port PHY Controller
12ee 8011 Root hub
- 00ce IEEE 1394 Host Controller
+ 00ce uPD72871 [Firewarden] IEEE1394a OHCI 1.0 Link/1-port PHY Controller
00df Vr4131
00e0 USB 2.0
12ee 7001 Root hub
14c2 0205 PTI-205N USB 2.0 Host Controller
1799 0002 Root Hub
807d 1043 PCI-USB2 (EHCI subsystem)
- 00e7 uPD72873 IEEE1394 OHCI 1.1 2-port Host Controller
- 00f2 uPD72874 IEEE1394 OHCI 1.1 3-port PHY-Link Ctrlr
+ 00e7 uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller
+ 00f2 uPD72874 [Firewarden] IEEE1394a OHCI 1.1 Link/3-port PHY Controller
00f3 uPD6113x Multimedia Decoder/Processor [EMMA2]
010c VR7701
0125 uPD720400 PCI Express - PCI/PCI-X Bridge
@@ -3039,6 +3113,9 @@
0194 uPD720200 USB 3.0 Host Controller
1028 04b2 Vostro 3350
1043 8413 P8P67 Deluxe Motherboard
+ 1b96 0001 USB 3.0 PCIe Card
+ 01e7 uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller
+ 01f2 uPD72874 [Firewarden] IEEE1394a OHCI 1.1 Link/3-port PHY Controller
1034 Framatome Connectors USA Inc.
1035 Comp. & Comm. Research Lab
1036 Future Domain Corp.
@@ -3289,6 +3366,7 @@
1303 RMP-3 (Remote Management Processor)
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
2910 E2910A PCIBus Exerciser
2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
3080 Pavilion ze2028ea
@@ -3316,6 +3394,12 @@
103c 3249 Smart Array P812
103c 324a HP Smart Array 712m (Mezzanine RAID controller)
103c 324b Smart Array P711m (Mezzanine RAID controller)
+ 323b Smart Array Gen8 Controllers
+ 103c 3350 P222
+ 103c 3351 P420
+ 103c 3352 P421
+ 103c 3354 P420i
+ 103c 3355 P220i
3300 Integrated Lights-Out Standard Virtual USB Controller
103c 3304 iLO2
103c 3305 iLO2
@@ -3534,21 +3618,28 @@
1102 100f Graphics Blaster Extreme
3d3d 0100 Reference Permedia 2 3D
8000 PCILynx/PCILynx2 IEEE 1394 Link Layer Controller
+ 105e 8003 FireBoard200
1443 8003 FireBoard200
+ 1443 8005 FireBoard400
+ 1443 8006 FireBoard400
e4bf 1010 CF1-1-SNARE
e4bf 1020 CF1-2-SNARE
+ e4bf 1040 FireCompact400
8009 TSB12LV22 IEEE-1394 Controller
104d 8032 8032 OHCI i.LINK (IEEE 1394) Controller
+ 1443 8010 FireBoard400-OHCI
8017 PCI4410 FireWire Controller
8019 TSB12LV23 IEEE-1394 Controller
11bd 000a Studio DV500-1394
11bd 000e Studio DV
+ 1443 8010 FireBoard400-OHCI
e4bf 1010 CF2-1-CYMBAL
8020 TSB12LV26 IEEE-1394 Controller (Link)
1028 00d8 Precision 530
104d 80e2 VAIO PCV-J200
11bd 000f Studio DV500-1394
11bd 001c Excalibur 4.1
+ 1443 8010 FireBoard400-OHCI
8021 TSB43AA22 IEEE-1394 Controller (PHY/Link Integrated)
104d 80df Vaio PCG-FX403
104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
@@ -3559,12 +3650,17 @@
1043 808b K8N4-E Mainboard
1043 815b P5W DH Deluxe Motherboard
1443 8023 FireCard400
+ 8086 5044 Desktop Board DP35DP
8024 TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link)
107d 6620 Winfast DV2000 FireWire Controller
1443 8024 FireBoard Blue
1458 1000 GA-EP45-DS5 Motherboard
8025 TSB82AA2 IEEE-1394b Link Layer Controller
+ 1043 813c P5P series mainboard
+ 1443 8025 FireBoard800
1458 1000 GA-K8N Ultra-9 Mainboard
+ 1546 8025 FWB-PCI01
+ 17fc 8025 GIC3800
8026 TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link)
1025 0035 TravelMate 660
1025 003c Aspire 2001WLCi (Compaq CL50 motherboard)
@@ -3935,7 +4031,7 @@
1043 809e A7V8X motherboard
3515 PDC40719 [FastTrak TX4300/TX4310]
3519 PDC40519 (FastTrak TX4200)
- 3570 20771 (FastTrak TX2300)
+ 3570 PDC20771 [FastTrak TX2300]
3571 PDC20571 (FastTrak TX2200)
3574 PDC20579 SATAII 150 IDE Controller
3577 PDC40779 (SATA 300 779)
@@ -3955,8 +4051,8 @@
105a 4d30 Ultra Device on SuperTrak
105a 4d33 Ultra66
105a 4d39 FastTrak66
- 4d68 PDC20268 (Ultra100 TX2)
- 105a 4d68 Ultra100TX2
+ 4d68 PDC20268 [Ultra100 TX2]
+ 105a 4d68 Ultra100 TX2
4d69 20269
105a 4d68 Ultra133TX2
5275 PDC20276 (MBFastTrak133 Lite)
@@ -4108,7 +4204,7 @@
ba57 eXtremeRAID 4000/5000 support Device
1069 0072 eXtremeRAID 5000 support Device
106a Aten Research Inc
-106b Apple Computer Inc.
+106b Apple Inc.
0001 Bandit PowerPC host bridge
0002 Grand Central I/O
0003 Control Video
@@ -4178,6 +4274,7 @@
0074 U4 HT Bridge
1645 Tigon3 Gigabit Ethernet NIC (BCM5701)
106c Hynix Semiconductor
+ 8139 8139c 100BaseTX Ethernet Controller
8801 Dual Pentium ISA/PCI Motherboard
8802 PowerPC ISA/PCI Motherboard
8803 Dual Window Graphics Accelerator
@@ -4362,8 +4459,7 @@
108d 0017 OC-2250 GoCard 10/100 Ethernet Adapter
0021 OC-6151/6152 [RapidFire ATM 155]
0022 ATM Adapter
-# formerly Sun Microsystems
-108e Oracle Corporation
+108e Oracle/SUN
0001 EBUS
1000 EBUS
1001 Happy Meal 10/100 Ethernet [hme]
@@ -4857,6 +4953,9 @@
8664 PEX 8664 64-lane, 16-Port PCI Express Gen 2 (5.0 GT/s) Switch
8680 PEX 8680 80-lane, 20-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch
8696 PEX 8696 96-lane, 24-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch
+ 8732 PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch
+# This is the Non-Transparent-Bridge Virtualized Port as presented by the PLX PEX 8732 chip, the physical bridges show up at 10b5:8732
+ 87b0 PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch
9016 PLX 9016 8-port serial controller
9030 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge
10b5 2695 Hilscher CIF50-PB Profibus Master Board
@@ -5418,7 +5517,7 @@
10dd Evans & Sutherland
0100 Lightning 1200
10dd 0023 Lightning 1200 15+16M
-10de nVidia Corporation
+10de NVIDIA Corporation
0008 NV1 [EDGE 3D]
0009 NV1 [EDGE 3D]
0010 NV2 [Mutara V08]
@@ -5911,7 +6010,7 @@
0197 G80 [Tesla C870]
019d G80 [Quadro FX 5600]
019e G80 [Quadro FX 4600]
- 01a0 NVCrush11 [GeForce2 MX Integrated Graphics]
+ 01a0 nForce 220/420 NV11 [GeForce2 MX]
01a4 nForce CPU bridge
01ab nForce 420 Memory Controller (DDR)
01ac nForce 220/420 Memory Controller
@@ -5974,6 +6073,7 @@
0215 NV48 [GeForce 6800 GT]
0218 NV48 [GeForce 6800 XT]
0221 NV44A [GeForce 6200]
+ 1043 81e1 N6200/TD/256M/A
3842 a341 256A8N341DX
0222 NV44 [GeForce 6200 A-LE]
0240 C51PV [GeForce 6150]
@@ -6238,7 +6338,7 @@
0361 MCP55 LPC Bridge
1028 0221 PowerEdge R805 MCP55 LPC Bridge
0362 MCP55 LPC Bridge
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
0363 MCP55 LPC Bridge
0364 MCP55 LPC Bridge
1028 0221 PowerEdge R805 MCP55 LPC Bridge
@@ -6248,26 +6348,27 @@
0368 MCP55 SMBus
1028 020c PowerEdge M605 MCP55 SMBus
1028 0221 PowerEdge R805 MCP55 SMBus
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
0369 MCP55 Memory Controller
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
036a MCP55 Memory Controller
036b MCP55 SMU
036c MCP55 USB Controller
1028 020c PowerEdge M605 MCP55 USB Controller
1028 0221 PowerEdge R805 MCP55 USB Controller
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
036d MCP55 USB Controller
1028 020c PowerEdge M605 MCP55 USB Controller
1028 0221 PowerEdge R805 MCP55 USB Controller
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
036e MCP55 IDE
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
0370 MCP55 PCI bridge
0371 MCP55 High Definition Audio
+ 147b 1c24 KN9 series mainboard
0372 MCP55 Ethernet
0373 MCP55 Ethernet
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
0374 MCP55 PCI Express bridge
0375 MCP55 PCI Express bridge
0376 MCP55 PCI Express bridge
@@ -6277,7 +6378,7 @@
037e MCP55 SATA Controller
037f MCP55 SATA Controller
1028 0221 PowerEdge R805 MCP55 SATA Controller
- 147b 12c4 KN9-Ultra Mainboard
+ 147b 1c24 KN9 series mainboard
038b G73 [GeForce 7650 GS]
0390 G73 [GeForce 7650 GS]
0391 G73 [GeForce 7600 GT]
@@ -6337,7 +6438,9 @@
1028 020e Inspiron 531
1849 03e0 939NF6G-VSTA Board
03e1 MCP61 LPC Bridge
- 03e2 MCP61 LPC Bridge
+ 1043 83a4 M4N68T series motherboard
+ 03e2 MCP61 Host Bridge
+ 1043 83a4 M4N68T series motherboard
03e3 MCP61 LPC Bridge
03e4 MCP61 High Definition Audio
03e5 MCP61 Ethernet
@@ -6354,22 +6457,30 @@
1849 03ea 939NF6G-VSTA Board
03eb MCP61 SMBus
1028 020e Inspiron 531
+ 1043 83a4 M4N68T series motherboard
1849 03eb 939NF6G-VSTA Board
03ec MCP61 IDE
+ 1025 0392 ET1350
1028 020e Inspiron 531
+ 1043 83a4 M4N68T series motherboard
1849 03ec 939NF6G-VSTA Board
03ee MCP61 Ethernet
03ef MCP61 Ethernet
+ 1025 8000 ET1350
1028 020e Inspiron 531
+ 1043 83a4 M4N68T series motherboard
1849 03ef 939NF6G-VSTA Board
03f0 MCP61 High Definition Audio
1028 020e Inspiron 531
+ 1043 8415 M4N68T series motherboard
1849 0888 939NF6G-VSTA Board
- 03f1 MCP61 USB Controller
+ 03f1 MCP61 USB 1.1 Controller
1028 020e Inspiron 531
+ 1043 83a4 M4N68T series motherboard
1849 03f1 939NF6G-VSTA Board
- 03f2 MCP61 USB Controller
+ 03f2 MCP61 USB 2.0 Controller
1028 020e Inspiron 531
+ 1043 83a4 M4N68T series motherboard
1849 03f2 939NF6G-VSTA Board
03f3 MCP61 PCI bridge
1028 020e Inspiron 531
@@ -6377,14 +6488,18 @@
03f4 MCP61 SMU
03f5 MCP61 Memory Controller
1028 020e Inspiron 531
+ 1043 83a4 M4N68T series motherboard
1849 03eb 939NF6G-VSTA Board
03f6 MCP61 SATA Controller
1028 020e Inspiron 531
+ 1043 83a4 M4N68T series motherboard
1849 03f6 939NF6G-VSTA Board
03f7 MCP61 SATA Controller
0400 G84 [GeForce 8600 GTS]
+ 1043 8241 EN8600GTS
0401 G84 [GeForce 8600GT]
0402 G84 [GeForce 8600 GT]
+ 1458 3455 GV-NX86T512H
1462 0910 NX8600GT-T2D256EZ
0403 G84 [GeForce 8600 GS]
0404 G84 [GeForce 8400 GS]
@@ -6414,7 +6529,7 @@
0427 G86 [GeForce 8400M GS]
103c 30cc Pavilion dv6700
0428 G86 [GeForce 8400M G]
- 0429 G84M [Quadro NVS 140M]
+ 0429 G86 [Quadro NVS 140M]
17aa 20d8 ThinkPad T61
042a G86M [Quadro NVS 130M]
042b G86M [Quadro NVS 135M]
@@ -6513,7 +6628,7 @@
1019 297a MCP73PVT-SM
056f MCP73 PCI Express bridge
1019 297a MCP73PVT-SM
- 05b1 NF200 PCIe 2.0 switch for mainboards
+ 05b1 NF200 PCIe 2.0 switch
05b8 NF200 PCIe 2.0 switch for GTX 295
05be NF200 PCIe 2.0 switch for Quadro Plex S4 / Tesla S870 / Tesla S1070 / Tesla S2050
05e0 GT200b [GeForce GTX 295]
@@ -6821,7 +6936,8 @@
19da a123 IONITX-F-E
087e ION LE VGA
087f ION LE VGA
- 08a4 GT216 [GeForce 320M]
+ 08a3 MCP89 [GeForce 320M]
+ 08a4 MCP89 [GeForce 320M]
0a20 GT216 [GeForce GT 220]
1043 8311 ENGT220/DI/1GD3(LP)/V2
0a23 GT218 [GeForce 210]
@@ -6935,6 +7051,7 @@
0be9 GF106 High Definition Audio Controller
1558 8687 CLEVO/KAPOK W860CU
0bea GF108 High Definition Audio Controller
+ 3842 1430 GeForce GT 430
0beb GF104 High Definition Audio Controller
1462 2322 N460GTX Cyclone 1GD5/OC
0bee GF116 High Definition Audio Controller
@@ -6974,9 +7091,9 @@
0dd2 GF106 [GeForce GT 445M]
0dd8 GF106GL [Quadro 2000]
0dda GF106 [Quadro 2000M]
-# Not sure if this is GF106 or GF108
- 0de0 [GeForce GT 440]
+ 0de0 GF108 [GeForce GT 440]
0de1 GF108 [GeForce GT 430]
+ 3842 1430 GeForce GT 430
0de2 GF108 [GeForce GT 420]
# Not fully sure that it's GF108, might also be GF106.
0deb GF108 [GeForce GT 555M]
@@ -6984,29 +7101,42 @@
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
0e09 GF110 High Definition Audio Controller
+ 0e0a GK104 [Geforce GTX680]
+ 0e0c GF110 High Definition Audio Controller
0e22 GF104 [GeForce GTX 460]
1462 2322 N460GTX Cyclone 1GD5/OC
0e3a GF104 [Quadro 3000M]
0e3b GF104 [Quadro 4000M]
+ 0fd2 GK107 [GeForce GT 640M]
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]
1080 GF110 [GeForce GTX 580]
1081 GF110 [GeForce GTX 570]
10de 087e Leadtek WinFast GTX 570
1082 GF114 [GeForce GTX 560 Ti]
1086 GF110 [GeForce GTX 570 HD]
+ 1091 Tesla M2090
1094 Tesla M2075 Dual-Slot Computing Processor Module
+ 1096 Tesla C2075
10c3 GT218 [GeForce 8400 GS]
10de 066d G98 [GeForce 8400GS]
- 10c5 M116N
+ 10c5 Dell M116N [GeForce 405]
10d8 GT218 [NVS 300]
+ 1180 GK104 [GeForce GTX 680]
1200 GF110 [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
1ae5 LP6000 Fibre Channel Host Adapter
@@ -7154,8 +7284,9 @@
0885 Realtek 885 High Definition Audio
0888 Realtek 888 High Definition Audio
1028 020d Inspiron 530
- 5209 RTS5116 PCI Express Card Reader
- 5288 PCI Express Card Reader
+ 5209 RTS5209 PCI Express Card Reader
+ 5229 RTS5229 PCI Express Card Reader
+ 5288 Barossa PCI Express Card Reader
8029 RTL-8029(AS)
10b8 2011 EZ-Card (SMC1208)
10ec 8029 RTL-8029(AS)
@@ -7167,6 +7298,7 @@
10ec 8129 RT8129 Fast Ethernet Adapter
11ec 8129 RT8129 Fast Ethernet Adapter
8136 RTL8101E/RTL8102E PCI Express Fast Ethernet controller
+ 103c 2ab1 Pavillion p6774
103c 30cc Pavilion dv6700
1179 ff64 RTL8102E PCI-E Fast Ethernet NIC
8138 RT8139 (B/C) Cardbus Fast Ethernet Adapter
@@ -7240,7 +7372,7 @@
1462 7522 X58 Pro-E
1775 11cc CC11/CL11
1849 8168 Motherboard (one of many)
- 8086 d615 DeskTop Board D510MO
+ 8086 d615 Desktop Board D510MO
8169 RTL-8169 Gigabit Ethernet
1025 0079 Aspire 5024WLMi
10bd 3202 EP-320G-TX1 32-bit PCI Gigabit Ethernet Adapter
@@ -7268,6 +7400,7 @@
1385 4700 MA521 802.11b Wireless PC Card
1737 0019 WPC11v4 802.11b Wireless-B Notebook Adapter
8185 RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller
+ 8190 RTL8190 802.11n Wireless LAN
8191 RTL8188CE 802.11b/g/n WiFi Adapter
8192 RTL8192E/RTL8192SE Wireless LAN Controller
8197 SmartLAN56 56K Modem
@@ -7278,12 +7411,14 @@
10ee Xilinx Corporation
0001 EUROCOM for PCI (ECOMP)
0002 Octal E1/T1 for PCI ETP Card
- 0007 Zomojo Z1
+ 0007 Default PCIe endpoint ID
0205 Wildcard TE205P
0210 Wildcard TE210P
+ 0300 Spartan 3 Designs (Xilinx IP)
0314 Wildcard TE405P/TE410P (1st Gen)
0405 Wildcard TE405P (2nd Gen)
0410 Wildcard TE410P (2nd Gen)
+ 0600 Xilinx 6 Designs (Xilinx IP)
2b00 Zomojo Zcard
3fc0 RME Digi96
3fc1 RME Digi96/8
@@ -7367,6 +7502,7 @@
1102 1009 SB Audigy2 OEM HP
1102 2002 SB Audigy 2 ZS (SB0350)
1102 4001 E-MU 1010
+ 1102 4002 E-MU 0404
0005 SB X-Fi
1102 0021 X-Fi Platinum
1102 002c X-Fi XtremeGamer FATAL1TY PRO
@@ -7441,6 +7577,13 @@
2340 RocketRAID 2340 16 Port SATA-II Controller
2640 RocketRAID 2640 SAS/SATA Controller
2722 RocketRAID 2722
+# SFF-8087 Mini-SAS 16 port internal
+ 2740 RocketRAID 2740
+# SFF-8088 Mini-SAS 16 port external
+ 2744 RocketRaid 2744
+# SFF-8088 8 port external / SFF-8087 24 port internal
+ 2782 RocketRAID 2782
+ 3120 RocketRAID 3120
3220 RocketRAID 3220
3320 RocketRAID 3320
1104 RasterOps Corp.
@@ -7811,7 +7954,7 @@
1849 3227 K7VT4 motherboard
3230 K8M890CE/K8N890CE [Chrome 9]
3238 K8T890 Host Bridge
- 3249 VT6421 IDE RAID Controller
+ 3249 VT6421 IDE/SATA Controller
324a CX700/VX700 PCI to PCI Bridge
324b CX700/VX700 Host Bridge
324e CX700/VX700 Internal Module Bus
@@ -7831,7 +7974,7 @@
3337 VT8237A PCI to ISA Bridge
3340 PT900 Host Bridge
3343 P4M890 [S3 UniChrome Pro]
- 3344 CN700/P4M800 Pro/P4M800 CE/VN800 [S3 UniChrome Pro]
+ 3344 CN700/P4M800 Pro/P4M800 CE/VN800 Graphics [S3 UniChrome Pro]
3349 VT8251 AHCI/SATA 4-Port Controller
3351 VT3351 Host Bridge
3353 VX800 PCI to PCI Bridge
@@ -7889,6 +8032,7 @@
6353 VX800/VX820 Scratch Registers
6364 CN896/VN896/P4M900 Security Device
6409 VX855/VX875 Scratch Registers
+ 7122 VX900 Graphics [Chrome9 HD]
7204 K8M800 Host Bridge
7205 KM400/KN400/P4M800 [S3 UniChrome]
1458 d000 Gigabyte GA-7VM400(A)M(F) Motherboard
@@ -9077,8 +9221,9 @@
e230 Memory Stick Host Controller
e822 MMC/SD Host Controller
1028 040b Latitude E6510
- e832 FireWire Host Controller
+ e832 R5C832 PCIe IEEE 1394 Controller
1028 040b Latitude E6510
+ e852 PCIe xD-Picture Card Controller
1181 Telmatics International
1183 Fujikura Ltd
1184 Forks Inc
@@ -9378,6 +9523,7 @@
4368 88EC034 Ethernet Controller
4369 88EC042 Ethernet Controller
436a 88E8058 PCI-E Gigabit Ethernet Controller
+ 11ab 00ba Imac 8,1 Wired Ethernet Adapter
436b 88E8071 PCI-E Gigabit Ethernet Controller
436c 88E8072 PCI-E Gigabit Ethernet Controller
436d 88E8055 PCI-E Gigabit Ethernet Controller
@@ -9472,8 +9618,8 @@
11be International Microcircuits Inc
11bf Astrodesign, Inc.
11c0 Hewlett Packard
-# Nee Lucent Microelectronics
-11c1 Agere Systems
+# nee Agere Systems nee Lucent Microelectronics
+11c1 LSI Corporation
0440 56k WinModem
1033 8015 LT WinModem 56k Data+Fax+Voice+Dsvd
1033 8047 LT WinModem 56k Data+Fax+Voice+Dsvd
@@ -9820,6 +9966,7 @@
1217 O2 Micro, Inc.
00f7 Firewire (IEEE 1394)
1179 ff50 Satellite P305D-S8995E
+ 10f7 1394 OHCI Compliant Host Controller
11f7 OZ600 1394a-2000 Controller
13f7 1394 OHCI Compliant Host Controller
6729 OZ6729
@@ -9857,6 +10004,8 @@
103c 0890 NC6000 laptop
10cf 11c4 Lifebook P5020D Laptop
7233 OZ711MP3/MS3 4-in-1 MemoryCardBus Controller
+ 8120 Integrated MMC/SD Controller
+ 8130 Integrated MS/MSPRO/xD Controller
8321 Integrated MMC/SD controller
8331 O2 Flash Memory Card
1218 Hybricon Corp.
@@ -9908,7 +10057,7 @@
0057 Voodoo 3/3000 [Avenger]
121b Advanced Telecommunications Modules
121c Nippon Texaco., Ltd
-121d Lippert Automationstechnik GmbH
+121d LiPPERT ADLINK Technology GmbH
121e CSPI
0201 Myrinet 2000 Scalable Cluster Interconnect
121f Arcus Technology, Inc.
@@ -9965,8 +10114,6 @@
0d13 Desktop PCI L1/L3 Telephony
1232 GPT Limited
1233 Bus-Tech, Inc.
-# Also Bochs uses this for virtual VGA...
-1234 Technical Corp.
1235 Risq Modular Systems, Inc.
1236 Sigma Designs Corporation
0000 RealMagic64/GX
@@ -10070,7 +10217,7 @@
1968 ES1968 Maestro 2
1028 0085 ES1968 Maestro-2 PCI
1033 8051 ES1968 Maestro-2 Audiodrive
- 1969 ES1969 Solo-1 Audiodrive
+ 1969 ES1938/ES1946/ES1969 Solo-1 Audiodrive
1014 0166 ES1969 SOLO-1 AudioDrive on IBM Aptiva Mainboard
125d 8888 Solo-1 Audio Adapter
153b 111b Terratec 128i PCI
@@ -10409,8 +10556,7 @@
8152 IT8152F/G Advanced RISC-to-PCI Companion Chip
8211 ITE 8211F Single Channel UDMA 133
1043 8138 P5GD1-VW Mainboard
-# PCI version seems to be IT8212, embedded seems to be ITE8212
- 8212 IT/ITE8212 Dual channel ATA RAID controller
+ 8212 IT8212 Dual channel ATA RAID controller
1283 0001 IT/ITE8212 Dual channel ATA RAID controller
8213 IT8213 IDE Controller
8330 IT8330G
@@ -11706,6 +11852,8 @@
4008 T420-CX Unified Wire Ethernet Controller
4009 T420-BT Unified Wire Ethernet Controller
400a T404-BT Unified Wire Ethernet Controller
+ 400d T480 Unified Wire Ethernet Controller
+ 400e T440-LP-CR Unified Wire Ethernet Controller
4401 T420-CR Unified Wire Ethernet Controller
4402 T422-CR Unified Wire Ethernet Controller
4403 T440-CR Unified Wire Ethernet Controller
@@ -11716,6 +11864,8 @@
4408 T420-CX Unified Wire Ethernet Controller
4409 T420-BT Unified Wire Ethernet Controller
440a T404-BT Unified Wire Ethernet Controller
+ 440d T480 Unified Wire Ethernet Controller
+ 440e T440-LP-CR Unified Wire Ethernet Controller
4501 T420-CR Unified Wire Storage Controller
4502 T422-CR Unified Wire Storage Controller
4503 T440-CR Unified Wire Storage Controller
@@ -11726,6 +11876,8 @@
4508 T420-CX Unified Wire Storage Controller
4509 T420-BT Unified Wire Storage Controller
450a T404-BT Unified Wire Storage Controller
+ 450d T480 Unified Wire Storage Controller
+ 450e T440-LP-CR Unified Wire Storage Controller
4601 T420-CR Unified Wire Storage Controller
4602 T422-CR Unified Wire Storage Controller
4603 T440-CR Unified Wire Storage Controller
@@ -11736,6 +11888,8 @@
4608 T420-CX Unified Wire Storage Controller
4609 T420-BT Unified Wire Storage Controller
460a T404-BT Unified Wire Storage Controller
+ 460d T480 Unified Wire Storage Controller
+ 460e T440-LP-CR Unified Wire Storage Controller
4701 T420-CR Unified Wire Ethernet Controller
4702 T422-CR Unified Wire Ethernet Controller
4703 T440-CR Unified Wire Ethernet Controller
@@ -11746,6 +11900,8 @@
4708 T420-CX Unified Wire Ethernet Controller
4709 T420-BT Unified Wire Ethernet Controller
470a T404-BT Unified Wire Ethernet Controller
+ 470d T480 Unified Wire Ethernet Controller
+ 470e T440-LP-CR Unified Wire Ethernet Controller
4801 T420-CR Unified Wire Ethernet Controller
4802 T422-CR Unified Wire Ethernet Controller
4803 T440-CR Unified Wire Ethernet Controller
@@ -11756,6 +11912,8 @@
4808 T420-CX Unified Wire Ethernet Controller
4809 T420-BT Unified Wire Ethernet Controller
480a T404-BT Unified Wire Ethernet Controller
+ 480d T480 Unified Wire Ethernet Controller
+ 480e T440-LP-CR Unified Wire Ethernet Controller
a000 PE10K Unified Wire Ethernet Controller
1426 Storage Technology Corp.
1427 Better On-Line Solutions
@@ -12121,6 +12279,7 @@
163b NetXtreme II BCM5716 Gigabit Ethernet
1028 028c PowerEdge R410 BCM5716 Gigabit Ethernet
1028 028d PowerEdge T410 BCM5716 Gigabit Ethernet
+ 1028 02f1 PowerEdge R510 BCM5716 Gigabit Ethernet
163c NetXtreme II BCM5716S Gigabit Ethernet
1644 NetXtreme BCM5700 Gigabit Ethernet
1014 0277 Broadcom Vigil B5700 1000Base-T
@@ -12296,15 +12455,23 @@
103c 280a DC5750 Microtower
167d NetXtreme BCM5751M Gigabit Ethernet PCI Express
1014 0577 ThinkPad Z60t
+ 103c 0934 HP nx8220
103c 0940 HP Compaq nw8240 Mobile Workstation
17aa 2081 ThinkPad R60e
167e NetXtreme BCM5751F Fast Ethernet PCI Express
167f NetLink BCM5787F Fast Ethernet PCI Express
1680 NetXtreme BCM5761e Gigabit Ethernet PCIe
1681 NetXtreme BCM5761 Gigabit Ethernet PCIe
+ 1682 NetXtreme BCM57762 Gigabit Ethernet PCIe
1684 NetXtreme BCM5764M Gigabit Ethernet PCIe
1685 NetXtreme II BCM57500S Gigabit Ethernet
- 168a NetXtreme II BCM57800 10 Gigabit Ethernet
+ 1686 NetXtreme BCM57766 Gigabit Ethernet PCIe
+# The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
+ 168a NetXtreme II BCM57800 1/10 Gigabit Ethernet
+ 1028 1f5c BCM57800 10-Gigabit Ethernet
+ 1028 1f5d BCM57800 10-Gigabit Ethernet
+ 1028 1f67 BCM57800 1-Gigabit Ethernet
+ 1028 1f68 BCM57800 1-Gigabit Ethernet
168d NetXtreme II BCM57840 10/20 Gigabit Ethernet
168e NetXtreme II BCM57810 10 Gigabit Ethernet
1690 NetXtreme BCM57760 Gigabit Ethernet PCIe
@@ -12330,7 +12497,12 @@
1462 590c KT6 Delta-FIS2R (MS-6590)
169d NetLink BCM5789 Gigabit Ethernet PCI Express
16a0 NetLink BCM5785 Fast Ethernet
- 16a5 NetXtreme II BCM57800 10 Gigabit 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
+ 1028 1f5d NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function
+ 1028 1f67 NetXtreme II BCM57800 1-Gigabit Ethernet Multi Function
+ 1028 1f68 NetXtreme II BCM57800 1-Gigabit Ethernet Multi Function
16a6 NetXtreme BCM5702X Gigabit Ethernet
0e11 00bb NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T)
1028 0126 BCM5702 1000Base-T
@@ -12349,7 +12521,12 @@
10a9 8014 Dual Port Gigabit Ethernet (PCI-X,Fiber)
10a9 801c Quad Port Gigabit Ethernet (PCI-E,Fiber)
10b7 2001 3C998-SX Dual Port 1000-SX PCI-X
- 16a9 NetXtreme II BCM57800 10 Gigabit Ethernet Virtual Function
+# The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
+ 16a9 NetXtreme II BCM57800 1/10 Gigabit Ethernet Virtual Function
+ 1028 1f5c NetXtreme II BCM57800 10-Gigabit Ethernet Virtual Function
+ 1028 1f5d NetXtreme II BCM57800 10-Gigabit Ethernet Virtual Function
+ 1028 1f67 NetXtreme II BCM57800 1-Gigabit Ethernet Virtual Function
+ 1028 1f68 NetXtreme II BCM57800 1-Gigabit Ethernet Virtual Function
16aa NetXtreme II BCM5706S Gigabit Ethernet
103c 3102 NC370F MultifuNCtion Gigabit Server Adapter
103c 310c NC370i Multifunction Gigabit Server Adapter
@@ -12368,9 +12545,11 @@
16b0 NetXtreme BCM57761 Gigabit Ethernet PCIe
16b1 NetLink BCM57781 Gigabit Ethernet PCIe
16b2 NetLink BCM57791 Gigabit Ethernet PCIe
+ 16b3 NetXtreme BCM57786 Gigabit Ethernet PCIe
16b4 NetXtreme BCM57765 Gigabit Ethernet PCIe
16b5 NetLink BCM57785 Gigabit Ethernet PCIe
16b6 NetLink BCM57795 Gigabit Ethernet PCIe
+ 16b7 NetXtreme BCM57782 Gigabit Ethernet PCIe
16bc NetXtreme BCM57765 Memory Card Reader
16c6 NetXtreme BCM5702A3 Gigabit Ethernet
10b7 1100 3C1000B-T 10/100/1000 PCI
@@ -12503,7 +12682,8 @@
1154 0330 Buffalo WLI2-PCI-G54S High Speed Mode Wireless Desktop Adapter
144f 7050 eMachines M6805 802.11g Built-in Wireless
144f 7051 Sonnet Aria Extreme PCI
- 14e4 4320 Linksys WMP54G PCI
+ 1737 0013 WMP54G v1 802.11g PCI Adapter
+ 1737 0014 WMP54G v2 802.11g PCI Adapter
1737 0015 WMP54GS v1.0 802.11g Wireless-G PCI Adapter with SpeedBooster
1737 4320 WPC54G v1 / WPC54GS v1 802.11g Wireless-G Notebook Adapter
1799 7000 F5D7000 v1000 Wireless G Desktop Card
@@ -13164,7 +13344,8 @@
158d Point Multimedia Systems
158e Lara Technology Inc
158f Ditect Coop
-1590 3PAR Inc.
+# nee 3PAR Inc.
+1590 Hewlett-Packard Company
0001 Eagle Cluster Manager
0002 Osprey Cluster Manager
0003 Harrier Cluster Manager
@@ -13520,7 +13701,7 @@
1186 3a1a WNA-2330 802.11bg Wireless CardBus Adapter
1186 3a63 D-Link AirPremier DWL-AG660 Wireless Cardbus Adapter
1186 3a93 Conceptronic C54I Wireless 801.11g PCI card
- 1186 3a94 C54C Wireless 801.11g cardbus
+ 1186 3a94 Conceptronic C54C 802.11g Wireless Cardbus Adapter
1186 3ab0 Allnet ALL0281 Wireless PCI Card
1385 4900 WG311v1 802.11g Wireless PCI Adapter
1385 4b00 WG511T 108 Mbps Wireless PC Card (rev.A/B)
@@ -13560,7 +13741,7 @@
185f 1012 CM9 Wireless a/b/g MiniPCI Adapter
185f 2012 Wistron NeWeb WLAN a+b+g model CB9
a727 6801 3CRXJK10075 OfficeConnect Wireless 108Mbps 11g XJACK PC Card
- 001a AR2413/AR2414 Wireless Network Adapter [AR5002G(S) 802.11bg]
+ 001a AR2413/AR2414 Wireless Network Adapter [AR5005G(S) 802.11bg]
1052 168c Sweex Wireless Lan PC Card 54Mbps
1113 ee20 SMC Wireless CardBus Adapter 802.11g (SMCWCB-G EU)
1113 ee24 SMC Wireless PCI Card WPCI-G
@@ -13648,7 +13829,7 @@
1186 3a7a DWA-552 802.11n Xtreme N Desktop Adapter (rev A2)
002a AR928X Wireless Network Adapter (PCI-Express)
103c 3041 AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
- 105b e006 T77H053.00 802.11bgn (1x2:2) Wireless Mini PCIe Card [AR9281]
+ 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]
@@ -13670,7 +13851,7 @@
1b9a 0401 XW204E 802.11bgn Wireless Half-size Mini PCIe Card
1b9a 0c03 WB214E 802.11bgn Wireless Half-size Mini PCIe Card [AR9002WB-1NGCD]
002c AR2427 802.11bg Wireless Network Adapter (PCI-Express)
- 002d AR9287 Wireless Network Adapter
+ 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
@@ -13678,6 +13859,7 @@
1a56 2001 Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380]
0032 AR9485 Wireless Network Adapter
0033 AR9580 Wireless Network Adapter
+ 0034 AR9462 Wireless Network Adapter
0207 AR5210 Wireless Network Adapter [AR5000 802.11a]
1014 AR5212 802.11abg NIC
1014 058a ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)
@@ -13760,6 +13942,7 @@
5702 PMC-SLX150-1M: Reconfigurable Spartan-6 FPGA with plug-in I/O
5801 XMC-VLX85 Reconfigurable Virtex-5 FPGA with plug-in I/O
5802 XMC-VLX110 Reconfigurable Virtex-5 FPGA with plug-in I/O
+ 5803 XMC-VSX95 Reconfigurable Virtex-5 FPGA with plug-in I/O
5804 XMC-VLX155 Reconfigurable Virtex-5 FPGA with plug-in I/O
5807 XMC-SLX150: Reconfigurable Spartan-6 FPGA with plug-in I/O
5808 XMC-SLX150-1M: Reconfigurable Spartan-6 FPGA with plug-in I/O
@@ -13803,7 +13986,6 @@
1098 Amilo L 1310G
1735 Aten International Co. Ltd.
1737 Linksys
- 0013 WMP54G Wireless Pci Card
0029 WPG54G ver. 4 PCI Card
1032 Gigabit Network Adapter
1737 0015 EG1032 v2 Instant Gigabit Network Adapter
@@ -13911,6 +14093,7 @@
17cb Airgo Networks Inc
0001 AGN100 802.11 a/b/g True MIMO Wireless Card
1385 5c00 WGM511 Pre-N 802.11g Wireless CardBus Adapter
+ 1737 0045 WMP54GX v1 802.11g Wireless-G PCI Adapter with SRX
0002 AGN300 802.11 a/b/g True MIMO Wireless Card
1385 6d00 WPNT511 RangeMax 240 Mbps Wireless CardBus Adapter
1737 0054 WPC54GX4 v1 802.11g Wireless-G Notebook Adapter with SRX400
@@ -13989,6 +14172,7 @@
6061 R6061 USB 2.0 Controller
17f7 Topdek Semiconductor Inc.
17f9 Gemtek Technology Co., Ltd
+17fc IOGEAR, Inc.
17fe InProComm Inc.
2120 IPN 2120 802.11b
1737 0020 WMP11 v4 802.11b Wireless-B PCI Adapter
@@ -14012,6 +14196,7 @@
0200 RT2500 802.11g PCI [PC54G2]
0201 RT2500 Wireless 802.11bg
1043 130f WL-130g
+ 1186 3c00 DWL-G650X Wireless 11g CardBus Adapter
1371 001e CWC-854 Wireless-G CardBus Adapter
1371 001f CWM-854 Wireless-G Mini PCI Adapter
1371 0020 CWP-854 Wireless-G PCI Adapter
@@ -14019,11 +14204,13 @@
1458 e931 GN-WIKG 802.11b/g mini-PCI Adapter
1462 6833 Unknown 802.11g mini-PCI Adapter
1462 6835 Wireless 11G CardBus CB54G2
- 1737 0032 WMP54G 2.0 PCI Adapter
+ 1737 0032 WMP54G v4.0 PCI Adapter
1799 700a F5D7000 v2000/v3000 Wireless G Desktop Card
1799 701a F5D7010 v2000/v3000 Wireless G Notebook Card
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
1948 3c00 C54RC v1 Wireless 11g CardBus Adapter
1948 3c01 C54Ri v1 Wireless 11g PCI Adapter
0300 Wireless Adapter Canyon CN-WF511
@@ -14033,7 +14220,7 @@
13d1 abe3 miniPCI Pluscom 802.11 a/b/g
1458 e933 GN-WI01GS
1458 e934 GN-WP01GS
- 1737 0055 WMP54G ver 4.1
+ 1737 0055 WMP54G v4.1
1799 700e F5D7000 v6000 Wireless G Desktop Card
1799 701e F5D7010 v6000 Wireless G Notebook Card
17f9 0012 AWLC3026T 802.11g Wireless CardBus Adapter
@@ -14052,17 +14239,19 @@
0601 RT2800 802.11n PCI
1799 801c F5D8011 v3 802.11n N1 Wireless Notebook Card
187e 3412 NWD-310N 802.11n Wireless PCI Adapter
- 0681 RT2860 Wireless 802.11n PCIe
+ 0681 RT2890 Wireless 802.11n PCIe
1458 e939 GN-WS30N-RH 802.11bgn Mini PCIe Card
0701 RT2760 Wireless 802.11n 1T/2R
1737 0074 WMP110 v2 802.11n RangePlus Wireless PCI Adapter
0781 RT2790 Wireless 802.11n 1T/2R PCIe
3060 RT3060 Wireless 802.11n 1T/1R
1186 3c04 DWA-525 Wireless N 150 Desktop Adapter (rev.A1)
+ 3062 RT3062 Wireless 802.11n 2T/2R
3090 RT3090 Wireless 802.11n 1T/1R PCIe
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
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]
@@ -14167,7 +14356,8 @@
0027 Z11/Z11M
0040 Volari V3XT/V5/V8
0047 Volari 8300 (chip: XP10, codename: XG47)
-18d2 Sitecom
+# should be 182d
+18d2 Sitecom Europe BV (Wrong ID)
# Sitecom HFC-S based ISDN controller card DC-105v2
3069 DC-105v2 ISDN controller
18d8 Dialogue Technology Corp.
@@ -14228,6 +14418,7 @@
18ee Chenming Mold Ind. Corp.
18f1 Spectrum GmbH
18f4 Napatech A/S
+ 0031 NT20X Network Adapter
0051 NT20-X Capture Card
0061 NT20E Capture Card
0064 NT20E Inline Card
@@ -14237,6 +14428,7 @@
0091 NT20X Capture Card [New Rev]
00a1 NT4E-STD Capture Card
00a4 NT4E-STD Inline Card
+ 00c5 NT20E2 Network Adapter
18f6 NextIO
1000 [Nexsis] Switch Virtual P2P PCIe Bridge
1050 [Nexsis] Switch Virtual P2P PCI Bridge
@@ -14315,12 +14507,21 @@
1924 6204 SFN5122F-R4
1924 6205 SFN5122F-R5
1924 6206 SFN5122F-R6
+ 1924 6207 SFN5122F-R7
1924 6210 SFN5322F-R0
1924 6211 SFN5322F-R1
+ 1924 6217 SFN5322F-R7
+ 1924 6227 SFN6122F-R7
+ 1924 6237 SFN6322F-R7
+ 1924 6501 SFN5802K-R1
+ 1924 6511 SFN5814H-R1
+ 1924 6521 SFN5812H-R1
1924 6a05 SFN5112F-R5
1924 6a06 SFN5112F-R6
1924 7206 SFN5162F-R6
+ 1924 7207 SFN5162F-R7
1924 7a06 SFN5152F-R6
+ 1924 7a07 SFN5152F-R7
0813 SFL9021 [Solarstorm]
1924 6100 SFN5121T-R0
1924 6102 SFN5121T-R2
@@ -14430,6 +14631,7 @@
0111 P1022
0118 P1013E
0119 P1013
+ 0128 P1010
0400 P4080E
0401 P4080
0408 P4040E
@@ -14461,7 +14663,7 @@
1969 Atheros Communications Inc.
1026 AR8121/AR8113/AR8114 Gigabit or Fast Ethernet
1043 8304 P5KPL-CM Motherboard
- 1048 L1 Gigabit Ethernet
+ 1048 Attansic L1 Gigabit Ethernet
1043 8226 P5KPL-VM Motherboard
1062 AR8132 Fast Ethernet
1063 AR8131 Gigabit Ethernet
@@ -14470,6 +14672,8 @@
1067 L1c Gigabit Ethernet
1073 AR8151 v1.0 Gigabit Ethernet
1083 AR8151 v2.0 Gigabit Ethernet
+ 1090 AR8162 Fast Ethernet
+ 1091 AR8161 Gigabit Ethernet
2048 L2 Fast Ethernet
2060 AR8152 v1.1 Fast Ethernet
2062 AR8152 v2.0 Fast Ethernet
@@ -14481,7 +14685,7 @@
1971 AGEIA Technologies, Inc.
1011 Physics Processing Unit [PhysX]
1043 0001 PhysX P1
-1974 TransferZentrum Mikroelektronik
+1974 Eberspaecher Electronics
1976 TRENDnet
1977 Parsec
197b JMicron Technology Corp.
@@ -14491,9 +14695,9 @@
2360 JMB360 AHCI Controller
2361 JMB361 AHCI/IDE
1462 7235 P965 Neo MS-7235 mainboard
- 2362 JMB362 AHCI Controller
+ 2362 JMB362 SATA Controller
1043 8460 P8P67 Deluxe Motherboard
- 2363 JMB362/JMB363 Serial ATA Controller
+ 2363 JMB363 SATA/IDE Controller
1043 81e4 P5B [JMB363]
1458 b000 GA-EP45-DS5 Motherboard
1849 2363 Motherboard (one of many)
@@ -14523,6 +14727,8 @@
8001 RapidFile
198a Nallatech Ltd.
1993 Innominate Security Technologies AG
+1999 A-Logics
+ a900 AM-7209 Video Processor
199a Pulse-LINK, Inc.
199d Xsigo Systems
8209 Virtual NIC Device
@@ -14607,6 +14813,10 @@
1a32 Quanta Microsystems, Inc
1a3b AzureWave
1112 AR9285 Wireless Network Adapter (PCI-Express)
+1a41 Tilera Corp.
+ 0001 TILE64 processor
+ 0002 TILEPro processor
+ 0200 TILE-Gx36 processor
1a4a SLAC National Accelerator Lab PPA-REG
1000 MCOR Power Supply Controller
2000 PGPCard - 4 Lane
@@ -14625,11 +14835,12 @@
1a76 Wavesat
1a77 Lightfleet Corporation
1a78 Virident Systems Inc.
- 0031 Virident tachIOn Drive
- 1a78 0034 tachIOn PCIe SSD [rev 3]
- 1a78 0037 tachIOn PCIe SSD [rev 3D]
- 1a78 0038 tachIOn PCIe SSD [rev 4]
- 1a78 0039 tachIOn PCIe SSD [rev 4D]
+ 0031 Virident FlashMAX Drive
+ 1a78 0034 FlashMAX PCIe SSD [rev 3]
+ 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]
1a84 Commex Technologies
0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02)
1a88 MEN Mikro Elektronik
@@ -14645,6 +14856,7 @@
1ab6 CalDigit, Inc.
6201 RAID Card
1ab9 Espia Srl
+1acc Point of View B.V
1ad7 Spectracom Corporation
8000 TSync-PCIe Time Code Processor
9100 TPRO-PCI-66U Timecode Reader/Generator
@@ -14660,9 +14872,17 @@
1aed Fusion-io
1003 ioDimm3 (v1.2)
1005 ioDimm3
+ 1014 03c3 High IOPS SSD PCIe Adapter
+ 103c 176f 1.28TB MLC PCIe ioDrive Duo
+ 103c 1770 5.2TB MLC PCIe ioDrive Octal
+ 103c 178b 160GB SLC PCIe ioDrive
+ 103c 178c 320GB MLC PCIe ioDrive
+ 103c 178d 320GB SLC PCIe ioDrive Duo
+ 103c 178e 640GB MLC PCIe ioDrive Duo
1006 ioXtreme
1007 ioXtreme Pro
1008 ioXtreme-2
+ 2001 ioDrive2
1aee Caustic Graphics Inc.
# nee Qumranet, Inc.
1af4 Red Hat, Inc
@@ -14681,8 +14901,10 @@
0611 ASM1061 SATA IDE Controller
0612 ASM1062 Serial ATA Controller
1042 ASM1042 SuperSpeed USB Host Controller
- 1080 ASM108x PCIe to PCI Bridge Controller
+ 1080 ASM1083/1085 PCIe to PCI Bridge
1b36 Red Hat, Inc.
+1b37 Signal Processing Devices Sweden AB
+ 0014 ADQ412
1b3a Westar Display Technologies
7589 HRED J2000 - JPEG 2000 Video Codec Device
1b3e Teradata Corp.
@@ -14712,6 +14934,9 @@
7023 EJ168 USB 3.0 Host Controller
1b73 Fresco Logic
1000 FL1000G USB 3.0 Host Controller
+1b85 OCZ Technology Group, Inc.
+ 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller)
+1b96 Western Digital
1b9a XAVi Technologies Corp.
1bad ReFLEX CES
1bb3 Bluecherry
@@ -14725,6 +14950,8 @@
5308 BC-H08240A 8 port H.264 video and audio encoder / decoder
5310 BC-H16480A 16 port H.264 video and audio encoder / decoder
1bb5 Quantenna Communications, Inc.
+1bbf Maxeler Technologies Ltd.
+ 0003 MAX3
1bf4 VTI Instruments Corporation
1c1c Symphony
0001 82C101
@@ -14776,6 +15003,7 @@
0001 Spectrum Analyzer PC Card (SAgE)
1fd4 SUNIX Co., Ltd.
0001 Matrix multiport serial adapter
+ 1999 Multiport serial controller
2000 Smart Link Ltd.
2800 SmartPCI2800 V.92 PCI Soft DFT
2001 Temporal Research Ltd
@@ -14832,6 +15060,8 @@
1922 AS-i 3.0 PCI Master
3475 Arastra Inc.
3513 ARCOM Control Systems Ltd
+37d9 ITD Firm ltd.
+ 1138 SCHD-PH-8 Phase detector
3842 eVga.com. Corp.
38ef 4Links
3d3d 3DLabs
@@ -14934,7 +15164,7 @@
4321 Tata Power Strategic Electronics Division
434e CAST Navigation LLC
4444 Internext Compression Inc
- 0016 iTVC16 (CX23416) MPEG-2 Encoder
+ 0016 iTVC16 (CX23416) Video Decoder
0070 0003 WinTV PVR 250
0070 0009 WinTV PVR 150
0070 0801 WinTV PVR 150
@@ -14990,7 +15220,7 @@
1461 c739 M785 AVerMedia PCI Analog TV (NTSC/PAL/SECAM+FM, Xceive 2028 tuner)
9005 0092 VideOh! AVC-2010
9005 0093 VideOh! AVC-2410
- 0803 iTVC15 MPEG-2 Encoder
+ 0803 iTVC15 (CX23415) Video Decoder
0070 4000 WinTV PVR-350
0070 4001 WinTV PVR-250
0070 4800 WinTV PVR-350 (V1)
@@ -15259,6 +15489,8 @@
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
@@ -15456,6 +15688,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
0436 DH89xxCC Gigabit SGMII Connection
0438 DH8900CC Series Gigabit Network Connection
043a DH8900CC Series Gigabit Fiber Network Connection
@@ -15533,6 +15771,33 @@
0886 Centrino Wireless-N + WiMAX 6150
8086 1315 Centrino Wireless-N + WiMAX 6150 BGN
8086 1317 Centrino Wireless-N + WiMAX 6150 BG
+ 0887 Centrino Wireless-N 2230
+ 8086 4062 Centrino Wireless-N 2230 BGN
+ 8086 4462 Centrino Wireless-N 2230 BGN
+ 0888 Centrino Wireless-N 2230
+ 8086 4262 Centrino Wireless-N 2230 BGN
+ 088e Centrino Advanced-N 6235
+ 8086 4060 Centrino Advanced-N 6235 AGN
+ 8086 4460 Centrino Advanced-N 6235 AGN
+ 088f Centrino Advanced-N 6235
+ 8086 4260 Centrino Advanced-N 6235 AGN
+ 0890 Centrino Wireless-N 2200
+ 8086 4022 Centrino Wireless-N 2200 BGN
+ 8086 4422 Centrino Wireless-N 2200 BGN
+ 8086 4822 Centrino Wireless-N 2200 BGN
+ 0891 Centrino Wireless-N 2200
+ 8086 4222 Centrino Wireless-N 2200 BGN
+ 0892 Centrino Wireless-N 135
+ 8086 0062 Centrino Wireless-N 135 BGN
+ 8086 0462 Centrino Wireless-N 135 BGN
+ 0893 Centrino Wireless-N 135
+ 8086 0262 Centrino Wireless-N 135 BGN
+ 0894 Centrino Wireless-N 105
+ 8086 0022 Centrino Wireless-N 105 BGN
+ 8086 0422 Centrino Wireless-N 105 BGN
+ 8086 0822 Centrino Wireless-N 105 BGN
+ 0895 Centrino Wireless-N 105
+ 8086 0222 Centrino Wireless-N 105 BGN
0896 Centrino Wireless-N 130
8086 5005 Centrino Wireless-N 130 BGN
8086 5007 Centrino Wireless-N 130 BG
@@ -15552,30 +15817,63 @@
0960 80960RP (i960RP) Microprocessor/Bridge
0962 80960RM (i960RM) Bridge
0964 80960RP (i960RP) Microprocessor/Bridge
- 0be0 Atom Processor D2xxx Integrated Graphics Controller
- 0be1 Atom Processor D2xxx Integrated Graphics Controller
- 0be2 Atom Processor D2xxx Integrated Graphics Controller
- 0be3 Atom Processor D2xxx Integrated Graphics Controller
- 0be4 Atom Processor D2xxx Integrated Graphics Controller
- 0be5 Atom Processor D2xxx Integrated Graphics Controller
- 0be6 Atom Processor D2xxx Integrated Graphics Controller
- 0be7 Atom Processor D2xxx Integrated Graphics Controller
- 0be8 Atom Processor D2xxx Integrated Graphics Controller
- 0be9 Atom Processor D2xxx Integrated Graphics Controller
- 0bea Atom Processor D2xxx Integrated Graphics Controller
- 0beb Atom Processor D2xxx Integrated Graphics Controller
- 0bec Atom Processor D2xxx Integrated Graphics Controller
- 0bed Atom Processor D2xxx Integrated Graphics Controller
- 0bee Atom Processor D2xxx Integrated Graphics Controller
- 0bef Atom Processor D2xxx Integrated Graphics Controller
- 0bf0 Atom Processor D2xxx DRAM Controller
- 0bf1 Atom Processor D2xxx DRAM Controller
- 0bf2 Atom Processor D2xxx DRAM Controller
- 0bf3 Atom Processor D2xxx DRAM Controller
- 0bf4 Atom Processor D2xxx DRAM Controller
- 0bf5 Atom Processor D2xxx DRAM Controller
- 0bf6 Atom Processor D2xxx DRAM Controller
- 0bf7 Atom Processor D2xxx DRAM 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
+ 0be3 Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0be4 Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0be5 Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0be6 Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0be7 Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0be8 Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0be9 Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0bea Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0beb Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0bec Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0bed Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0bee Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0bef Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+ 0bf0 Atom Processor D2xxx/N2xxx DRAM Controller
+ 0bf1 Atom Processor D2xxx/N2xxx DRAM Controller
+ 0bf2 Atom Processor D2xxx/N2xxx DRAM Controller
+ 0bf3 Atom Processor D2xxx/N2xxx DRAM Controller
+ 0bf4 Atom Processor D2xxx/N2xxx DRAM Controller
+ 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
+ 0c46 Centerton PCI Express Root Port 1
+ 0c47 Centerton PCI Express Root Port 2
+ 0c48 Centerton PCI Express Root Port 3
+ 0c49 Centerton PCI Express Root Port 4
+ 0c4e Centerton NTB Primary
+ 0c54 Centerton Internal Management
+ 0c59 Centerton SMBus 2.0 Controller 0
+ 0c5a Centerton SMBus 2.0 Controller 1
+ 0c5f Centerton UART
+ 0c60 Centerton Integrated Legacy Bus
+ 0c70 Centerton Internal Fabric
+ 0c71 Centerton Internal Fabric
+ 0c72 Centerton Internal Fabric
+ 0c73 Centerton Internal Fabric
+ 0c74 Centerton Internal Fabric
+ 0c75 Centerton Internal Fabric
+ 0c76 Centerton Internal Fabric
+ 0c77 Centerton Internal Fabric
+ 0c78 Centerton Internal Fabric
+ 0c79 Centerton Internal Fabric
+ 0c7a Centerton Internal Fabric
+ 0c7b Centerton Internal Fabric
+ 0c7c Centerton Internal Fabric
+ 0c7d Centerton Internal Fabric
+ 0c7e Centerton Internal Fabric
+ 0c7f Centerton Internal Fabric
1000 82542 Gigabit Ethernet Controller (Fiber)
0e11 b0df NC6132 Gigabit Ethernet Adapter (1000-SX)
0e11 b0e0 NC6133 Gigabit Ethernet Adapter (1000-LX)
@@ -15881,8 +16179,8 @@
17aa 2001 ThinkPad T60
17aa 207e ThinkPad X60s
8086 109a PRO/1000 PL Network Connection
- 8086 309c DeskTop Board D945GTP
- 8086 30a5 DeskTop Board D975XBX
+ 8086 309c Desktop Board D945GTP
+ 8086 30a5 Desktop Board D975XBX
109b 82546GB PRO/1000 GF Quad Port Server Adapter
109e 82597EX 10GbE Ethernet Controller
8086 a01f PRO/10GbE CX4 Server Adapter
@@ -15960,6 +16258,8 @@
8086 0001 Gigabit CT2 Desktop Adapter
8086 a01f Gigabit CT Desktop Adapter
e4bf 50c1 PC1-GROOVE
+ e4bf 50c2 PC2-LIMBO
+ 10d4 Matrox Concord GE (customized Intel 82574)
10d5 82571PT Gigabit PT Quad Port Server ExpressModule
10d6 82575GB Gigabit Network Connection
8086 10d6 Gigabit VT Quad Port Server Adapter
@@ -16010,11 +16310,14 @@
8086 000d Ethernet Mezzanine Adapter X520-KX4-2
10f8 82599EB 10 Gigabit Dual Port Backplane Connection
1028 1f63 10GbE 2P X520k bNDC
- 103c 1783 Ethernet 10Gb 2-port 560FLB Adapter
103c 17d2 Ethernet 10Gb 2-port 560M Adapter
+ 103c 18d0 Ethernet 10Gb 2-port 560FLB Adapter
8086 000c Ethernet X520 10GbE Dual Port KX4-KR Mezz
10f9 82599EB 10 Gigabit CX4 Dual Port Network Connection
10fb 82599EB 10-Gigabit SFI/SFP+ Network Connection
+ 103c 17d0 Ethernet 10Gb 2-port 560FLR-SFP+ Adapter
+ 103c 17d2 Ethernet 10Gb 2-port 560M Adapter
+ 103c 17d3 Ethernet 10Gb 2-port 560SFP+ Adapter
108e 7b11 Ethernet Server Adapter X520-2
1734 11a9 10 Gigabit Dual Port Network Connection
8086 0002 Ethernet Server Adapter X520-DA2
@@ -16268,6 +16571,7 @@
1511 82580 Gigabit SFP Connection
1514 82599EB 10 Gigabit KX4 Network Connection
8086 000b Ethernet X520 10GbE Dual Port KX4 Mezz
+ 1515 X540 Ethernet Controller Virtual Function
1516 82580 Gigabit Network Connection
8086 12b1 Ethernet Server Adapter I340-T2
8086 12b2 Ethernet Server Adapter I340-T2
@@ -16276,9 +16580,12 @@
1518 82576NS SerDes Gigabit Network Connection
151c 82599EB 10 Gigabit TN Network Connection
108e 7b13 Dual 10GBASE-T LP
+ 1520 I350 Ethernet Controller Virtual Function
1521 I350 Gigabit Network Connection
1028 1f60 Intel GbE 4P I350crNDC
1028 1f62 Intel GbE 2P I350crNDC
+ 103c 337f Ethernet 1Gb 2-port 361i Adapter
+ 103c 3380 Ethernet 1Gb 4-port 366i Adapter
103c 339e Ethernet 1Gb 2-port 361T Adapter [Wharton Stony Lake]
108e 7b16 Quad Port GbE PCIe 2.0 ExpressModule, UTP
108e 7b18 Quad Port GbE PCIe 2.0 Low Profile Adapter, UTP
@@ -16299,6 +16606,7 @@
8086 00a4 Ethernet Server Adapter I350-F2
1523 I350 Gigabit Backplane Connection
103c 1784 Ethernet 1Gb 2-port 361FLB Adapter [Badger Flat]
+ 103c 18d1 Ethernet 1Gb 2-port 361FLB Adapter
103c 339f Ethernet 1Gb 4-port 366M Adapter [Vaca Key]
8086 1f52 1GbE 4P I350 Mezz
1524 I350 Gigabit Connection
@@ -16309,17 +16617,21 @@
1527 82580 Gigabit Fiber Network Connection
8086 0001 Ethernet Server Adapter I340-F4
8086 0002 Ethernet Server Adapter I340-F4
- 1528 Ethernet Controller 10 Gigabit X540-AT2
+ 1528 Ethernet Controller 10-Gigabit X540-AT2
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
- 8086 0001 Ethernet Server Adapter X540-T2
- 8086 0002 Ethernet Server Adapter X540-T1
- 8086 001a Ethernet Server Adapter X540-T2
- 8086 00a2 Ethernet Server Adapter X540-T1
+ 8086 0001 Ethernet Converged Network Adapter X540-T2
+ 8086 0002 Ethernet Converged Network Adapter X540-T1
+ 8086 001a Ethernet Converged Network Adapter X540-T2
+ 8086 00a2 Ethernet Converged Network Adapter X540-T1
8086 1f61 Ethernet 10G 4P X540/I350 rNDC
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
+ 154a Ethernet Server Adapter X520-4
+ 8086 011a Ethernet Converged Network Adapter X520-4
+ 8086 011b Ethernet Converged Network Adapter X520-4
+ 8086 011c Ethernet Converged Network Adapter X520-4
154d 82599EB 10-Gigabit SFP+ Network Connection
8086 7b11 10GbE 2P X520 Adapter
1960 80960RP (i960RP) Microprocessor
@@ -16367,7 +16679,7 @@
8086 a11f PRO/10GbE LR Server Adapter
1c00 6 Series/C200 Series Chipset Family 4 port SATA IDE Controller
1c01 6 Series/C200 Series Chipset Family 4 port SATA IDE Controller
- 1c02 6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller
+ 1c02 6 Series/C200 Series Chipset Family SATA AHCI Controller
1028 04aa XPS 8300
1043 844d P8P67 Deluxe Motherboard
1c03 6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller
@@ -16385,6 +16697,7 @@
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
1043 8418 P8P67 Deluxe Motherboard
@@ -16448,71 +16761,70 @@
1c5d 6 Series/C200 Series Chipset Family LPC Controller
1c5e 6 Series/C200 Series Chipset Family LPC Controller
1c5f 6 Series/C200 Series Chipset Family LPC Controller
- 1d00 Patsburg 4-Port SATA IDE Controller
- 1d02 Patsburg 6-Port SATA AHCI Controller
- 1d04 Patsburg SATA RAID Controller
- 1d06 Patsburg SATA Premium RAID Controller
- 1d08 Patsburg 2-Port SATA IDE Controller
- 1d10 Patsburg PCI Express Root Port 1
- 1d11 Patsburg PCI Express Root Port 1
- 1d12 Patsburg PCI Express Root Port 2
- 1d13 Patsburg PCI Express Root Port 2
- 1d14 Patsburg PCI Express Root Port 3
- 1d15 Patsburg PCI Express Root Port 3
- 1d16 Patsburg PCI Express Root Port 4
- 1d17 Patsburg PCI Express Root Port 4
- 1d18 Patsburg PCI Express Root Port 5
- 1d19 Patsburg PCI Express Root Port 5
- 1d1a Patsburg PCI Express Root Port 6
- 1d1b Patsburg PCI Express Root Port 6
- 1d1c Patsburg PCI Express Root Port 7
- 1d1d Patsburg PCI Express Root Port 7
- 1d1e Patsburg PCI Express Root Port 8
- 1d1f Patsburg PCI Express Root Port 8
- 1d20 Patsburg High Definition Audio Controller
- 1d22 Patsburg SMBus Host Controller
- 1d24 Patsburg Thermal Management Controller
- 1d25 Patsburg DMI to PCI Bridge
- 1d26 Patsburg USB2 Enhanced Host Controller #1
- 1d2d Patsburg USB2 Enhanced Host Controller #2
- 1d33 Patsburg LAN Controller
- 1d35 Patsburg VECI Controller
- 1d3a Patsburg MEI Controller #1
- 1d3b Patsburg MEI Controller #2
- 1d3c Patsburg IDE-r Controller
- 1d3d Patsburg KT Controller
- 1d3e Patsburg PCI Express Virtual Root Port
- 1d3f Patsburg PCI Express Virtual Switch Port
- 1d40 Patsburg LPC Controller
- 1d41 Patsburg LPC Controller
- 1d50 Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d54 Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d55 Patsburg 4-Port SATA/SAS Storage Control Unit
- 1d58 Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d59 Patsburg 4-Port SATA/SAS Storage Control Unit
- 1d5a Patsburg Dual 4-Port SATA Storage Control Unit
- 1d5b Patsburg 4-Port SATA Storage Control Unit
- 1d5c Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d5d Patsburg 4-Port SATA/SAS Storage Control Unit
- 1d5e Patsburg Dual 4-Port SATA Storage Control Unit
- 1d5f Patsburg 4-Port SATA Storage Control Unit
- 1d60 Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d64 Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d65 Patsburg 4-Port SATA/SAS Storage Control Unit
- 1d68 Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d69 Patsburg 4-Port SATA/SAS Storage Control Unit
- 1d6a Patsburg Dual 4-Port SATA Storage Control Unit
- 1d6b Patsburg 4-Port SATA Storage Control Unit
- 1d6c Patsburg Dual 4-Port SATA/SAS Storage Control Unit
- 1d6d Patsburg 4-Port SATA/SAS Storage Control Unit
- 1d6e Patsburg Dual 4-Port SATA Storage Control Unit
- 1d6f Patsburg 4-Port SATA Storage Control Unit
- 1d70 Patsburg SMBus Controller 0
- 1d71 Patsburg SMBus Controller 1
- 1d72 Patsburg SMBus Controller 2
- 1d73 Patsburg Integrated NVSRAM Controller
- 1d74 Patsburg PCI Express Upstream Port
- 1d76 Patsburg Multi-Function Glue
+ 1d00 C600/X79 series chipset 4-Port SATA IDE Controller
+ 1d02 C600/X79 series chipset 6-Port SATA AHCI Controller
+ 1d04 C600/X79 series chipset SATA RAID Controller
+ 1d06 C600/X79 series chipset SATA Premium RAID Controller
+ 1d08 C600/X79 series chipset 2-Port SATA IDE Controller
+ 1d10 C600/X79 series chipset PCI Express Root Port 1
+ 1d11 C600/X79 series chipset PCI Express Root Port 1
+ 1d12 C600/X79 series chipset PCI Express Root Port 2
+ 1d13 C600/X79 series chipset PCI Express Root Port 2
+ 1d14 C600/X79 series chipset PCI Express Root Port 3
+ 1d15 C600/X79 series chipset PCI Express Root Port 3
+ 1d16 C600/X79 series chipset PCI Express Root Port 4
+ 1d17 C600/X79 series chipset PCI Express Root Port 4
+ 1d18 C600/X79 series chipset PCI Express Root Port 5
+ 1d19 C600/X79 series chipset PCI Express Root Port 5
+ 1d1a C600/X79 series chipset PCI Express Root Port 6
+ 1d1b C600/X79 series chipset PCI Express Root Port 6
+ 1d1c C600/X79 series chipset PCI Express Root Port 7
+ 1d1d C600/X79 series chipset PCI Express Root Port 7
+ 1d1e C600/X79 series chipset PCI Express Root Port 8
+ 1d1f C600/X79 series chipset PCI Express Root Port 8
+ 1d20 C600/X79 series chipset High Definition Audio Controller
+ 1d22 C600/X79 series chipset SMBus Host Controller
+ 1d24 C600/X79 series chipset Thermal Management Controller
+ 1d25 C600/X79 series chipset DMI to PCI Bridge
+ 1d26 C600/X79 series chipset USB2 Enhanced Host Controller #1
+ 1d2d C600/X79 series chipset USB2 Enhanced Host Controller #2
+ 1d33 C600/X79 series chipset LAN Controller
+ 1d35 C600/X79 series chipset VECI Controller
+ 1d3a C600/X79 series chipset MEI Controller #1
+ 1d3b C600/X79 series chipset MEI Controller #2
+ 1d3c C600/X79 series chipset IDE-r Controller
+ 1d3d C600/X79 series chipset KT Controller
+ 1d3e C600/X79 series chipset PCI Express Virtual Root Port
+ 1d3f C608/C606/X79 series chipset PCI Express Virtual Switch Port
+ 1d40 C600/X79 series chipset LPC Controller
+ 1d41 C600/X79 series chipset LPC Controller
+ 1d50 C608 chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d54 C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d55 C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+ 1d58 C606 chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d59 C604/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+ 1d5a C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+ 1d5b C602 chipset 4-Port SATA Storage Control Unit
+ 1d5c C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d5d C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+ 1d5e C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+ 1d5f C600/X79 series chipset 4-Port SATA Storage Control Unit
+ 1d60 C608 chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d64 C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d65 C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+ 1d68 C606 chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d69 C604/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+ 1d6a C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+ 1d6b C602 chipset 4-Port SATA Storage Control Unit
+ 1d6c C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+ 1d6d C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+ 1d6e C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+ 1d6f C600/X79 series chipset 4-Port SATA Storage Control Unit
+ 1d70 C600/X79 series chipset SMBus Controller 0
+ 1d71 C608/C606/X79 series chipset SMBus Controller 1
+ 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]
@@ -17035,7 +17347,7 @@
1028 0156 Precision 360
1028 0169 Precision 470
103c 12bc d330 uT
- 1043 80a6 P4P800 Mainboard
+ 1043 80a6 P4P800/P5P800 series motherboard
1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE)
1462 7280 865PE Neo2 (MS-6728)
1462 7650 Hetis 865GV-E (MS-7065)
@@ -17073,7 +17385,7 @@
1028 0169 Precision 470
103c 006a NX9500
103c 12bc d330 uT
- 1043 80f3 P4P800 Mainboard
+ 1043 80f3 P4P800 series motherboard
1043 810f P5P800-MX Mainboard
1458 a002 GA-8IPE1000/8KNXP motherboard
1462 0080 865PE Neo2-V (MS-6788) Mainboard
@@ -17255,7 +17567,7 @@
258a E7221 Integrated Graphics Controller
2590 Mobile 915GM/PM/GMS/910GML Express Processor to DRAM Controller
1014 0575 ThinkPad Z60t
- 1028 0182 Dell Latidude C610
+ 1028 0182 Dell Latitude C610
103c 0934 Compaq nw8240/nx8220
103c 099c NX6110/NC6120
104d 81b7 Vaio VGN-S3XP
@@ -17567,6 +17879,7 @@
15d9 8680 X7DVL-E-O motherboard
8086 3476 Intel S5000PSLSATA Server Board
2682 631xESB/632xESB SATA RAID Controller
+ 103c 31fe Adaptec Serial ATA HostRAID
2683 631xESB/632xESB SATA RAID Controller
2688 631xESB/632xESB/3100 Chipset UHCI USB Controller #1
1028 01bb PowerEdge 1955 onboard USB
@@ -17654,10 +17967,10 @@
103c 30a1 NC2400
1775 11cc CC11/CL11 integrated graphics (secondary)
17aa 201a ThinkPad T60/R60 series
- 27ac Mobile 945GME Express Memory Controller Hub
+ 27ac Mobile 945GSE Express Memory Controller Hub
1775 11cc CC11/CL11
- 27ad Mobile 945GME Express PCI Express Root Port
- 27ae Mobile 945GME Express Integrated Graphics Controller
+ 27ad Mobile 945GSE Express PCI Express Root Port
+ 27ae Mobile 945GSE Express Integrated Graphics Controller
1775 11cc CC11/CL11 integrated graphics (primary)
27b0 82801GH (ICH7DH) LPC Interface Bridge
103c 2a3b Pavilion A1512X
@@ -17828,6 +18141,7 @@
8086 1112 DeskTop Board D945GTP
8086 27d8 DeskTop Board D945GTP
8086 d618 DeskTop Board D510MO
+ 8384 7680 STAC9221 HD Audio Codec
27da N10/ICH 7 Family SMBus Controller
1025 006c 9814 WKMI
1028 01ad OptiPlex GX620
@@ -17897,7 +18211,7 @@
2825 82801HR/HO/HH (ICH8R/DO/DH) 2 port SATA Controller [IDE mode]
1028 01da OptiPlex 745
1462 7235 P965 Neo MS-7235 mainboard
- 2826 Patsburg SATA RAID Controller
+ 2826 C600/X79 series chipset SATA RAID Controller
2828 82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [IDE mode]
1028 01f3 Inspiron 1420
103c 30c0 Compaq 6710b
@@ -18081,6 +18395,7 @@
1028 0211 Optiplex 755
2916 82801IR (ICH9R) LPC Interface Controller
1028 020d Inspiron 530
+ 8086 5044 Desktop Board DP35DP
2917 ICH9M-E LPC Interface Controller
e4bf cc4d CCM-BOOGIE
2918 82801IB (ICH9) LPC Interface Controller
@@ -18099,6 +18414,7 @@
1028 0237 PowerEdge T610 SATA IDE Controller
1462 7360 G33/P35 Neo
2922 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode]
+ 8086 5044 Desktop Board DP35DP
2923 82801IB (ICH9) 4 port SATA Controller [AHCI mode]
2925 82801IR/IO (ICH9R/DO) SATA Controller [RAID mode]
1734 10e0 System Board D2542
@@ -18122,6 +18438,7 @@
1028 0211 Optiplex 755
103c 3628 dv6-1190en
1462 7360 G33/P35 Neo
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
2932 82801I (ICH9 Family) Thermal Subsystem
103c 3628 dv6-1190en
@@ -18138,6 +18455,7 @@
1028 029c PowerEdge M710 USB UHCI Controller
1028 2011 Optiplex 755
1462 7360 G33/P35 Neo
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
2935 82801I (ICH9 Family) USB UHCI Controller #2
1028 020d Inspiron 530
@@ -18151,6 +18469,7 @@
1028 0287 PowerEdge M610 onboard UHCI
1028 029c PowerEdge M710 USB UHCI Controller
1462 7360 G33/P35 Neo
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
2936 82801I (ICH9 Family) USB UHCI Controller #3
1028 020d Inspiron 530
@@ -18162,6 +18481,7 @@
1028 0287 PowerEdge M610 onboard UHCI
1028 029c PowerEdge M710 USB UHCI Controller
1462 7360 G33/P35 Neo
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
2937 82801I (ICH9 Family) USB UHCI Controller #4
1028 020d Inspiron 530
@@ -18175,6 +18495,7 @@
1462 7360 G33/P35 Neo
8086 2937 Optiplex 755
8086 2942 828011 (ICH9 Family ) USB UHCI Controller
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
2938 82801I (ICH9 Family) USB UHCI Controller #5
1028 020d Inspiron 530
@@ -18186,12 +18507,14 @@
1028 029c PowerEdge M710 USB UHCI Controller
1462 7360 G33/P35 Neo
8086 2938 Optiplex 755
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
2939 82801I (ICH9 Family) USB UHCI Controller #6
1028 020d Inspiron 530
1028 0210 PowerEdge T300 onboard UHCI
1028 0237 PowerEdge T610 USB UHCI Controller
1462 7360 G33/P35 Neo
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
293a 82801I (ICH9 Family) USB2 EHCI Controller #1
1028 020d Inspiron 530
@@ -18205,6 +18528,7 @@
1028 0287 PowerEdge M610 onboard EHCI
1028 029c PowerEdge M710 USB EHCI Controller
1462 7360 G33/P35 Neo
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
293c 82801I (ICH9 Family) USB2 EHCI Controller #2
1028 020d Inspiron 530
@@ -18216,6 +18540,7 @@
1028 029c PowerEdge M710 USB EHCI Controller
1462 7360 G33/P35 Neo
8086 293c Optiplex 755
+ 8086 5044 Desktop Board DP35DP
e4bf cc4d CCM-BOOGIE
293e 82801I (ICH9 Family) HD Audio Controller
1028 020d Inspiron 530
@@ -18293,6 +18618,7 @@
1028 020d Inspiron 530
1043 82b0 P5KPL-VM Motherboard
1462 7360 G33/P35 Neo
+ 8086 5044 Desktop Board DP35DP
29c1 82G33/G31/P35/P31 Express PCI Express Root Port
1028 020d Inspiron 530
29c2 82G33/G31 Express Integrated Graphics Controller
@@ -18302,6 +18628,7 @@
1028 020d Inspiron 530
1043 82b0 P5KPL-VM Motherboard
29c4 82G33/G31/P35/P31 Express MEI Controller
+ 8086 5044 Desktop Board DP35DP
29c5 82G33/G31/P35/P31 Express MEI Controller
29c6 82G33/G31/P35/P31 Express PT IDER Controller
29c7 82G33/G31/P35/P31 Express Serial KT Controller
@@ -18692,14 +19019,14 @@
3515 6310ESB PCI Express Downstream Port E2
3518 6311ESB/6321ESB PCI Express Downstream Port E3
3519 6310ESB PCI Express Downstream Port E3
- 3575 82830 830 Chipset Host Bridge
+ 3575 82830M/MG/MP Host Bridge
0e11 0030 Evo N600c
1014 021d ThinkPad A/T/X Series
104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
- 3576 82830 830 Chipset AGP Bridge
- 3577 82830 CGC [Chipset Graphics Controller]
+ 3576 82830M/MP AGP Bridge
+ 3577 82830M/MG Integrated Graphics Controller
1014 0513 ThinkPad A/T/X Series
- 3578 82830 830 Chipset Host Bridge
+ 3578 82830M/MG/MP Host Bridge
3580 82852/82855 GM/GME/PM/GMV Processor to I/O Controller
1014 055c ThinkPad R50e
1028 0139 Latitude D400
@@ -19053,85 +19380,81 @@
3b66 5 Series/3400 Series Chipset PT IDER Controller
3b67 5 Series/3400 Series Chipset KT Controller
e4bf 50c1 PC1-GROOVE
- 3c00 Sandy Bridge DMI2
- 3c01 Sandy Bridge DMI2 in PCI Express Mode
- 3c02 Sandy Bridge IIO PCI Express Root Port 1a
- 3c03 Sandy Bridge IIO PCI Express Root Port 1b
- 3c04 Sandy Bridge IIO PCI Express Root Port 2a
- 3c05 Sandy Bridge IIO PCI Express Root Port 2b
- 3c06 Sandy Bridge IIO PCI Express Root Port 2c
- 3c07 Sandy Bridge IIO PCI Express Root Port 2d
- 3c08 Sandy Bridge IIO PCI Express Root Port 3a in PCI Express Mode
- 3c09 Sandy Bridge IIO PCI Express Root Port 3b
- 3c0a Sandy Bridge IIO PCI Express Root Port 3c
- 3c0b Sandy Bridge IIO PCI Express Root Port 3d
- 3c0d Sandy Bridge Non-Transparent Bridge
- 3c0e Sandy Bridge Non-Transparent Bridge
- 3c0f Sandy Bridge Non-Transparent Bridge
- 3c20 Sandy Bridge DMA Channel 0
- 3c21 Sandy Bridge DMA Channel 1
- 3c22 Sandy Bridge DMA Channel 2
- 3c23 Sandy Bridge DMA Channel 3
- 3c24 Sandy Bridge DMA Channel 4
- 3c25 Sandy Bridge DMA Channel 5
- 3c26 Sandy Bridge DMA Channel 6
- 3c27 Sandy Bridge DMA Channel 7
- 3c28 Sandy Bridge Address Map, VTd_Misc, System Management
- 3c2a Sandy Bridge Control Status and Global Errors
- 3c2c Sandy Bridge I/O APIC
- 3c2e Sandy Bridge DMA
- 3c2f Sandy Bridge DMA
- 3c40 Sandy Bridge IIO Switch and IRP Performance Monitor
- 3c41 Sandy Bridge QPI Port 0 Performance Monitor
- 3c42 Sandy Bridge QPI Port 1 Performance Monitor
- 3c43 Sandy Bridge Ring to PCI Express Performance Monitor
- 3c44 Sandy Bridge Ring to QuickPath Interconnect Link 0 Performance Monitor
- 3c45 Sandy Bridge Ring to QuickPath Interconnect Link 1 Performance Monitor
- 3c46 Sandy Bridge Processor Home Agent Performance Monitoring
- 3c71 Sandy Bridge Integrated Memory Controller RAS Registers
- 3c80 Sandy Bridge QPI Link 0
- 3c83 Sandy Bridge QPI Link Reut 0
- 3c84 Sandy Bridge QPI Link Reut 0
- 3c86 Sandy Bridge QPI Port 0 DFX Link
- 3c90 Sandy Bridge QPI Link 1
- 3c93 Sandy Bridge QPI Link Reut 1
- 3c94 Sandy Bridge QPI Link Reut 1
- 3c96 Sandy Bridge QPI Port 1 DFX Link
- 3ca0 Sandy Bridge Processor Home Agent
- 3ca8 Sandy Bridge Integrated Memory Controller Registers
- 3caa Sandy Bridge Integrated Memory Controller Target Address Decoder 0
- 3cab Sandy Bridge Integrated Memory Controller Target Address Decoder 1
- 3cac Sandy Bridge Integrated Memory Controller Target Address Decoder 2
- 3cad Sandy Bridge Integrated Memory Controller Target Address Decoder 3
- 3cae Sandy Bridge Integrated Memory Controller Target Address Decoder 4
- 3cb0 Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 0
- 3cb1 Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 1
- 3cb2 Sandy Bridge Integrated Memory Controller ERROR Registers 0
- 3cb3 Sandy Bridge Integrated Memory Controller ERROR Registers 1
- 3cb4 Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 2
- 3cb5 Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 3
- 3cb6 Sandy Bridge Integrated Memory Controller ERROR Registers 2
- 3cb7 Sandy Bridge Integrated Memory Controller ERROR Registers 3
- 3cb8 Sandy Bridge DDRIO
- 3cc0 Sandy Bridge Power Control Unit 0
- 3cc1 Sandy Bridge Power Control Unit 1
- 3cc2 Sandy Bridge Power Control Unit 2
- 3cd0 Sandy Bridge Power Control Unit 3
- 3ce0 Sandy Bridge Interrupt Control Registers
- 3ce3 Sandy Bridge Semaphore and Scratchpad Configuration Registers
- 3ce4 Sandy Bridge R2PCIe
- 3ce6 Sandy Bridge QuickPath Interconnect Agent Ring Registers
- 3ce8 Sandy Bridge Unicast Register 0
- 3ce9 Sandy Bridge Unicast Register 5
- 3cea Sandy Bridge Unicast Register 1
- 3ceb Sandy Bridge Unicast Register 6
- 3cec Sandy Bridge Unicast Register 3
- 3ced Sandy Bridge Unicast Register 7
- 3cee Sandy Bridge Unicast Register 4
- 3cef Sandy Bridge Unicast Register 8
- 3cf4 Sandy Bridge Integrated Memory Controller System Address Decoder 0
- 3cf5 Sandy Bridge Integrated Memory Controller System Address Decoder 1
- 3cf6 Sandy Bridge System Address Decoder
+ 3c00 Xeon E5/Core i7 DMI2
+ 3c01 Xeon E5/Core i7 DMI2 in PCI Express Mode
+ 3c02 Xeon E5/Core i7 IIO PCI Express Root Port 1a
+ 3c03 Xeon E5/Core i7 IIO PCI Express Root Port 1b
+ 3c04 Xeon E5/Core i7 IIO PCI Express Root Port 2a
+ 3c05 Xeon E5/Core i7 IIO PCI Express Root Port 2b
+ 3c06 Xeon E5/Core i7 IIO PCI Express Root Port 2c
+ 3c07 Xeon E5/Core i7 IIO PCI Express Root Port 2d
+ 3c08 Xeon E5/Core i7 IIO PCI Express Root Port 3a in PCI Express Mode
+ 3c09 Xeon E5/Core i7 IIO PCI Express Root Port 3b
+ 3c0a Xeon E5/Core i7 IIO PCI Express Root Port 3c
+ 3c0b Xeon E5/Core i7 IIO PCI Express Root Port 3d
+ 3c0d Xeon E5/Core i7 Non-Transparent Bridge
+ 3c0e Xeon E5/Core i7 Non-Transparent Bridge
+ 3c0f Xeon E5/Core i7 Non-Transparent Bridge
+ 3c20 Xeon E5/Core i7 DMA Channel 0
+ 3c21 Xeon E5/Core i7 DMA Channel 1
+ 3c22 Xeon E5/Core i7 DMA Channel 2
+ 3c23 Xeon E5/Core i7 DMA Channel 3
+ 3c24 Xeon E5/Core i7 DMA Channel 4
+ 3c25 Xeon E5/Core i7 DMA Channel 5
+ 3c26 Xeon E5/Core i7 DMA Channel 6
+ 3c27 Xeon E5/Core i7 DMA Channel 7
+ 3c28 Xeon E5/Core i7 Address Map, VTd_Misc, System Management
+ 3c2a Xeon E5/Core i7 Control Status and Global Errors
+ 3c2c Xeon E5/Core i7 I/O APIC
+ 3c2e Xeon E5/Core i7 DMA
+ 3c2f Xeon E5/Core i7 DMA
+ 3c40 Xeon E5/Core i7 IIO Switch and IRP Performance Monitor
+ 3c43 Xeon E5/Core i7 Ring to PCI Express Performance Monitor
+ 3c44 Xeon E5/Core i7 Ring to QuickPath Interconnect Link 0 Performance Monitor
+ 3c45 Xeon E5/Core i7 Ring to QuickPath Interconnect Link 1 Performance Monitor
+ 3c46 Xeon E5/Core i7 Processor Home Agent Performance Monitoring
+ 3c71 Xeon E5/Core i7 Integrated Memory Controller RAS Registers
+ 3c80 Xeon E5/Core i7 QPI Link 0
+ 3c83 Xeon E5/Core i7 QPI Link Reut 0
+ 3c84 Xeon E5/Core i7 QPI Link Reut 0
+ 3c90 Xeon E5/Core i7 QPI Link 1
+ 3c93 Xeon E5/Core i7 QPI Link Reut 1
+ 3c94 Xeon E5/Core i7 QPI Link Reut 1
+ 3ca0 Xeon E5/Core i7 Processor Home Agent
+ 3ca8 Xeon E5/Core i7 Integrated Memory Controller Registers
+ 3caa Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 0
+ 3cab Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 1
+ 3cac Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 2
+ 3cad Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 3
+ 3cae Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 4
+ 3cb0 Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 0
+ 3cb1 Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 1
+ 3cb2 Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 0
+ 3cb3 Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 1
+ 3cb4 Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 2
+ 3cb5 Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 3
+ 3cb6 Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 2
+ 3cb7 Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 3
+ 3cb8 Xeon E5/Core i7 DDRIO
+ 3cc0 Xeon E5/Core i7 Power Control Unit 0
+ 3cc1 Xeon E5/Core i7 Power Control Unit 1
+ 3cc2 Xeon E5/Core i7 Power Control Unit 2
+ 3cd0 Xeon E5/Core i7 Power Control Unit 3
+ 3ce0 Xeon E5/Core i7 Interrupt Control Registers
+ 3ce3 Xeon E5/Core i7 Semaphore and Scratchpad Configuration Registers
+ 3ce4 Xeon E5/Core i7 R2PCIe
+ 3ce6 Xeon E5/Core i7 QuickPath Interconnect Agent Ring Registers
+ 3ce8 Xeon E5/Core i7 Unicast Register 0
+ 3ce9 Xeon E5/Core i7 Unicast Register 5
+ 3cea Xeon E5/Core i7 Unicast Register 1
+ 3ceb Xeon E5/Core i7 Unicast Register 6
+ 3cec Xeon E5/Core i7 Unicast Register 3
+ 3ced Xeon E5/Core i7 Unicast Register 7
+ 3cee Xeon E5/Core i7 Unicast Register 4
+ 3cef Xeon E5/Core i7 Unicast Register 8
+ 3cf4 Xeon E5/Core i7 Integrated Memory Controller System Address Decoder 0
+ 3cf5 Xeon E5/Core i7 Integrated Memory Controller System Address Decoder 1
+ 3cf6 Xeon E5/Core i7 System Address Decoder
4000 5400 Chipset Memory Controller Hub
4001 5400 Chipset Memory Controller Hub
4003 5400 Chipset Memory Controller Hub
@@ -19473,6 +19796,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
9000 IXP2000 Family Network Processor
9001 IXP2400 Network Processor
9002 IXP2300 Network Processor
@@ -19901,6 +20298,8 @@
919a Gigapixel Corp
9412 Holtek
6565 6565
+9618 JusonTech Corporation
+ 0001 JusonTech Gigabit Ethernet Controller
9699 Omni Media Technology Inc
6565 6565
9710 NetMos Technology
@@ -19976,6 +20375,7 @@ cace CACE Technologies, Inc.
0023 AirPcap N
cafe Chrysalis-ITS
0003 Luna K3 Hardware Security Module
+ 0006 Luna PCI-e 3000 Hardware Security Module
cccc Catapult Communications
ccec Curtiss-Wright Controls Embedded Computing
cddd Tyzx, Inc.
@@ -20011,7 +20411,12 @@ d4d4 Dy4 Systems Inc
0601 PCI Mezzanine Card
d531 I+ME ACTIA GmbH
d84d Exsys
+dada Datapath Limited
db10 Diablo Technologies
+dcba Dynamic Engineering
+ 0046 PCIeAlteraCycloneIV
+dd01 Digital Devices GmbH
+ 0003 Octopus LE DVB adapter
dead Indigita Corporation
deaf Middle Digital Inc.
9050 PC Weasel Virtual VGA
@@ -20031,6 +20436,15 @@ e159 Tiger Jet Network Inc.
0002 Tiger100APC ISDN chipset
e1c5 Elcus
e4bf EKF Elektronik GmbH
+ 0ccd CCD-CALYPSO
+ 0cd1 CD1-OPERA
+ 0cd2 CD2-BEBOP
+ 0cd3 CD3-JIVE
+ 50c1 PC1-GROOVE
+ 50c2 PC2-LIMBO
+ 53c1 SC1-ALLEGRO
+ cc47 CCG-RUMBA
+ cc4d CCM-BOOGIE
e55e Essence Technology, Inc.
ea01 Eagle Technology
000a PCI-773 Temperature Card
@@ -20254,6 +20668,7 @@ C 08 Generic system peripheral
01 ISA RTC
04 PCI Hot-plug controller
05 SD Host controller
+ 06 IOMMU
80 System peripheral
C 09 Input device controller
00 Keyboard controller
diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index 952ff1c..c21fff1 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: 2011.11.13
-# Date: 2011-11-13 20:34:03
+# Version: 2012.02.08
+# Date: 2012-02-08 20:34:02
#
# Vendors, devices and interfaces. Please keep sorted.
@@ -467,6 +467,7 @@
5a11 PhotoSmart C7100 series
5b11 OfficeJet J2100 series
5c11 PhotoSmart C4200 Printer series
+ 5c17 LaserJet P2055 series
5d11 PhotoSmart C5200 series
5e11 PhotoSmart D7400 series
6004 DeskJet 5550
@@ -546,6 +547,7 @@
8504 DeskJet 6600 series
8604 DeskJet 5440
8704 DeskJet 5940
+ 8711 Deskjet 2050 J510
8804 DeskJet 6980 series
8904 DeskJet 6940 series
8c07 Digital Stereo Headset
@@ -609,6 +611,7 @@
2001 USBXchange Adapter
2002 USB2-Xchange
2003 USB2-Xchange Adapter
+ 4000 4-port hub
adcc Composite Device Support
03f4 Diebold, Inc.
03f5 Siemens Electromechanical
@@ -775,6 +778,7 @@
0040 Floppy
004e SuperScript 1400 Series
004f Wireless Keyboard with One-touch start buttons
+ 0050 7-port hub
0058 HighSpeed Hub
0059 HighSpeed Hub
005a HighSpeed Hub
@@ -880,7 +884,7 @@
0595 Digital Camera
0596 Digital Camera
0597 Digital Camera
- 0598 Digital Camera
+ 0598 EASYSHARE M1033 digital camera
0599 Digital Camera
059a Digital Camera
059b Digital Camera
@@ -931,6 +935,7 @@
05d4 EasyShare C180 Digital Camera
1001 EasyShare SV811 Digital Picture Frame
4000 InkJet Color Printer
+ 4056 ESP 7200 Series AiO
4109 EasyShare Printer Dock Series 3
410d EasyShare G600 Printer Dock
5010 Wireless Adapter
@@ -963,6 +968,7 @@
0018 USB2-IDE Adapter
001c USB-IDE Bridge: DUB-PxxG
0027 WLI-USB-KS11G 802.11b Adapter
+ 002a SMSC USB97C202 "HD-HB300V2-EU"
003d LUA-U2-KTX Ethernet
0044 WLI-USB-KB11 Wireless LAN Adapter
004b WLI-USB-G54 802.11g Adapter [Broadcom 4320 USB]
@@ -986,6 +992,7 @@
00d8 WLI-U2-SG54HP
00d9 WLI-U2-G54HP
00da WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B]
+ 00db External Hard Drive HD-PF32OU2 [Buffalo Ministation]
00e8 WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]
012e WLI-UC-AG300N Wireless LAN Adapter
0148 WLI-UC-G300HP Wireless LAN Adapter
@@ -993,11 +1000,11 @@
0157 External Hard Drive HD-PEU2
0158 WLI-UC-GNHP Wireless LAN Adapter
015d WLI-UC-GN Wireless LAN Adapter [Ralink RT3070]
- 016f WLI-UC-G301N Wireless LAN Adapter
+ 016f WLI-UC-G301N Wireless LAN Adapter [Ralink RT3072]
017f Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
019e WLI-UC-GNP Wireless LAN Adapter
01a1 MiniStation Metro
- 01a2 WLI-UC-GNM Wireless LAN Adapter
+ 01a2 WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070]
01ee WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070]
0412 Award Software International
0413 Leadtek Research, Inc.
@@ -1038,6 +1045,7 @@
6029 WinFast DTV Dongle Gold
6125 WinFast DTV Dongle
6126 WinFast DTV Dongle BDA Driver
+ 6a03 RTL2832 [WinFast DTV Dongle Mini]
6f00 WinFast DTV Dongle (STK7700P based)
0414 Giga-Byte Technology Co., Ltd
0416 Winbond Electronics Corp.
@@ -1101,6 +1109,7 @@
3061 SoundBlaster Audigy 2 ZS Video Editor
3090 Sound Blaster Digital Music SX
30d3 Sound Blaster Play!
+ 3121 WoW tap chat
3f00 E-Mu Xboard 25 MIDI Controller
3f02 E-Mu 0202
3f04 E-Mu 0404
@@ -1200,6 +1209,7 @@
4151 Zen Vision:M (mtp)
4152 Zen V Plus
4153 Zen Vision W
+ 4154 Zen Stone
4155 Zen Stone plus
4157 Zen (MTP)
500f Broadband Blaster 8012U-V
@@ -1666,7 +1676,7 @@
0001 Mouse
0002 Genius NetMouse Pro
0003 Genius NetScroll+
- 0006 Easy Mouse+ USB(USB\Vid_0458&Pid;_0006) Mouse
+ 0006 Easy Mouse+
000b NetMouse Wheel(P+U)
000c TACOMA Fingerprint V1.06.01
000e VideoCAM Web
@@ -1725,7 +1735,7 @@
301a MaxFire G-12U Vibration
301d Genius MaxFire MiniPad
400f Genius TVGo DVB-T02Q MCE
- 4012 TVGo DVB-T03
+ 4012 TVGo DVB-T03 [AF9015]
5003 G-pen 560 Tablet
5004 G-pen Tablet
6001 GF3000F Ethernet Adapter
@@ -1751,6 +1761,7 @@
705a Asus USB2.0 Webcam
705c Genius iSlim 1300AF
7079 FaceCam 2025R
+ 707f TVGo DVB-T03 [RTL2832]
0459 Adobe Systems, Inc.
045a SONICblue, Inc.
07da Supra Express 56K modem
@@ -1840,6 +1851,7 @@
009d Wireless Optical Desktop 3.0
00a0 eHome Infrared Receiver
00b0 Digital Media Pro Keyboard
+ 00b4 Digital Media Keyboard 1.0A
00b9 Wireless Optical Mouse 3.0
00bb Fingerprint Reader
00bc Fingerprint Reader
@@ -2021,13 +2033,17 @@
071f Mouse/Keyboard 2.4GHz Transceiver V2.0
0721 LifeCam NX-3000 (UVC-compliant)
0723 LifeCam VX-7000 (UVC-compliant)
+ 0724 SideWinder Mouse
+ 0730 Digital Media Keyboard 3000
0734 Wireless Optical Desktop 700
0737 Compact Optical Mouse 500
0745 Nano Transceiver v1.0 for Bluetooth
0750 Wired Keyboard 600
+ 0752 Wired Keyboard 400
075d LifeCam Cinema
0768 Sidewinder X4
076d LifeCam HD-5000
+ 0772 LifeCam Studio
930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board
fff8 Keyboard
ffff Windows CE Mass Storage
@@ -2118,6 +2134,7 @@
0101 PS/2 Keyboard, Mouse & Joystick Ports
0301 USB 1.0 Hub
0500 Serial & Parallel Ports
+ ff10 Virtual Keyboard and Mouse
046c Toshiba Corp., Digital Media Equipment
046d Logitech, Inc.
0082 Acer Aspire 5672 Webcam
@@ -2308,6 +2325,7 @@
c062 LS1 Laser Mouse, corded
c063 DELL Laser Mouse
c068 G500 Laser Mouse
+ c069 M500 Laser Mouse
c06b G700 Wireless Gaming Mouse
c06c Optical Mouse
c101 UltraX Media Remote
@@ -2344,6 +2362,8 @@
c225 G11/G15 Keyboard / G keys
c226 G15 Refresh Keyboard
c227 G15 Refresh Keyboard
+ c22a Gaming Keyboard G110
+ c22b Gaming Keyboard G110 G-keys
c22d G510 Gaming Keyboard
c22e G510 Gaming Keyboard onboard audio
c281 WingMan Force
@@ -2632,6 +2652,7 @@
102d Pilot Optical
102e Pilot Optical Pro
102f Pilot Optical Pro Wireless
+ 1042 Ci25m Notebook Optical Mouse [Diamond Eye Precision]
1043 Ci65m Wireless Notebook Optical Mouse
104a PilotMouse Mini Retractable
105d PocketMouse Bluetooth
@@ -2683,6 +2704,7 @@
047f Plantronics, Inc.
0101 Bulk Driver
0301 Bulk Driver
+ 0411 Savi Office Base Station
0ca1 USB DSP v4 Audio Interface
4254 BUA-100 Bluetooth Adapter
ad01 GameCom 777 5.1 Headset
@@ -2691,6 +2713,7 @@
0004 InTouch Module
0011 InTouch Module
0014 InTouch Module
+ a007 External Disk USB 3.0
0481 Zenith Data Systems
0482 Kyocera Corp.
000e FS-1020D Printer
@@ -3113,6 +3136,7 @@
173e MP560
173f Pixma MP640 Multifunction device
1748 Pixma MG5150
+ 174d MX360 ser
1900 CanoScan LiDE 90
1901 CanoScan 8800F
1904 CanoScan LiDE 100
@@ -3455,6 +3479,7 @@
301b SK-8815 Keyboard
301c Enhanced Performance Keyboard
3020 Enhanced Performance Keyboard
+ 3025 NetVista Full Width Keyboard
3100 NetVista Mouse
3103 ScrollPoint Pro Mouse
3104 ScrollPoint Wireless Mouse
@@ -3475,7 +3500,6 @@
4604 Keyboard w/ Card Reader
4671 4820 LCD w/ MSR/KB
04b4 Cypress Semiconductor Corp.
- 0000 Dacal DC-101 CD Library
0001 Mouse
0002 CY7C63x0x Thermometer
0033 Mouse
@@ -3496,6 +3520,7 @@
5201 Combi Keyboard-Hub (Hub)
5202 Combi Keyboard-Hub (Keyboard)
5500 HID->COM RS232 Adapter
+ 5a9b Dacal CD/DVD Library D-101/DC-300/DC-016RW
6370 ViewMate Desktop Mouse CC2201
6560 CY7C65640 USB-2.0 "TetraHub"
6830 CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI
@@ -3850,6 +3875,7 @@
01fd A160
023e FinePix AX300
0240 FinePix S2950 Digital Camera
+ 0241 FinePix S3200 Digital Camera
04cc ST-Ericsson
1122 Hub
1520 USB 2.0 Hub (Avocent KVM)
@@ -3919,6 +3945,7 @@
1603 Keyboard
2013 Keyboard [Das Keyboard]
2221 Keyboard
+ a055 Keyboard
04da Panasonic (Matsushita)
0901 LS-120 Camera
0912 SDR-S10
@@ -3986,6 +4013,7 @@
8005 Zaurus A-300
8006 Zaurus SL-B500/SL-5600 PDA
8007 Zaurus C-700 PDA
+ 9009 AR-M160
9014 IM-DR80 Portable NetMD Player
9031 Zaurus C-750/C-760/C-860/SL-C3000 PDA
9032 Zaurus SL-6000
@@ -4221,6 +4249,7 @@
5f03 NEXiO Sync
5f04 NEXiO Sync
6032 G2 Portable hard drive
+ 60c4 M2 Portable Hard Drive USB 3.0
6601 Mobile Phone
6602 Galaxy
6603 Galaxy
@@ -4301,6 +4330,7 @@
0111 KU-9908 Keyboard
0112 KU-8933 Keyboard with PS/2 Mouse port
0116 KU-2971/KU-0325 Keyboard
+ 0201 Gaming Keyboard KPD0250
0220 Wireless HID Receiver
0402 Genius LuxeMate i200 Keyboard
0403 KU-0420 keyboard
@@ -4351,8 +4381,10 @@
b1aa Webcam-101
b1b4 Lenovo Integrated Camera
b1cf Lenovo Integrated Camera
+ b217 Lenovo Integrated Camera (0.3MP)
b221 integrated camera
b230 Integrated HP HD Webcam
+ b26b Sony Visual Communication Camera
b272 Lenovo EasyCamera
04f3 Elan Microelectronics Corp.
01a4 Wireless Keyboard
@@ -4360,6 +4392,7 @@
0212 Laser Mouse
0214 Lynx M9 Optical Mouse
0230 3D Optical Mouse
+ 0232 Mouse
02f4 2.4G Cordless Mouse
04f4 Harting Elektronik, Inc.
04f5 Fujitsu-ICL Systems, Inc.
@@ -4570,7 +4603,7 @@
4201 DS4201 Audio DAC
04fb Biostar Microtech International Corp.
04fc Sunplus Technology Co., Ltd
- 0003 CM1092 Optical Scroller Mouse
+ 0003 CM1092 / Wintech CM-5098 Optical Mouse
0005 USB OpticalWheel Mouse
0013 ViewMate Desktop Mouse CC2201
0015 ViewMate Desktop Mouse CC2201
@@ -4669,6 +4702,7 @@
0122 Ethernet Adapter
0131 Bluetooth Device with trace filter
016a Bluetooth Mini Dongle
+ 0200 Nostromo SpeedPad n52te Gaming Keyboard
0201 Peripheral Switch
0208 USBView II Video Adapter [nt1004]
0210 F5U228 Hi-Speed USB 2.0 DVD Creator
@@ -4690,7 +4724,7 @@
0815 Nostromo n52 HID SpeedPad Mouse Wheel
0826 ErgoFit Wireless Optical Mouse (HID)
0980 HID UPS Battery
- 1102 F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CE-VAU]
+ 1102 F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS]
1202 F5U120-PC Parallel Printer Port
1203 F5U120-PC Serial Port
2103 F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]
@@ -4718,9 +4752,10 @@
845a F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU]
905b F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573]
905c F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573]
- 935a F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT2870]
+ 935a F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT3070]
935b F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070]
- 945a F7D1101 Basic Wireless USB Adapter v1000 [Realtek RTL8188SU]
+ 945a F7D1101 v1 Basic Wireless Adapter [Realtek RTL8188SU]
+ 945b F7D1101 v2 Basic Wireless Adapter [Ralink RT3370]
050e Neon Technology, Inc.
050f KC Technology, Inc.
0001 Hub
@@ -4765,7 +4800,9 @@
0525 Netchip Technology, Inc.
100d RFMD Bluetooth Device
1080 NET1080 USB-USB Bridge
+ 1200 SSDC Adapter II
1265 File-backed Storage Gadget
+ a0f0 Cambridge Electronic Devices Power1401 mk 2
a140 USB Clik! 40
a141 (OME) PocketZip 40 MP3 Player Driver
a220 GVC Bluetooth Wireless Adapter
@@ -5067,8 +5104,10 @@
033e DSC-W120
0346 Handycam DCR-SR55E
0348 HandyCam HDR-TG3E
+ 035b Walkman NWZ-A828
035c NWZ-A726/A728/A729
0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
+ 0385 Walkman NWZ-E436F
03bc Webbie HD - MHS-CM1
03d3 DR-BT100CX
03d5 PlayStation Move motion controller
@@ -5115,6 +5154,7 @@
2011 UC-2324 4xSerial Ports [mos7840]
2202 CS124U Miniview II KVM Switch
2213 CS682 2-Port USB 2.0 DVI KVM Switch
+ 2221 Winbond Hermon
2404 4-port switch
2600 IDE Bridge
2701 CE700A KVM Extender
@@ -5660,6 +5700,7 @@
3417 NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG]
3418 NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870]
341a NWD-270N Wireless N-lite USB Adapter
+ 341e NWD2105 802.11bgn Wireless Adapter [Ralink RT3070]
341f NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]
0587 America Kotobuki Electronics Industries, Inc.
0588 Sapien Design
@@ -5701,7 +5742,7 @@
6360 Multimedia Card Reader
6361 Multimedia Card Reader
6362 Flash Card Reader/Writer
- 6364 Hi-Speed 7-in-1 Flash Card Reader/Writer [Sabrent]
+ 6364 AU6476 Card Reader Controller
6366 Multi Flash Reader
6377 Multimedia Card Reader
6386 Memory Card
@@ -5728,6 +5769,7 @@
9510 ChunghwaTL USB02 Smartcard Reader
9520 EMV Certified Smart Card Reader
9720 USB-Serial Adapter
+ a014 Asus Integrated Webcam
0590 Omron Corp.
0004 Cable Modem
000b MR56SVS
@@ -5914,6 +5956,7 @@
0245 Internal Keyboard/Trackpad (ANSI)
0246 Internal Keyboard/Trackpad (ISO)
0247 Internal Keyboard/Trackpad (JIS)
+ 0250 MP110Z/B
0252 Internal Keyboard/Trackpad (ANSI)
0253 Internal Keyboard/Trackpad (ISO)
0254 Internal Keyboard/Trackpad (JIS)
@@ -5930,6 +5973,7 @@
1003 Hub in Pro Keyboard [Mitsumi, A1048]
1006 Hub in Aluminum Keyboard
1101 Speakers
+ 1107 Thunderbolt Display Audio
1201 3G iPod
1202 iPod 2G
1203 iPod 4.Gen Grayscale 40G
@@ -5969,6 +6013,7 @@
129a iPad
129e iPod Touch 4.Gen
129f iPad 2
+ 12a0 iPhone 4S
1300 iPod Shuffle
1301 iPod Shuffle 2.Gen
1302 iPod Shuffle 3.Gen
@@ -5999,10 +6044,12 @@
912f Hub in 30" Cinema Display
921c A1082 [Cinema HD Display 23"]
9221 30" Cinema Display
+ 9227 Thunderbolt Display
ffff Bluetooth in DFU mode - Driver
05ad Y.C. Cable U.S.A., Inc.
05ae Synopsys, Inc.
05af Jing-Mold Enterprise Co., Ltd
+ 0806 HP SK806A Keyboard
0809 Wireless Keyboard and Mouse
0821 IDE to
3062 Cordless Keyboard
@@ -6050,6 +6097,7 @@
9001 Gobi Wireless Modem
9002 Gobi Wireless Modem
9008 Gobi Wireless Modem (QDL mode)
+ 9018 Qualcomm HSUSB Device
9201 Gobi Wireless Modem (QDL mode)
9202 Gobi Wireless Modem
9203 Gobi Wireless Modem
@@ -6078,6 +6126,8 @@
6001 Ten-Keypad
05c8 Cheng Uei Precision Industry Co., Ltd (Foxlink)
0103 FO13FF-65 PC-CAM
+ 021a HP Webcam
+ 0318 Webcam
0403 Webcam
05c9 Semtech Corp.
05ca Ricoh Co., Ltd
@@ -6418,6 +6468,7 @@
0717 All-in-1 Card Reader
0718 IDE/SATA Adapter
0723 GL827L SD/MMC/MS Flash Card Reader
+ 0726 SD Card Reader
0727 microSD Reader/Writer
0760 USB 2.0 Card Reader/Writer
0761 Genesys Mass Storage Device
@@ -6525,6 +6576,7 @@
6001 SolidTek USB 2p HUB
6002 SolidTek USB Keyboard
6003 Japanese Keyboard - 600HM
+ 8007 P-W1G1F12 VER:1 [Macally MegaCam]
a001 Maxwell Compact Pc PM3
060c EEH Datalink GmbH
060d Auctor Corp.
@@ -6580,6 +6632,7 @@
0201 Defender Office Keyboard (K7310) S Zodiak KM-9010
0252 Emerge Uni-retractable Laser Mouse
3286 Nano Receiver [Sandstrom Laser Mouse SMWLL11]
+ 6301 Trust Wireless Optical Mouse MI-4150K
9003 VoIP Conference Hub (A16GH)
9004 USR9602 USB Internet Mini Phone
062b Greatlink Electronics Taiwan, Ltd
@@ -6600,7 +6653,7 @@
0a10 iVina FB1600/UMAX Astra 4500
0a13 AV600U
0a15 Konica Minolta SC-110
- 0a16 SC-215
+ 0a16 Konica Minolta SC-215
0a30 UMAX Astra 6700 Scanner
0a41 Avision AM3000/MF3000 Series
0f01 fi-4010CU
@@ -6919,6 +6972,8 @@
3c06 54g USB Network Adapter
0682 Victor Company of Japan, Ltd
0684 Actiontec Electronics, Inc.
+0685 ZD Incorporated
+ 7000 HSDPA Modem
0686 Minolta Co., Ltd
2001 PagePro 4110W
2004 PagePro 1200W
@@ -7054,7 +7109,10 @@
05d2 PC Dash 2
075c X52 Flight Controller
0762 Saitek X52 Pro Flight Control System
+ 0763 Pro Flight Rudder Pedals
0805 R440 Force Wheel
+ 0bac Pro Flight Yoke
+ 0c2d Pro Flight Quadrant
1003 GM2 Action Pad
1009 Action Pad
100a SP550 Pad and Joystick Combo
@@ -7067,6 +7125,7 @@
3589 P3000 Wireless Pad
35be Cyborg Evo
5509 P3000 Wireless Pad
+ 712c Pro Flight Yoke integrated hub
8000 Gamers' Keyboard
801e Cyborg 3D Digital Stick II
8020 Eclipse Keyboard
@@ -7112,6 +7171,7 @@
0121 SpeedTouch 121g Wireless Dongle
2001 SPEED TOUCH Card
4061 SpeedTouch ISDN or ADSL Modem
+ 4062 SpeedTouch ISDN or ADSL router
a5a5 DynaMiTe Modem
06ba Smooth Cord & Connector Co., Ltd
06bb EDA, Inc.
@@ -7829,6 +7889,7 @@
0063 LDR Device
0064 LDR-R Device
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
0162 LAN-WN22/U2 Wireless LAN Adapter
0163 LAN-WN12/U2 Wireless LAN Adapter
@@ -8234,6 +8295,7 @@
3300 DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8191SU]
3302 DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8191SU]
3303 DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU]
+ 3304 FR-300USB 802.11bgn Wireless Adapter
3a07 WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523]
3a08 WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523]
3a09 DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A2) [Atheros AR9170+AR9104]
@@ -8246,10 +8308,10 @@
3c03 AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT2571W]
3c04 WUA-1340
3c05 EH103 Wireless G Adapter
- 3c07 Wireless G DWA-110 Adapter
+ 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]
- 3c0b DWA-110 Wireless G USB Adapter(rev.B)
+ 3c0b DWA-110 Wireless G Adapter(rev.B) [Ralink RT2870]
3c0d DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT3070]
3c0e WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070]
3c0f AirPlus G DWL-G122 Wireless Adapter(rev.E1) [Ralink RT2070]
@@ -8843,6 +8905,9 @@
08ff AuthenTec, Inc.
1600 AES1600
1610 AES1600
+ 1660 AES1660 Fingerprint Sensor
+ 1680 AES1660 Fingerprint Sensor
+ 168f AES1660 Fingerprint Sensor
2500 AES2501
2501 AES2501
2502 AES2501
@@ -8860,6 +8925,7 @@
250e AES2501
250f AES2501
2510 AES2510
+ 2550 AES2550 Fingerprint Sensor
2580 AES2501 Fingerprint Sensor
2588 AES2501
2589 AES2501
@@ -8869,6 +8935,9 @@
258d AES2501
258e AES2501
258f AES2501
+ 2660 AES2660 Fingerprint Sensor
+ 2680 AES2660 Fingerprint Sensor
+ 268f AES2660 Fingerprint Sensor
2810 AES2810
3400 AES3400 TruePrint Sensor
3401 AES3400 Sensor
@@ -8940,6 +9009,7 @@
337b Silicon Motion Camera
3710 Silicon Motion Camera
3720 Silicon Motion Camera
+ 37bc HP Webcam-101 Integrated Camera
37c0 Silicon Motion Camera
6000 SD/SDHC Card Reader (SG365 / FlexiDrive XC+)
6200 microSD card reader
@@ -8998,6 +9068,7 @@
2295 Colorado 300
22b6 eTrex Vista HCx (Mass Storage mode)
2353 Nüvi 205T
+ 2519 eTrex 30
2535 Edge 800
0920 Echelon Co.
7500 Network Interface
@@ -9171,9 +9242,11 @@
0944 KORG, Inc.
0001 PXR4 4-Track Digital Recorder
0020 KAOSS Pad KP3 Dynamic Effect/Sampler
+ 0023 KAOSSILATOR PRO Dynamic Phrase Synthesizer
010d nanoKEY MIDI keyboard
010e nanoPAD pad controller
010f nanoKONTROL studio controller
+ 0117 nanoKONTROL2 MIDI Controller
0f03 K-Series K61P MIDI studio controller
0945 Pasco Scientific
0948 Kronauer music in digital
@@ -9203,6 +9276,7 @@
1625 DataTraveler 101 II
162a DataTraveler 112 4GB Pen Drive
1643 DataTraveler G3 4GB
+ 1653 Data Traveler 100 G2 8 GiB
0954 RPM Systems Corp.
0955 NVidia Corp.
7100 Notion Ink Adam
@@ -9288,9 +9362,21 @@
0001 MySmartPad
09bf Auerswald GmbH & Co. KG
00c0 COMpact 2104 ISDN PBX
- 00db COMpact 4410/2206 ISDN ISDN
- 00f1 COMfort System Telephones
+ 00db COMpact 4410/2206 ISDN
+ 00dc COMpact 4406 DSL (PBX)
+ 00dd COMpact 2204 (PBX)
+ 00de COMpact 2104 (Rev.2 PBX)
+ 00e0 COMmander Business (PBX)
+ 00e2 COMmander Basic.2 (PBX)
+ 00f1 COMfort 2000 (System telephone)
+ 00f2 COMfort 1200 (System telephone)
+ 00f5 COMfortel 2500 (System telephone)
+ 8000 COMpact 2104 DSL (DSL modem)
+ 8001 COMpact 4406 DSL (DSL modem)
+ 8002 Analog/ISDN Converter (Line converter)
+ 8005 WG-640 (Automatic event dialer)
09c0 Genpix Electronics, LLC
+ 0136 Axon CNS, MultiClamp 700B
0202 8PSK DVB-S tuner
0203 Skywalker-1 DVB-S tuner
0204 Skywalker-CW3K DVB-S tuner
@@ -9531,7 +9617,7 @@
0201 iLine10(tm) Network Adapter
2000 Bluetooth Device
2001 Bluetooth Device
- 2009 Bluetooth Controller
+ 2009 BCM2035 Bluetooth
200a BCM2035 Bluetooth dongle
200f Bluetooth Controller
201d Bluetooth Device
@@ -9541,13 +9627,13 @@
2033 BCM2033 Bluetooth
2035 BCM2035 Bluetooth
2038 Blutonium Device
- 2039 Bluetooth Device
+ 2039 BCM2045 Bluetooth
2045 Bluetooth Controller
2046 Bluetooth Device
2047 Bluetooth Device
205e Bluetooth Device
2100 Bluetooth 2.0+eDR dongle
- 2101 Bluetooth Controller
+ 2101 BCM2045 Bluetooth
2102 ANYCOM Blue USB-200/250
2110 Bluetooth Controller
2111 ANYCOM Blue USB-UHE 200/250
@@ -9579,7 +9665,8 @@
5802 BCM5880 Secure Applications Processor with fingerprint touch sensor
5803 BCM5880 Secure Applications Processor with secure keyboard
6300 Pirelli Remote NDIS Device
- bd13 Arcadyan WN8522B [Broadcom BCM4323]
+ bd11 TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]
+ bd13 BCM4323 802.11abgn Wireless Adapter
d11b Eminent EM4045 [Broadcom 4320 USB]
0a5d Diatrend Corp.
0a5f Zebra
@@ -9702,6 +9789,26 @@
0aab Vision Shape Europe SA
0aac iCompression, Inc.
0aad Rohde & Schwarz GmbH & Co. KG
+ 0003 NRP-Z21
+ 000c NRP-Z11
+ 0013 NRP-Z22
+ 0014 NRP-Z23
+ 0015 NRP-Z24
+ 0016 NRP-Z51
+ 0017 NRP-Z52
+ 0018 NRP-Z55
+ 0019 NRP-Z56
+ 0021 NRP-Z91
+ 0023 NRP-Z81
+ 002c NRP-Z31
+ 002d NRP-Z37
+ 002f NRP-Z27
+ 0051 NRP-Z28
+ 0052 NRP-Z98
+ 0062 NRP-Z92
+ 0070 NRP-Z57
+ 0083 NRP-Z85
+ 0095 NRP-Z86
0aae NEC infrontia Corp. (Nitsuko)
0aaf Digitalway Co., Ltd
0ab0 Arrow Strong Electronics Co., Ltd
@@ -9732,6 +9839,7 @@
307b USB 1.1 Webcam
332d Vega USB 2.0 Camera
3343 Sirius USB 2.0 Camera
+ 3370 Traveler TV 6500 SF Dia-scanner
3420 Venus USB2.0 Camera
c001 Sony embedded vimicro Camera
c002 Visual Communication Camera VGP-VCC1
@@ -9813,6 +9921,7 @@
7501 Globetrotter HSUPA Modem (icon 411 aka "Vodafone K3760")
7601 Globetrotter MO40x 3G Modem (GTM 382)
7701 Globetrotter HSUPA Modem (aka icon 451)
+ d055 Globetrotter GI0505 [iCON 505]
0af6 Silver I Co., Ltd
0af7 B2C2, Inc.
0101 Digital TV USB Receiver (DVB-S/T/C / ATSC)
@@ -9854,13 +9963,14 @@
1751 BT-253 Bluetooth Adapter
175b Laptop OLED Display
1760 802.11n Network Adapter
- 1761 802.11n Network Adapter
+ 1761 USB-N11 802.11n Network Adapter [Ralink RT2870]
1774 Gobi Wireless Modem (QDL mode)
1776 Gobi Wireless Modem
1779 My Cinema U3100 Mini Plus [AF9035A]
1784 USB-N13 802.11n Network Adapter [Ralink RT3072]
- 1786 USB-N10 802.11n Network Adapter [Realtek RTL8192SU]
+ 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]
6101 Cable Modem
620a Remote NDIS Device
b700 Broadcom Bluetooth 2.1
@@ -10020,6 +10130,8 @@
1720 10/100 Ethernet
1780 AX88178
7720 AX88772
+ 772a AX88772A Fast Ethernet
+ 7e2b AX88772B
0b96 Sewon Telecom
0b97 O2 Micro, Inc.
7732 Smart Card Reader
@@ -10048,7 +10160,7 @@
0111 USR5420 802.11g Adapter [Broadcom 4320 USB]
0118 U5 802.11g Adapter
011b Wireless MAXg Adapter [Broadcom 4320]
- 0121 USR5423 802.11bg
+ 0121 USR5423 802.11bg Wireless Adapter [ZyDAS ZD1211B]
6112 FaxModem Model 5633
0bb0 Concord Camera Corp.
0100 Sound Vision Stream
@@ -10242,6 +10354,7 @@
0c99 Desire (debug)
0c9e Incredible
0ca2 Desire HD (debug mode)
+ 0ca5 Android Phone [Evo Shift 4G]
0ff8 Desire HD (Tethering Mode)
0ff9 Desire / Desire HD / Hero (Charge Mode)
0ffe Desire HD (modem mode)
@@ -10260,6 +10373,7 @@
0bc2 Seagate RSS LLC
2000 Storage Adapter V3 (TPP)
2200 FreeAgent Go FW
+ 2300 Expansion Portable
5021 FreeAgent GoFlex USB 2.0
5031 FreeAgent GoFlex USB 3.0
0bc3 IPWireless, Inc.
@@ -10302,6 +10416,7 @@
0117 Mass Storage Device
0118 Mass Storage Device
0138 Card reader
+ 0139 Card reader
0151 Mass Storage Device (Multicard Reader)
0152 Mass Storage Device
0153 Mass Storage Device
@@ -10315,13 +10430,18 @@
0171 Mass Storage Device
0176 Mass Storage Device
0178 Mass Storage Device
+ 0186 Card Reader
2831 RTL2831U DVB-T
2832 RTL2832U DVB-T
+ 2838 RTL2838 DVB-T
8150 RTL8150 Fast Ethernet Adapter
8151 RTL8151 Adapteon Business Mobile Networks BV
8171 RTL8188SU 802.11n WLAN Adapter
8172 RTL8191SU 802.11n WLAN Adapter
- 8176 RTL8188CUS 802.11n WLAN
+ 8174 RTL8192SU 802.11n WLAN Adapter
+ 8176 RTL8188CUS 802.11n WLAN Adapter
+ 8178 RTL8192CU 802.11n WLAN Adapter
+ 817f RTL8188RU 802.11n WLAN Adapter
8187 RTL8187 Wireless Adapter
8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter
8192 RTL8192U 802.11n Wireless Adapter
@@ -10589,9 +10709,11 @@
63f1 Integrated Webcam
63f8 Sonix Integrated Webcam
6409 Webcam
+ 6413 Integrated Webcam
6417 Integrated Webcam
641d 1.3 MPixel Integrated Webcam
6480 Sonix 1.3 MP Laptop Integrated Webcam
+ 64bd Sony Visual Communication Camera
8000 DC31VC
8006 Dual Mode Camera (8006 VGA)
800a Vivitar Vivicam3350B
@@ -10790,6 +10912,7 @@
0023 UB81 802.11bgn
0025 802.11b/g/n USB Wireless Network Adapter
0026 UB82 802.11abgn
+ 0027 Sphairon Homelink 1202 802.11n Wireless Adapter [Atheros AR9170]
0ce5 Validation Technologies International
0003 Matrix
0ce9 pico Technology
@@ -10812,6 +10935,7 @@
1010 3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170]
20ff Virtual CD-ROM
3000 AR3011 Bluetooth (no firmware)
+ 3002 AR3011 Bluetooth
3005 AR3011 Bluetooth
7015 TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287]
9170 AR9170 802.11n
@@ -11009,6 +11133,7 @@
0107 CM108 Audio Controller
010f CM108 Audio Controller
0115 CM108 Audio Controller
+ 013c CM108 Audio Controller
0201 CM6501
5000 Mass Storage Controller
5200 Mass Storage Controller(0D8C,5200)
@@ -11073,6 +11198,7 @@
0101 SBIG Astronomy Camera (with firmware)
0d98 Mars Semiconductor Corp.
0300 Avaya Wireless Card
+ 1007 Discovery Kids Digital Camera
0d99 Trazer Technologies, Inc.
0d9a RTX Telecom AS
0001 Bluetooth Device
@@ -11255,6 +11381,7 @@
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]
+ 005d WLA-2000 v1.001 WLAN [RTL8191SU]
061c LN-028 Network USB 2.0 Adapter
21f4 44 St Bluetooth Device
2200 Sitecom bluetooth2.0 class 2 dongle CN-512
@@ -11445,6 +11572,7 @@
6803 OTI-6803 Flash Disk
6808 OTI-6808 Flash Disk
6828 OTI-6828 Flash Disk
+ 6858 OTi-6858 serial adapter
0ea6 Nihon Computer Co., Ltd
0ea7 MSL Enterprises Corp.
0ea8 CenDyne, Inc.
@@ -11761,6 +11889,8 @@
0fef MJ Research, Inc.
0ff6 Core Valley Co., Ltd
0ff7 CHI SHING Computer Accessories Co., Ltd
+0ffc Clavia DMI AB
+ 0021 Nord Stage 2
0fff Aopen, Inc.
1000 Speed Tech Corp.
1001 Ritronics Components (S) Pte., Ltd
@@ -11917,7 +12047,9 @@
0903 My Book Premium Edition
0910 MyBook Essential External HDD
1001 External Hard Disk [Elements]
+ 1010 Elements External HDD
1021 Elements 2TB
+ 1023 Elements SE
1103 My Book Studio
1104 MyBook Mirror Edition External HDD
1123 My Book 3.0
@@ -12005,6 +12137,8 @@
106d San Chieh Manufacturing, Ltd
106e ConectL
106f Money Controls
+ 0009 CT10x Coin Transaction
+ 000a CR10x Coin Recycler
1076 GCT Semiconductor, Inc.
0031 Bluetooth Device
0032 Bluetooth Device
@@ -12077,6 +12211,7 @@
818a Silicon Labs FM Radio Reference Design
8460 Sangoma Wanpipe VoiceTime
8461 Sangoma U100
+ 86bc C8051F34x AudioDelay [AD-340]
ea60 CP210x Composite Device
10c5 Sanei Electric, Inc.
819a FM Radio
@@ -12276,6 +12411,7 @@
6870 MC8780 Device
6871 MC8781 Device
6893 MC8777 Device
+ 68a3 MC8700 Modem
9000 Gobi 2000 Wireless Modem (QDL mode)
9001 Gobi 2000 Wireless Modem
9002 Gobi 2000 Wireless Modem
@@ -12362,6 +12498,7 @@
0010 Alta series CCD
125f A-DATA Technology Co., Ltd.
312a Superior S102
+ 312b Superior S102 Pro
a91a Portable HDD CH91
c81a Flash drive
c93a 4GB Pen Drive
@@ -12458,13 +12595,18 @@
1039 Ideos (tethering mode)
1406 E1750
140b EC1260 Wireless Data Modem HSD USB Card
- 1446 E1552/E1800 (HSPA modem)
+ 1446 E1552/E1800/E173 (HSPA modem)
+ 14f1 Gobi 3000 HSPA+ Modem
1501 Pulse
1505 E398 LTE/UMTS/GSM Modem/Networkcard
1506 E398 LTE/UMTS/GSM Modem/Networkcard
150a E398 LTE/UMTS/GSM Modem/Networkcard
1520 K3765 HSPA
1521 K4505 HSPA+
+ 1805 AT&T Go Phone U2800A phone
+ 1c05 E173s 3G broadband stick (modem on)
+ 1c0b E173s 3G broadband stick (modem off)
+ 1d50 ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
380b WiMAX USB modem(s)
12d2 LINE TECH INDUSTRIAL CO., LTD.
12d6 EMS Dr. Thomas Wuensche
@@ -12486,6 +12628,7 @@
1307 Transcend Information, Inc.
0163 256MB/512MB/1GB Flash Drive
0165 2GB/4GB Flash Drive
+ 0310 SD/MicroSD CardReader [hama]
0330 63-in-1 Multi-Card Reader/Writer
0361 CR-75: 51-in-1 Card Reader/Writer [Sakar]
1169 TS2GJF210 JetFlash 210 2GB
@@ -12595,7 +12738,7 @@
138e Jungo LTD
9000 Raisonance S.A. STM32 ARM evaluation board
1390 TOMTOM B.V.
- 0001 GO 520 T
+ 0001 GO 520 T/ONE XL (v9)
1391 IdealTEK, Inc.
1000 URTC-1000
1395 Sennheiser Communications
@@ -12789,6 +12932,7 @@
013f Megapixel Auto Focus Webcam
0142 WB-6250X Webcam
015a WB-8300X 2MP Webcam
+ 0161 15901 802.11bg Wireless Adapter [Realtek RTL8187L]
0167 Widescreen 3MP Webcam
1460 Tatung Co.
9150 eHome Infrared Transceiver
@@ -12804,12 +12948,16 @@
e016 eHome Infrared Receiver
e017 eHome Infrared Receiver
e018 eHome Infrared Receiver
+ e02c Infrared Receiver
e03a eHome Infrared Receiver
e03c eHome Infrared Receiver
e03e Infrared Receiver [IR605A/Q]
147e Upek
1000 Biometric Touchchip/Touchstrip Fingerprint Sensor
+ 1001 TCS5B Fingerprint sensor
2016 Biometric Touchchip/Touchstrip Fingerprint Sensor
+ 3000 TCS1C EIM/Cypress Fingerprint sensor
+ 3001 TCS1C EIM/STM32 Fingerprint sensor
147f Hama GmbH & Co., KG
1482 Vaillant
1005 VRD PC-Interface
@@ -12832,11 +12980,14 @@
3070 RT2870/RT3070 Wireless Adapter
3071 RT3071 Wireless Adapter
3072 RT3072 Wireless Adapter
+ 3370 RT3370 Wireless Adapter
3572 RT3572 Wireless Adapter
3573 TEW-684UB
5370 RT5370 Wireless Adapter
9020 RT2500USB Wireless Adapter
9021 RT2501USB Wireless Adapter
+1491 Futronic Technology Co. Ltd.
+ 0020 FS81 Fingerprint Scanner Module
1497 Panstrong Company Ltd.
1498 Microtek International Inc.
a090 DVB-T Tuner
@@ -12855,14 +13006,14 @@
14b0 StarTech.com Ltd.
14b2 Ralink Technology, Corp.
3a93 Topcom 802.11bg Wireless Adapter [Atheros AR5523]
- 3a95 Toshiba WUS-G06G-JT 802.11bg Wireless Adapter
+ 3a95 Toshiba WUS-G06G-JT 802.11bg Wireless Adapter [Atheros AR5523]
3a98 Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523]
- 3c02 rt2500 802.11g WLAN
+ 3c02 Conceptronic C54RU v2 802.11bg Wireless Adapter [Ralink RT2571]
3c05 rt2570 802.11g WLAN
3c06 Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870]
3c07 802.11n adapter
3c09 802.11n adapter
- 3c22 Conceptronic C54RU 802.11bg Wireless Adapter [Ralink RT73]
+ 3c22 Conceptronic C54RU v3 802.11bg Wireless Adapter [Ralink RT2571W]
3c23 Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870]
3c24 NEC NP01LM 802.11abg Wireless Adapter [Ralink RT2571W]
3c25 DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870]
@@ -12886,6 +13037,7 @@
8125 SD MMC Reader
14d8 JAMER INDUSTRIES CO., LTD.
14dd Raritan Computer, Inc.
+ 1007 D2CIM-VUSB KVM connector
14e1 Dialogue Technology Corp.
5000 PenMount 5000 Touch Controller
14e5 SAIN Information & Communications Co., Ltd.
@@ -12940,6 +13092,7 @@
0001 RZ01-020300 Optical Mouse [Diamondback]
0003 Krait Mouse
0007 DeathAdder Mouse
+ 0016 DeathAdder Mouse
0017 Imperator Mouse
001c RZ01-0036 Optical Gaming Mouse [Abyssus]
0101 Copperhead Mouse
@@ -13042,6 +13195,7 @@
0a37 Mouse
0a41 MI-2540D [Optical mouse]
0a4c USB+PS/2 Optical Mouse
+ 0a4d Optical Mouse
15dc Hynix Semiconductor Inc.
15e0 Seong Ji Industrial Co., Ltd.
15e1 RSA
@@ -13317,6 +13471,22 @@
03f1 free for internal lab use 1009
0477 Teensy Rebootor
0478 Teensy Halfkay Bootloader
+ 0479 Teensy Debug
+ 047a Teensy Serial
+ 047b Teensy Serial+Debug
+ 047c Teensy Keyboard
+ 047d Teensy Keyboard+Debug
+ 047e Teensy Mouse
+ 047f Teensy Mouse+Debug
+ 0480 Teensy RawHID
+ 0481 Teensy RawHID+Debug
+ 0482 Teensyduino Keyboard+Mouse+Joystick
+ 0483 Teensyduino Serial
+ 0484 Teensyduino Disk
+ 0485 Teensyduino MIDI
+ 0486 Teensyduino RawHID
+ 0487 Teensyduino Serial+Keyboard+Mouse+Joystick
+ 0488 Teensyduino Flight Sim Controls
05dc shared ID for use with libusb
05dd BlackcatUSB2
05e1 CDC-ACM class devices (modems)
@@ -13363,6 +13533,7 @@
000b VM
16df King Billion Electronics Co., Ltd.
16f0 GN ReSound A/S
+ 0001 Speedlink Programming Interface
0003 Airlink Wireless Programming Interface
16f5 Futurelogic Inc.
1706 BlueView Technologies, Inc.
@@ -13416,6 +13587,7 @@
5106 Transcend StoreJet 25M3
174f Syntek
1105 SM-MS/Pro-MMC-XD Card Reader
+ 110b HP Webcam
1403 Integrated Webcam
1404 USB Camera device, 1.3 MPixel Web Cam
5212 USB 2.0 UVC PC Camera
@@ -13449,6 +13621,8 @@
083e MetaGeek Wi-Spy
083f MetaGeek Wi-Spy 2.4x
0938 Iguanaworks USB IR Transceiver
+ 0c30 Telldus TellStick
+ 0c31 Telldus TellStick Duo
0c9f USBtiny
1782 Spreadtrum Communications Inc.
1784 TopSeed Technology Corp.
@@ -13508,9 +13682,15 @@
17cf Hip Hing Cable & Plug Mfy. Ltd.
17d0 Sanford L.P.
17d3 Korea Techtron Co., Ltd.
-17e9 Newnham Research
+17e9 DisplayLink
0051 USB VGA Adaptor
+ 0377 Plugable UD-160-A (M)
+ 0378 Plugable UGA-2K-A
+ 0379 Plugable UGA-125
+ 037a Plugable UGA-165
+ 037b Plugable USB-VGA-165
037c Plugable DC-125
+ 037d Plugable USB2-HDMI-165
17eb Cornice, Inc.
17ef Lenovo
1003 Integrated Smart Card Reader
@@ -13530,6 +13710,7 @@
4814 Integrated Webcam [R5U877]
4815 Integrated Webcam [R5U877]
481c Integrated Webcam
+ 481d Integrated Webcam
6007 Smartcard Keyboard
6009 ThinkPad Keyboard with TrackPoint
6014 Mini Wireless Keyboard N5901
@@ -13585,6 +13766,7 @@
0216 External Hard Drive
0218 External Hard Drive
0227 Pocket Hard Drive
+ 0237 Portable Harddrive (500 GB)
18b1 Petalynx
0037 Maxter Remote Control
18b4 e3C Technologies
@@ -13689,7 +13871,7 @@
a253 Model 2253 Audio/Video Codec Card (cold)
1949 Lab126
0002 Amazon Kindle
- 0004 Amazon Kindle 3
+ 0004 Amazon Kindle 3/4
1951 Hyperstone AG
1953 Ironkey Inc.
1954 Radiient Technologies
@@ -13747,6 +13929,7 @@
0083 MF190
0103 MF112
0172 AX226 WIMAX MODEM (After Modeswitch)
+ 1203 MF691 [ T-Mobile webConnect Rocket 2.0]
2000 MF627/MF628/MF628+/MF636+ HSDPA/HSUPA
fff2 Gobi Wireless Modem (QDL mode)
fff3 Gobi Wireless Modem
@@ -13773,7 +13956,7 @@
1a36 Biwin Technology Ltd.
1a40 Terminus Technology Inc.
0101 4-Port HUB
- 0201 Hub
+ 0201 FE 2.1 7-port Hub
1a41 Action Electronics Co., Ltd.
1a44 VASCO Data Security International
0001 Digipass 905 SmartCard Reader
@@ -13814,6 +13997,8 @@
0588 DS1000 SERIES
1acb Salcomp Plc
1ad1 Desay Wire Co., Ltd.
+1ad4 APS
+ 0002 KM290-HRS
1adb SEL C662 Serial Cable
1ae4 ic-design Reinhard Gottinger GmbH
1ae7 X-TENSIONS
@@ -13950,7 +14135,7 @@
1b75 Ovislink Corp.
3072 AirLive WN-360USB adapter
8187 AirLive WL-1600USB 802.11g Adapter [Realtek RTL8187L]
- 9170 Airlive X.USB [AR9170]
+ 9170 AirLive X.USB 802.11abgn [Atheros AR9170+AR9104]
a200 AirLive WN-200USB wireless 11b/g/n dongle
1b76 Legend Silicon Corp.
1b80 Afatech
@@ -13960,6 +14145,7 @@
d397 DVB-T receiver [RTL2832U]
d398 DVB-T receiver [RTL2832U]
d700 FM Radio SnapMusic Mobile 700 (FM700)
+ e297 Conceptronic DVB-T CTVDIGRCU V3.0
e383 DVB-T UB383-T [af9015]
e385 DVB-T UB385-T [af9015]
e386 DVB-T UB385-T [af9015]
@@ -13997,7 +14183,7 @@
053a Targa Silvercrest OMC807-C optische Funkmaus
05c5 SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]
05cf Micro keyboard & mouse receiver
- 0c31 Serial-ATA bridge
+ 0c31 SPIF30x Serial-ATA bridge
1bd0 Hangzhou Riyue Electronic Co., Ltd.
1bd5 BG Systems, Inc.
1bde P-TWO INDUSTRIES, INC.
@@ -14084,6 +14270,8 @@
1ce1 Amphenol KAE
1cfc ANDES TECHNOLOGY CORPORATION
1cfd Flextronics Digital Design Japan, LTD.
+1d03 iCON
+ 0028 iCreativ MIDI Controller
1d07 Solid-Motion
1d08 NINGBO HENTEK DRAGON ELECTRONICS CO., LTD.
1d09 TechFaith Wireless Technology Limited
@@ -14107,6 +14295,15 @@
000e Ralink RT3070 802.11b/g/n Wireless Lan USB Device
1d50 OpenMoko, Inc.
5119 GTA01/GTA02 U-Boot Bootloader
+1d57 Xenta
+ 0005 Wireless Receiver (Keyboard and Mouse)
+ 0006 Wireless Receiver (RC Laser Pointer)
+ 000c Optical Mouse
+ 2400 Wireless Mouse Receiver
+ 32da 2.4GHz Receiver (Keyboard and Mouse)
+ 83d0 Click-mouse!
+ ac01 Wireless Receiver (Keyboard and Mouse)
+ af01 AUVIO Universal Remote Receiver for PlayStation 3
1d5b Smartronix, Inc.
1d6b Linux Foundation
0001 1.1 root hub
@@ -14119,6 +14316,9 @@
0104 Multifunction Composite Gadget
0105 FunctionFS Gadget
0200 Qemu Audio Device
+1de1 Actions Microelectronics Co.
+ 1101 Generic Display Device (Mass storage mode)
+ c101 Generic Display Device
1e0e Qualcomm / Option
1e10 Point Grey Research, Inc.
2004 Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon]
@@ -14153,24 +14353,37 @@
1e71 NZXT
0001 Avatar Optical Mouse
1e74 Coby Electronics Corporation
+ 2211 MP300
+ 2659 Coby 4GB Go Video MP3 Player [MP620-4G]
+ 4641 A8705 MP3/Video Player
6511 MP705-8G MP3 player
6512 MP705-4G
1e7d ROCCAT
2c24 Pyra Mouse (wired)
2ced Kone Mouse
+ 2cf6 Pyra Mouse (wireless)
+ 2d50 Kova+ Mouse
2d51 Kone+ Mouse
30d4 Arvo Keyboard
1ebb NuCORE Technology, Inc.
1eda AirTies Wireless Networks
- 2310 802.11n USB Wireless LAN Card
+ 2012 Air2210 54 Mbps Wireless Adapter
+ 2210 Air2210 54 Mbps Wireless Adapter
+ 2310 Air2310 150 Mbps Wireless Adapter
+ 2410 Air2410 300 Mbps Wireless Adapter
1edb Blackmagic design
bd3b Intensity Shuttle
1ee8 ONDA COMMUNICATION S.p.a.
0014 MT833UP
1ef6 EADS Deutschland GmbH
+ 5064 FDR Interface
+ 5648 RIU CSMU/BSD
+ 564a Cassidian RIU CSMU/BSD Simulator
1f28 Cal-Comp
0020 CDMA USB Modem A600
0021 CD INSTALLER USB Device
+1f44 The Neat Company
+ 0001 NM-1000 scanner
1f4d G-Tek Electronics Group
b803 Lifeview LV5TDLX DVB-T [RTL2832U]
1f82 TANDBERG
@@ -14178,9 +14391,14 @@
1f84 Alere, Inc.
1f87 Stantum
0002 Multi-touch HID Controller
+1f9b Ubiquiti Networks, Inc.
+ 0241 AirView2-EXT
1fbd Delphin Technology AG
0001 Expert Key - Data aquisition system
1fc9 NXP Semiconductors
+ 010b PR533
+1fde ILX Lightwave Corporation
+ 0001 UART Bridge
1fe7 Vertex Wireless Co., Ltd.
1000 VW100 series CDMA EV-DO Rev.A modem
2001 D-Link Corp.
@@ -14190,11 +14408,15 @@
200c 10/100 Ethernet
3200 DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a]
3301 DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U]
+ 3306 DWL-G122 Wireless Adapter(rev.F1) [Realtek RTL8188SU]
+ 3308 DWA-121 802.11n Wireless N 150 Pico Adapter [Realtek RTL8188CUS]
+ 3309 DWA-135 802.11n Wireless N Adapter(rev.A1) [Realtek RTL8192CU]
+ 330a DWA-133 802.11n Wireless N Adapter [Realtek RTL8192CU]
3500 Elitegroup Computer Systems WLAN card WL-162
3700 DWL-122 802.11b [Intersil Prism 3]
3701 DWL-G120 Spinnaker 802.11g [Intersil ISL3886]
3702 DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871]
- 3703 AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886]
+ 3703 AirPlus G DWL-G122 Wireless Adapter(rev.A1) [Intersil ISL3880]
3704 AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887]
3705 AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887]
3761 IEEE 802.11g USB2.0 Wireless Network Adapter-PN
@@ -14210,10 +14432,11 @@
3a83 predator Bootloader Download
3b00 AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB]
3b01 WLAN Boot Device
- 3c00 AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB]
+ 3c00 AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2571]
3c01 AirPlus AG DWL-AG122 Wireless Adapter
3c02 AirPlus G DWL-G122 Wireless Adapter
3c05 DUB-E100 Fast Ethernet [asix]
+ 3c19 DWA-125 Wireless N 150 Adapter(rev.A3) [Ralink RT5370]
4000 DSB-650C Ethernet [klsi]
4001 DSB-650TX Ethernet [pegasus]
4002 DSB-650TX Ethernet [pegasus]
@@ -14235,12 +14458,15 @@
f116 Formosa 2
f117 Formosa 3
f118 Formosa 4
-2013 Unknown (Pinnacle?)
+2002 DAP Technologies
+2013 PCTV Systems
0245 PCTV 73ESE
0246 PCTV 74E
0248 PCTV 282E
+ 024f nanoStick T2 290e
2019 PLANEX
3220 GW-US11S WLAN [Atmel AT76C503A]
+ 4903 GW-USFang300 802.11abgn Wireless Adapter [Realtek RTL8192DU]
5303 GW-US54GXS 802.11bg
5304 GWUS300 802.11n
ab01 GW-US54HP
@@ -14248,14 +14474,16 @@
ab25 GW-USMini2N 802.11n Wireless Adapter [Ralink RT2870]
ab28 GW-USNano
ab29 GW-USMicro300
+ ab2a GW-USNano2 802.11n Wireless Adapter [Realtek RTL8188CUS]
+ ab2c GW-USDual300 802.11abgn Wireless Adapter [Realtek RTL8192DU]
ab50 GW-US54Mini2
c002 GW-US54SG
c007 GW-US54GZL
ed02 GW-USMM
- ed06 802.11n Wireless LAN Adapter
+ ed06 GW-US300MiniW 802.11bgn Wireless Adapter
ed10 GW-US300Mini2
ed14 GW-USMicroN
- ed17 GW-USValue-EZ
+ ed17 GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS]
2040 Hauppauge
0c80 Windham
0c90 Windham
@@ -14271,6 +14499,7 @@
2400 WinTV PVR USB2 (Model 24019)
4700 WinTV Nova-S-USB2
4902 HD PVR
+ 4903 HS PVR
4982 HD PVR
5500 Windham
5510 Windham
@@ -14301,12 +14530,18 @@
2080 Barnes & Noble
0001 nook
0002 NOOKcolor
+ 0003 NOOK Simple Touch
+ 0004 NOOK Tablet
2087 Cando
0a01 Multi Touch Panel
0a02 Multi Touch Panel
0b03 Multi Touch Panel
20a0 Clay Logic
+ 4123 IKALOGIC SCANALOGIC 2
414a MDE SPI Interface
+ 415a OpenPilot
+ 415b CopterControl
+ 415c PipXtreme
20b1 XMOS Ltd
10ad XUSB Loader
f7d1 XTAG2 - JTAG Adapter
@@ -14321,6 +14556,8 @@
cb72 ben-wpan, cntr
20df Simtec Electronics
0001 Entropy Key [UDEKEY01]
+20f4 TRENDnet
+ 648b TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
2101 ActionStar
0201 SIIG 4-to-2 Printer Switch
2162 Creative (?)
@@ -14486,6 +14723,15 @@
061e PCTV Deluxe (PAL) Device
2318 Shining Technologies, Inc. [hex]
0011 CitiDISK Jr. IDE Enclosure
+2341 Arduino SA
+ 0001 Uno (CDC ACM)
+ 0010 Mega 2560 (CDC ACM)
+ 003b Serial Adapter (CDC ACM)
+ 003f Mega ADK (CDC ACM)
+ 0042 Mega 2560 R3 (CDC ACM)
+ 0043 Uno R3 (CDC ACM)
+ 0044 Mega ADK R3 (CDC ACM)
+ 0045 Serial R3 (CDC ACM)
2373 Pumatronix Ltda
0001 5 MegaPixel Digital Still Camera [DSC5M]
2375 Digit@lway, Inc.
@@ -14497,6 +14743,8 @@
2632 TwinMOS
3209 7-in-1 Card Reader
2650 Electronics For Imaging, Inc. [hex]
+2659 Sundtek
+ 1101 TNT DVB-T/DAB/DAB+/FM
2730 Citizen
200f CT-S310 Label printer
2735 DigitalWay
diff --git a/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch b/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
new file mode 100644
index 0000000..9c874c8
--- /dev/null
+++ b/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
@@ -0,0 +1,452 @@
+diff -Naur Pound-2.6.orig/config.c Pound-2.6.reneg-ciphers-altnames-nosslv2/config.c
+--- Pound-2.6.orig/config.c 2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/config.c 2012-02-15 21:49:39.000000000 +0100
+@@ -31,6 +31,8 @@
+
+ #include "pound.h"
+
++#include <openssl/x509v3.h>
++
+ #ifdef MISS_FACILITYNAMES
+
+ /* This is lifted verbatim from the Linux sys/syslog.h */
+@@ -76,7 +78,7 @@
+ static regex_t Err414, Err500, Err501, Err503, MaxRequest, HeadRemove, RewriteLocation, RewriteDestination;
+ static regex_t Service, ServiceName, URL, HeadRequire, HeadDeny, BackEnd, Emergency, Priority, HAport, HAportAddr;
+ static regex_t Redirect, RedirectN, TimeOut, Session, Type, TTL, ID, DynScale;
+-static regex_t ClientCert, AddHeader, Ciphers, CAlist, VerifyList, CRLlist, NoHTTPS11;
++static regex_t ClientCert, AddHeader, DisableSSLv2, SSLAllowClientRenegotiation, SSLHonorCipherOrder, Ciphers, CAlist, VerifyList, CRLlist, NoHTTPS11;
+ static regex_t Grace, Include, ConnTO, IgnoreCase, HTTPS, HTTPSCert, Disabled, Threads, CNName;
+
+ static regmatch_t matches[5];
+@@ -167,6 +169,53 @@
+ }
+ }
+
++unsigned char **
++get_subjectaltnames(X509 *x509, unsigned int *count)
++{
++ *count = 0;
++ unsigned int local_count = 0;
++ unsigned char **result = NULL;
++
++ STACK_OF(GENERAL_NAME) *san_stack = (STACK_OF(GENERAL_NAME)*)X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL);
++
++ unsigned char *temp[sk_GENERAL_NAME_num(san_stack)];
++
++ GENERAL_NAME *name = NULL;
++ while(sk_GENERAL_NAME_num(san_stack) > 0)
++ {
++ name = sk_GENERAL_NAME_pop(san_stack);
++
++ switch(name->type)
++ {
++ case GEN_DNS:
++ temp[local_count] = strndup(ASN1_STRING_data(name->d.dNSName), ASN1_STRING_length(name->d.dNSName)+1);
++ if(temp[local_count] == NULL) { conf_err("out of memory"); }
++ local_count++;
++ break;
++ default:
++ logmsg(LOG_INFO, "unsupported subjectAltName type encountered: %i", name->type);
++ }
++
++ GENERAL_NAME_free(name);
++ }
++
++ result = (unsigned char**)malloc(sizeof(unsigned char*)*local_count);
++ if(result == NULL) { conf_err("out of memory"); }
++ int i;
++ for(i = 0;i < local_count; i++)
++ {
++ result[i] = strndup(temp[i], strlen(temp[i])+1);
++ if(result[i] == NULL) { conf_err("out of memory"); }
++
++ free(temp[i]);
++ }
++ *count = local_count;
++
++ sk_GENERAL_NAME_pop_free(san_stack, GENERAL_NAME_free);
++
++ return result;
++}
++
+ /*
+ * parse a back-end
+ */
+@@ -289,9 +338,12 @@
+ } else if(!regexec(&HTTPS, lin, 4, matches, 0)) {
+ if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
+ conf_err("SSL_CTX_new failed - aborted");
++ SSL_CTX_set_app_data(res->ctx, res);
+ SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);
+ SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);
+ SSL_CTX_set_options(res->ctx, SSL_OP_ALL);
++ SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
++ SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);
+ sprintf(lin, "%d-Pound-%ld", getpid(), random());
+ SSL_CTX_set_session_id_context(res->ctx, (unsigned char *)lin, strlen(lin));
+ SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback);
+@@ -299,6 +351,7 @@
+ } else if(!regexec(&HTTPSCert, lin, 4, matches, 0)) {
+ if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
+ conf_err("SSL_CTX_new failed - aborted");
++ SSL_CTX_set_app_data(res->ctx, res);
+ lin[matches[1].rm_eo] = '\0';
+ if(SSL_CTX_use_certificate_chain_file(res->ctx, lin + matches[1].rm_so) != 1)
+ conf_err("SSL_CTX_use_certificate_chain_file failed - aborted");
+@@ -309,6 +362,8 @@
+ SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);
+ SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);
+ SSL_CTX_set_options(res->ctx, SSL_OP_ALL);
++ SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
++ SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);
+ sprintf(lin, "%d-Pound-%ld", getpid(), random());
+ SSL_CTX_set_session_id_context(res->ctx, (unsigned char *)lin, strlen(lin));
+ SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback);
+@@ -805,13 +860,23 @@
+ /* logmsg(LOG_DEBUG, "Received SSL SNI Header for servername %s", servername); */
+
+ SSL_set_SSL_CTX(ssl, NULL);
+- for(pc = ctx; pc; pc = pc->next)
++ for(pc = ctx; pc; pc = pc->next) {
+ if(fnmatch(pc->server_name, server_name, 0) == 0) {
+ /* logmsg(LOG_DEBUG, "Found cert for %s", servername); */
+ SSL_set_SSL_CTX(ssl, pc->ctx);
+ return SSL_TLSEXT_ERR_OK;
+ }
+-
++ else if(pc->subjectAltNameCount > 0 && pc->subjectAltNames != NULL) {
++ int i;
++ for(i = 0; i < pc->subjectAltNameCount; i++) {
++ if(fnmatch(pc->subjectAltNames[i], server_name, 0) == 0) {
++ SSL_set_SSL_CTX(ssl, pc->ctx);
++ return SSL_TLSEXT_ERR_OK;
++ }
++ }
++ }
++ }
++
+ /* logmsg(LOG_DEBUG, "No match for %s, default used", server_name); */
+ SSL_set_SSL_CTX(ssl, ctx->ctx);
+ return SSL_TLSEXT_ERR_OK;
+@@ -829,11 +894,15 @@
+ SERVICE *svc;
+ MATCHER *m;
+ int has_addr, has_port, has_other;
++ long ssl_op_enable, ssl_op_disable;
+ struct hostent *host;
+ struct sockaddr_in in;
+ struct sockaddr_in6 in6;
+ POUND_CTX *pc;
+
++ ssl_op_enable = SSL_OP_ALL;
++ ssl_op_disable = SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION | SSL_OP_LEGACY_SERVER_CONNECT;
++
+ if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL)
+ conf_err("ListenHTTPS config: out of memory - aborted");
+ memset(res, 0, sizeof(LISTENER));
+@@ -844,6 +913,8 @@
+ res->err500 = "An internal server error occurred. Please try again later.";
+ res->err501 = "This method may not be used.";
+ res->err503 = "The service is not available. Please try again later.";
++ res->allow_client_reneg = 0;
++ res->disable_ssl_v2 = 0;
+ res->log_level = log_level;
+ if(regcomp(&res->verb, xhttp[0], REG_ICASE | REG_NEWLINE | REG_EXTENDED))
+ conf_err("xHTTP bad default pattern - aborted");
+@@ -959,6 +1030,9 @@
+ fclose(fcert);
+ memset(server_name, '\0', MAXBUF);
+ X509_NAME_oneline(X509_get_subject_name(x509), server_name, MAXBUF - 1);
++ pc->subjectAltNameCount = 0;
++ pc->subjectAltNames = NULL;
++ pc->subjectAltNames = get_subjectaltnames(x509, &(pc->subjectAltNameCount));
+ X509_free(x509);
+ if(!regexec(&CNName, server_name, 4, matches, 0)) {
+ server_name[matches[1].rm_eo] = '\0';
+@@ -1029,6 +1103,25 @@
+ strcat(res->add_head, "\r\n");
+ strcat(res->add_head, lin + matches[1].rm_so);
+ }
++ } else if(!regexec(&DisableSSLv2, lin, 4, matches, 0)) {
++ res->disable_ssl_v2 = 1;
++ } else if(!regexec(&SSLAllowClientRenegotiation, lin, 4, matches, 0)) {
++ res->allow_client_reneg = atoi(lin + matches[1].rm_so);
++ if (res->allow_client_reneg == 2) {
++ ssl_op_enable |= SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++ ssl_op_disable &= ~SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++ } else {
++ ssl_op_disable |= SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++ ssl_op_enable &= ~SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++ }
++ } else if(!regexec(&SSLHonorCipherOrder, lin, 4, matches, 0)) {
++ if (atoi(lin + matches[1].rm_so)) {
++ ssl_op_enable |= SSL_OP_CIPHER_SERVER_PREFERENCE;
++ ssl_op_disable &= ~SSL_OP_CIPHER_SERVER_PREFERENCE;
++ } else {
++ ssl_op_disable |= SSL_OP_CIPHER_SERVER_PREFERENCE;
++ ssl_op_enable &= ~SSL_OP_CIPHER_SERVER_PREFERENCE;
++ }
+ } else if(!regexec(&Ciphers, lin, 4, matches, 0)) {
+ has_other = 1;
+ if(res->ctx == NULL)
+@@ -1105,12 +1198,19 @@
+ conf_err("ListenHTTPS: can't set SNI callback");
+ #endif
+ for(pc = res->ctx; pc; pc = pc->next) {
++ SSL_CTX_set_app_data(pc->ctx, res);
+ SSL_CTX_set_mode(pc->ctx, SSL_MODE_AUTO_RETRY);
+- SSL_CTX_set_options(pc->ctx, SSL_OP_ALL);
++ SSL_CTX_set_options(pc->ctx, ssl_op_enable);
++ SSL_CTX_clear_options(pc->ctx, ssl_op_disable);
++ if (res->disable_ssl_v2 == 1)
++ {
++ SSL_CTX_set_options(pc->ctx, SSL_OP_NO_SSLv2);
++ }
+ sprintf(lin, "%d-Pound-%ld", getpid(), random());
+ SSL_CTX_set_session_id_context(pc->ctx, (unsigned char *)lin, strlen(lin));
+ SSL_CTX_set_tmp_rsa_callback(pc->ctx, RSA_tmp_callback);
+ SSL_CTX_set_tmp_dh_callback(pc->ctx, DH_tmp_callback);
++ SSL_CTX_set_info_callback(pc->ctx, SSLINFO_callback);
+ }
+ return res;
+ } else {
+@@ -1305,6 +1405,9 @@
+ || regcomp(&DynScale, "^[ \t]*DynScale[ \t]+([01])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+ || regcomp(&ClientCert, "^[ \t]*ClientCert[ \t]+([0-3])[ \t]+([1-9])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+ || regcomp(&AddHeader, "^[ \t]*AddHeader[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
++ || regcomp(&SSLAllowClientRenegotiation, "^[ \t]*SSLAllowClientRenegotiation[ \t]+([012])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
++ || regcomp(&DisableSSLv2, "^[ \t]*DisableSSLv2[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
++ || regcomp(&SSLHonorCipherOrder, "^[ \t]*SSLHonorCipherOrder[ \t]+([01])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+ || regcomp(&Ciphers, "^[ \t]*Ciphers[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+ || regcomp(&CAlist, "^[ \t]*CAlist[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+ || regcomp(&VerifyList, "^[ \t]*VerifyList[ \t]+\"(.+)\"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+@@ -1463,6 +1566,9 @@
+ regfree(&DynScale);
+ regfree(&ClientCert);
+ regfree(&AddHeader);
++ regfree(&SSLAllowClientRenegotiation);
++ regfree(&DisableSSLv2);
++ regfree(&SSLHonorCipherOrder);
+ regfree(&Ciphers);
+ regfree(&CAlist);
+ regfree(&VerifyList);
+diff -Naur Pound-2.6.orig/http.c Pound-2.6.reneg-ciphers-altnames-nosslv2/http.c
+--- Pound-2.6.orig/http.c 2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/http.c 2012-02-15 21:44:46.000000000 +0100
+@@ -246,6 +246,11 @@
+
+ static int err_to = -1;
+
++typedef struct {
++ int timeout;
++ RENEG_STATE *reneg_state;
++} BIO_ARG;
++
+ /*
+ * Time-out for client read/gets
+ * the SSL manual says not to do it, but it works well enough anyway...
+@@ -253,18 +258,32 @@
+ static long
+ bio_callback(BIO *const bio, const int cmd, const char *argp, int argi, long argl, long ret)
+ {
++ BIO_ARG *bio_arg;
+ struct pollfd p;
+ int to, p_res, p_err;
+
+ if(cmd != BIO_CB_READ && cmd != BIO_CB_WRITE)
+ return ret;
+
++ //logmsg(LOG_NOTICE, "bio callback");
+ /* a time-out already occured */
+- if((to = *((int *)BIO_get_callback_arg(bio)) * 1000) < 0) {
++ if((bio_arg = (BIO_ARG*)BIO_get_callback_arg(bio))==NULL) return ret;
++ if((to = bio_arg->timeout * 1000) < 0) {
+ errno = ETIMEDOUT;
+ return -1;
+ }
+
++ /* Renegotiations */
++ //logmsg(LOG_NOTICE, "RENEG STATE %d", bio_arg->reneg_state==NULL?-1:*bio_arg->reneg_state);
++ if (bio_arg->reneg_state != NULL && *bio_arg->reneg_state == RENEG_ABORT) {
++ logmsg(LOG_NOTICE, "REJECTING renegotiated session");
++ errno = ECONNABORTED;
++ return -1;
++ }
++
++ //logmsg(LOG_NOTICE, "TO %d", to);
++ if (to == 0) return ret;
++
+ for(;;) {
+ memset(&p, 0, sizeof(p));
+ BIO_get_fd(bio, &p.fd);
+@@ -299,7 +318,7 @@
+ return -1;
+ case 0:
+ /* timeout - mark the BIO as unusable for the future */
+- BIO_set_callback_arg(bio, (char *)&err_to);
++ bio_arg->timeout = err_to;
+ #ifdef EBUG
+ logmsg(LOG_WARNING, "(%lx) CALLBACK timeout poll after %d secs: %s",
+ pthread_self(), to / 1000, strerror(p_err));
+@@ -503,7 +522,14 @@
+ regmatch_t matches[4];
+ struct linger l;
+ double start_req, end_req;
++ RENEG_STATE reneg_state;
++ BIO_ARG ba1, ba2;
+
++ reneg_state = RENEG_INIT;
++ ba1.reneg_state = &reneg_state;
++ ba2.reneg_state = &reneg_state;
++ ba1.timeout = 0;
++ ba2.timeout = 0;
+ from_host = ((thr_arg *)arg)->from_host;
+ memcpy(&from_host_addr, from_host.ai_addr, from_host.ai_addrlen);
+ from_host.ai_addr = (struct sockaddr *)&from_host_addr;
+@@ -512,6 +538,8 @@
+ free(((thr_arg *)arg)->from_host.ai_addr);
+ free(arg);
+
++ if(lstn->allow_client_reneg) reneg_state = RENEG_ALLOW;
++
+ n = 1;
+ setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&n, sizeof(n));
+ l.l_onoff = 1;
+@@ -535,10 +563,11 @@
+ close(sock);
+ return;
+ }
+- if(lstn->to > 0) {
+- BIO_set_callback_arg(cl, (char *)&lstn->to);
++ //if(lstn->to > 0) {
++ ba1.timeout = lstn->to;
++ BIO_set_callback_arg(cl, (char *)&ba1);
+ BIO_set_callback(cl, bio_callback);
+- }
++ //}
+
+ if(lstn->ctx != NULL) {
+ if((ssl = SSL_new(lstn->ctx->ctx)) == NULL) {
+@@ -547,6 +576,7 @@
+ BIO_free_all(cl);
+ return;
+ }
++ SSL_set_app_data(ssl, &reneg_state);
+ SSL_set_bio(ssl, cl, cl);
+ if((bb = BIO_new(BIO_f_ssl())) == NULL) {
+ logmsg(LOG_WARNING, "(%lx) BIO_new(Bio_f_ssl()) failed", pthread_self());
+@@ -848,7 +878,8 @@
+ }
+ BIO_set_close(be, BIO_CLOSE);
+ if(backend->to > 0) {
+- BIO_set_callback_arg(be, (char *)&backend->to);
++ ba2.timeout = backend->to;
++ BIO_set_callback_arg(be, (char *)&ba2);
+ BIO_set_callback(be, bio_callback);
+ }
+ if(backend->ctx != NULL) {
+diff -Naur Pound-2.6.orig/pound.8 Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.8
+--- Pound-2.6.orig/pound.8 2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.8 2012-02-15 21:44:46.000000000 +0100
+@@ -501,6 +501,19 @@
+ and
+ .I SSL_CTX_set_cipher_list(3).
+ .TP
++\fBSSLHonorCipherOrder\fR 0|1
++If this value is 1, the server will broadcast a preference to use \fBCiphers\fR in the
++order supplied in the \fBCiphers\fR directive. If the value is 0, the server will treat
++the Ciphers list as the list of Ciphers it will accept, but no preference will be
++indicated. Default value is 0.
++.TP
++\fBSSLAllowClientRenegotiation\fR 0|1|2
++If this value is 0, client initiated renegotiation will be disabled. This will mitigate
++DoS exploits based on client renegotiation, regardless of the patch status of clients and
++servers related to "Secure renegotiation". If the value is 1, secure renegotiation is
++supported. If the value is 2, insecure renegotiation is supported, with unpatched
++clients. /fBThis can lead to a DoS and a Man in the Middle attack!/fR Default value is 0.
++.TP
+ \fBCAlist\fR "CAcert_file"
+ Set the list of "trusted" CA's for this server. The CAcert_file is a file containing
+ a sequence of CA certificates (PEM format). The names of the defined CA certificates
+diff -Naur Pound-2.6.orig/pound.h Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.h
+--- Pound-2.6.orig/pound.h 2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.h 2012-02-15 21:49:39.000000000 +0100
+@@ -380,6 +380,8 @@
+ SSL_CTX *ctx;
+ char *server_name;
+ struct _pound_ctx *next;
++ unsigned int subjectAltNameCount;
++ unsigned char **subjectAltNames;
+ } POUND_CTX;
+
+ /* Listener definition */
+@@ -404,6 +406,8 @@
+ int rewr_dest; /* rewrite destination header */
+ int disabled; /* true if the listener is disabled */
+ int log_level; /* log level for this listener */
++ int allow_client_reneg; /* Allow Client SSL Renegotiation */
++ int disable_ssl_v2; /* Disable SSL version 2 */
+ SERVICE *services;
+ struct _listener *next;
+ } LISTENER;
+@@ -419,6 +423,9 @@
+ struct _thr_arg *next;
+ } thr_arg; /* argument to processing threads: socket, origin */
+
++/* Track SSL handshare/renegotiation so we can reject client-renegotiations. */
++typedef enum { RENEG_INIT=0, RENEG_REJECT, RENEG_ALLOW, RENEG_ABORT } RENEG_STATE;
++
+ /* Header types */
+ #define HEADER_ILLEGAL -1
+ #define HEADER_OTHER 0
+@@ -591,6 +598,11 @@
+ extern DH *DH_tmp_callback(SSL *, int, int);
+
+ /*
++ * Renegotiation callback
++ */
++extern void SSLINFO_callback(const SSL *s, int where, int rc);
++
++/*
+ * expiration stuff
+ */
+ #ifndef EXPIRE_TO
+diff -Naur Pound-2.6.orig/svc.c Pound-2.6.reneg-ciphers-altnames-nosslv2/svc.c
+--- Pound-2.6.orig/svc.c 2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/svc.c 2012-02-15 21:44:46.000000000 +0100
+@@ -1797,3 +1797,34 @@
+ close(ctl);
+ }
+ }
++
++void
++SSLINFO_callback(const SSL *ssl, int where, int rc)
++{
++ RENEG_STATE *reneg_state;
++
++ /* Get our thr_arg where we're tracking this connection info */
++ if ((reneg_state = (RENEG_STATE *)SSL_get_app_data(ssl)) == NULL) return;
++
++ /* If we're rejecting renegotiations, move to ABORT if Client Hello is being read. */
++ if ((where & SSL_CB_ACCEPT_LOOP) && *reneg_state == RENEG_REJECT) {
++ int state = SSL_get_state(ssl);
++
++ if (state == SSL3_ST_SR_CLNT_HELLO_A || state == SSL23_ST_SR_CLNT_HELLO_A) {
++ *reneg_state = RENEG_ABORT;
++ logmsg(LOG_WARNING,"rejecting client initiated renegotiation");
++ }
++ }
++ else if (where & SSL_CB_HANDSHAKE_DONE && *reneg_state == RENEG_INIT) {
++ // Reject any followup renegotiations
++ *reneg_state = RENEG_REJECT;
++ }
++
++ //if (where & SSL_CB_HANDSHAKE_START) logmsg(LOG_DEBUG, "handshake start");
++ //else if (where & SSL_CB_HANDSHAKE_DONE) logmsg(LOG_DEBUG, "handshake done");
++ //else if (where & SSL_CB_LOOP) logmsg(LOG_DEBUG, "loop");
++ //else if (where & SSL_CB_READ) logmsg(LOG_DEBUG, "read");
++ //else if (where & SSL_CB_WRITE) logmsg(LOG_DEBUG, "write");
++ //else if (where & SSL_CB_ALERT) logmsg(LOG_DEBUG, "alert");
++}
++
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fdec4318350a85de39a2bef8a0ea32fdb89d8cab
by git＠ipfire.org 09 Apr '12
by git＠ipfire.org 09 Apr '12
09 Apr '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 fdec4318350a85de39a2bef8a0ea32fdb89d8cab (commit)
via 6560ecaa51f5493aa5674825d1d1b7bc9e464184 (commit)
via 5cbbd5f1ed37c0c465378916716319d63234a294 (commit)
via 8969d075e06a687b8878e9ed1b41133a0f015b05 (commit)
via b7d1e1c4a4ce1bfc1cf87dd5f305110fc009df29 (commit)
via 2d40b8174bb5c7e7f9424439e622c936de87bfc5 (commit)
via 2c0a849f7a7c388bf53072e5fc335b4f97488ba0 (commit)
via f028065fd15c1984db770724bdfb35fa5e0635fa (commit)
via a4826680bc8a58f169327d97da60005dbdc47e0d (commit)
via 844d37795d6166d4017327b550804d47591b09f1 (commit)
via ef5d80c0336c2e484220906d35b75ae93984d57c (commit)
via 67ab1d620624ba3d02ffd94c80cbdb9d1872131c (commit)
via 25a063e66dd06b43685dcd6cc779a6ad71b125b6 (commit)
via 88511b6145749525957565b11b227b207e1f5a65 (commit)
via d2bbe7f46e107c8a94aa84aaa32f570fde298426 (commit)
via 5d934a73dcbbdb1e4dfa7219eb40bbb34e2cc9c7 (commit)
via 16ada955ac658c59f8a2d96acb305699c224482e (commit)
via 8cbc8e01b382df53d9882d7a7e0970287575ad08 (commit)
via 0f0a5a6e5ffee29fa9e63b267d13232d5d8ffe49 (commit)
via 524fc726215f527803423b0af51364ff5904221e (commit)
via 870f68d7f2c8cdd6febf5a1706c52deca992ce86 (commit)
via 42fb65f0f3f78c706d0406f40b6989f3d40e4cae (commit)
from 818f3344652cc151fbe12cdd245f832b80a69fde (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 fdec4318350a85de39a2bef8a0ea32fdb89d8cab
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 9 12:19:06 2012 +0200
started core59.
commit 6560ecaa51f5493aa5674825d1d1b7bc9e464184
Merge: 818f334 5cbbd5f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 9 12:15:59 2012 +0200
Merge branch 'master' into next
Conflicts:
config/rootfiles/core/58/filelists/files
make.sh
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/58/filelists/files | 3 ++
config/rootfiles/core/{55 => 59}/exclude | 0
.../rootfiles/core/{58 => 59}/filelists/Net-Telnet | 0
config/rootfiles/core/{58 => 59}/filelists/files | 1 -
config/rootfiles/core/{52 => 59}/meta | 0
config/rootfiles/core/{58 => 59}/update.sh | 24 +++++++++----------
make.sh | 4 +-
7 files changed, 16 insertions(+), 16 deletions(-)
copy config/rootfiles/core/{55 => 59}/exclude (100%)
copy config/rootfiles/core/{58 => 59}/filelists/Net-Telnet (100%)
copy config/rootfiles/core/{58 => 59}/filelists/files (93%)
copy config/rootfiles/core/{52 => 59}/meta (100%)
copy config/rootfiles/core/{58 => 59}/update.sh (87%)
Difference in files:
diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
index 047127e..19d98e5 100644
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@ -1,7 +1,10 @@
etc/system-release
etc/issue
etc/vimrc
+<<<<<<< HEAD
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
+=======
+>>>>>>> master
diff --git a/config/rootfiles/core/59/exclude b/config/rootfiles/core/59/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/core/59/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/59/filelists/Net-Telnet b/config/rootfiles/core/59/filelists/Net-Telnet
new file mode 120000
index 0000000..66ca926
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/Net-Telnet
@@ -0,0 +1 @@
+../../../common/Net-Telnet
\ No newline at end of file
diff --git a/config/rootfiles/core/59/filelists/files b/config/rootfiles/core/59/filelists/files
new file mode 100644
index 0000000..16464c7
--- /dev/null
+++ b/config/rootfiles/core/59/filelists/files
@@ -0,0 +1,6 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/general-functions.pl
+var/ipfire/langs
diff --git a/config/rootfiles/core/59/meta b/config/rootfiles/core/59/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/59/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/59/update.sh b/config/rootfiles/core/59/update.sh
new file mode 100644
index 0000000..5a3cc2a
--- /dev/null
+++ b/config/rootfiles/core/59/update.sh
@@ -0,0 +1,82 @@
+#!/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=59
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#Extract files
+
+#
+#Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#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/make.sh b/make.sh
index a720b62..4e79793 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="58" # Core Level (Filename)
-PAKFIRE_CORE="57" # Core Level (PAKFIRE)
+CORE="59" # Core Level (Filename)
+PAKFIRE_CORE="58" # 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
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core58, created. 6325b06b17d6033afa42b4139192c48974e63a75
by git＠ipfire.org 07 Apr '12
by git＠ipfire.org 07 Apr '12
07 Apr '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, core58 has been created
at 6325b06b17d6033afa42b4139192c48974e63a75 (commit)
- Log -----------------------------------------------------------------
commit 6325b06b17d6033afa42b4139192c48974e63a75
Merge: a5bc82a 5cbbd5f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 7 11:42:17 2012 +0200
Merge commit 'origin/master' into core58
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.11-core58, created. 5cbbd5f1ed37c0c465378916716319d63234a294
by git＠ipfire.org 07 Apr '12
by git＠ipfire.org 07 Apr '12
07 Apr '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 tag, v2.11-core58 has been created
at 5cbbd5f1ed37c0c465378916716319d63234a294 (commit)
- Log -----------------------------------------------------------------
commit 5cbbd5f1ed37c0c465378916716319d63234a294
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 7 11:39:23 2012 +0200
finished core58.
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0