From 71e400fe676cf059872b606188677418e7c87549e11609eb6cda0b6dbecd1b2b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 27 Jun 2014 12:59:41 +0000 Subject: [PATCH 01/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=693 --- ...-udev_queue_get_queue_is_empty-logic.patch | 25 +++++++++++++++++++ systemd-mini.changes | 6 +++++ systemd-mini.spec | 7 ++++++ systemd.changes | 6 +++++ systemd.spec | 7 ++++++ 5 files changed, 51 insertions(+) create mode 100644 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch diff --git a/1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch b/1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch new file mode 100644 index 00000000..21d21356 --- /dev/null +++ b/1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch @@ -0,0 +1,25 @@ +From 45e60962b7965f32755a76b79a28126299aac149 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Fri, 27 Jun 2014 14:20:17 +0200 +Subject: [PATCH] libudev: fix udev_queue_get_queue_is_empty() logic + +--- + src/libudev/libudev-queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/libudev/libudev-queue.c src/libudev/libudev-queue.c +index eb0e096..c32a7ef 100644 +--- src/libudev/libudev-queue.c ++++ src/libudev/libudev-queue.c +@@ -175,7 +175,7 @@ _public_ int udev_queue_get_udev_is_active(struct udev_queue *udev_queue) + **/ + _public_ int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue) + { +- return access("/run/udev/queue", F_OK) >= 0; ++ return access("/run/udev/queue", F_OK) < 0; + } + + /** +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index da40a9c5..f0dee4ff 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de + +- Add upstream bug fix patch + 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch (bnc#882714) + ------------------------------------------------------------------- Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 15e40108..a9082139 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -696,6 +696,8 @@ Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch # PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714) Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch +# PATCH-FIX-UPSTREAM 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch +Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1204,6 +1206,11 @@ cp %{SOURCE7} m4/ %endif %endif %patch1040 -p1 +%if 0%{?suse_version} > 1310 +%if %{with udevsettle} +%patch1041 -p0 +%endif +%endif # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index da40a9c5..f0dee4ff 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de + +- Add upstream bug fix patch + 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch (bnc#882714) + ------------------------------------------------------------------- Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 55ff9a7d..4eb30653 100644 --- a/systemd.spec +++ b/systemd.spec @@ -691,6 +691,8 @@ Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch # PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714) Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch +# PATCH-FIX-UPSTREAM 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch +Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1199,6 +1201,11 @@ cp %{SOURCE7} m4/ %endif %endif %patch1040 -p1 +%if 0%{?suse_version} > 1310 +%if %{with udevsettle} +%patch1041 -p0 +%endif +%endif # ensure generate files are removed rm -f units/emergency.service From aa5a6f5531a2d935c033595d98ae06b085b12479e484c84b727961256af0c8bf Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Jul 2014 08:57:46 +0000 Subject: [PATCH 02/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=695 --- ...ovide-file-descriptor-to-watch-busy-.patch | 247 ++++++++++++++++++ ...tch-entire-directory-to-allow-the-re.patch | 40 +++ systemd-mini.changes | 7 + systemd-mini.spec | 10 +- systemd.changes | 7 + systemd.spec | 10 +- 6 files changed, 319 insertions(+), 2 deletions(-) create mode 100644 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch create mode 100644 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch diff --git a/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch b/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch new file mode 100644 index 00000000..55ae6bc4 --- /dev/null +++ b/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch @@ -0,0 +1,247 @@ +From 14cb733684d3c3f50d088a3a370ddf8e8894dfa4 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Fri, 27 Jun 2014 17:42:44 +0200 +Subject: [PATCH] libudev: queue provide file descriptor to watch busy event + queue + +--- + docs/libudev/libudev-sections.txt | 2 ++ + src/libudev/libudev-queue.c | 46 +++++++++++++++++++++++++++++++++++ + src/libudev/libudev.h | 2 ++ + src/libudev/libudev.sym | 2 ++ + src/udev/udevadm-settle.c | 48 ++++++++++++++++--------------------- + 5 files changed, 73 insertions(+), 27 deletions(-) + +diff --git docs/libudev/libudev-sections.txt docs/libudev/libudev-sections.txt +index c154645..8a31ded 100644 +--- docs/libudev/libudev-sections.txt ++++ docs/libudev/libudev-sections.txt +@@ -116,6 +116,8 @@ udev_queue_get_seqnum_sequence_is_finished + udev_queue_get_queued_list_entry + udev_queue_get_kernel_seqnum + udev_queue_get_udev_seqnum ++udev_queue_get_fd ++udev_queue_flush + + +
+diff --git src/libudev/libudev-queue.c src/libudev/libudev-queue.c +index c32a7ef..d4334b4 100644 +--- src/libudev/libudev-queue.c ++++ src/libudev/libudev-queue.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "libudev.h" + #include "libudev-private.h" +@@ -45,6 +46,7 @@ + struct udev_queue { + struct udev *udev; + int refcount; ++ int fd; + }; + + /** +@@ -69,6 +71,7 @@ _public_ struct udev_queue *udev_queue_new(struct udev *udev) + + udev_queue->refcount = 1; + udev_queue->udev = udev; ++ udev_queue->fd = -1; + return udev_queue; + } + +@@ -107,6 +110,8 @@ _public_ struct udev_queue *udev_queue_unref(struct udev_queue *udev_queue) + if (udev_queue->refcount > 0) + return NULL; + ++ safe_close(udev_queue->fd); ++ + free(udev_queue); + return NULL; + } +@@ -222,3 +227,44 @@ _public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_qu + { + return NULL; + } ++ ++/** ++ * udev_queue_get_fd: ++ * @udev_queue: udev queue context ++ * ++ * Returns: a file descriptor to watch for a queue to become empty. ++ */ ++_public_ int udev_queue_get_fd(struct udev_queue *udev_queue) { ++ int fd; ++ int r; ++ ++ if (udev_queue->fd >= 0) ++ return udev_queue->fd; ++ ++ fd = inotify_init1(IN_CLOEXEC); ++ if (fd < 0) ++ return -errno; ++ ++ r = inotify_add_watch(fd, "/run/udev/queue" , IN_DELETE); ++ if (r < 0) { ++ r = -errno; ++ close(fd); ++ return r; ++ } ++ ++ udev_queue->fd = fd; ++ return fd; ++} ++ ++/** ++ * udev_queue_flush: ++ * @udev_queue: udev queue context ++ * ++ * Returns: the result of clearing the watch for queue changes. ++ */ ++_public_ int udev_queue_flush(struct udev_queue *udev_queue) { ++ if (udev_queue->fd < 0) ++ return -EINVAL; ++ ++ return flush_fd(udev_queue->fd); ++} +diff --git src/libudev/libudev.h src/libudev/libudev.h +index ceb89bd..4f2f115 100644 +--- src/libudev/libudev.h ++++ src/libudev/libudev.h +@@ -177,6 +177,8 @@ int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue); + int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum) __attribute__ ((deprecated)); + int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue, + unsigned long long int start, unsigned long long int end) __attribute__ ((deprecated)); ++int udev_queue_get_fd(struct udev_queue *udev_queue); ++int udev_queue_flush(struct udev_queue *udev_queue); + struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue) __attribute__ ((deprecated)); + + /* +diff --git src/libudev/libudev.sym src/libudev/libudev.sym +index 1e6f885..95cd1c7 100644 +--- src/libudev/libudev.sym ++++ src/libudev/libudev.sym +@@ -82,6 +82,8 @@ global: + udev_queue_get_udev; + udev_queue_get_udev_is_active; + udev_queue_get_udev_seqnum; ++ udev_queue_get_fd; ++ udev_queue_flush; + udev_queue_new; + udev_queue_ref; + udev_queue_unref; +diff --git src/udev/udevadm-settle.c src/udev/udevadm-settle.c +index 66fd843..79e8b59 100644 +--- src/udev/udevadm-settle.c ++++ src/udev/udevadm-settle.c +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -59,7 +58,9 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) + const char *exists = NULL; + unsigned int timeout = 120; + struct pollfd pfd[1] = { {.fd = -1}, }; +- int rc = EXIT_FAILURE, c; ++ int c; ++ struct udev_queue *queue; ++ int rc = EXIT_FAILURE; + + while ((c = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL)) >= 0) { + switch (c) { +@@ -79,9 +80,9 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) + break; + case 'h': + help(); +- exit(EXIT_SUCCESS); ++ return EXIT_SUCCESS; + case '?': +- exit(EXIT_FAILURE); ++ return EXIT_FAILURE; + default: + assert_not_reached("Unknown argument"); + } +@@ -89,7 +90,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) + + if (optind < argc) { + fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]); +- exit(EXIT_FAILURE); ++ return EXIT_FAILURE; + } + + /* guarantee that the udev daemon isn't pre-processing */ +@@ -101,26 +102,23 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) + if (udev_ctrl_send_ping(uctrl, timeout) < 0) { + log_debug("no connection to daemon"); + udev_ctrl_unref(uctrl); +- rc = EXIT_SUCCESS; +- goto out; ++ return EXIT_SUCCESS; + } + udev_ctrl_unref(uctrl); + } + } + +- pfd[0].events = POLLIN; +- pfd[0].fd = inotify_init1(IN_CLOEXEC); +- if (pfd[0].fd < 0) { +- log_error("inotify_init failed: %m"); +- goto out; ++ queue = udev_queue_new(udev); ++ if (!queue) { ++ log_error("unable to get udev queue"); ++ return EXIT_FAILURE; + } + +- if (inotify_add_watch(pfd[0].fd, "/run/udev/queue" , IN_DELETE) < 0) { +- /* If it does not exist, we don't have to wait */ +- if (errno == ENOENT) +- rc = EXIT_SUCCESS; +- else +- log_debug("watching /run/udev/queue failed"); ++ pfd[0].events = POLLIN; ++ pfd[0].fd = udev_queue_get_fd(queue); ++ if (pfd[0].fd < 0) { ++ log_debug("queue is empty, nothing to watch"); ++ rc = EXIT_SUCCESS; + goto out; + } + +@@ -131,22 +129,18 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) + } + + /* exit if queue is empty */ +- if (access("/run/udev/queue", F_OK) < 0) { ++ if (udev_queue_get_queue_is_empty(queue)) { + rc = EXIT_SUCCESS; + break; + } + +- /* wake up when "queue" file is deleted */ +- if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN) { +- char buf[sizeof(struct inotify_event) + PATH_MAX]; +- +- read(pfd[0].fd, buf, sizeof(buf)); +- } ++ /* wake up when queue is empty */ ++ if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN) ++ udev_queue_flush(queue); + } + + out: +- if (pfd[0].fd >= 0) +- close(pfd[0].fd); ++ udev_queue_unref(queue); + return rc; + } + +-- +1.7.9.2 + diff --git a/1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch b/1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch new file mode 100644 index 00000000..78c1c084 --- /dev/null +++ b/1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch @@ -0,0 +1,40 @@ +From 8a7a0c19edd2d971d4aa9d635f7978af841e8278 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Fri, 27 Jun 2014 19:54:45 +0200 +Subject: [PATCH] libudev: queue - watch entire directory to allow the re-use + of the watch descriptor + +--- + src/libudev/libudev-queue.c | 2 +- + src/udev/udevadm-settle.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git src/libudev/libudev-queue.c src/libudev/libudev-queue.c +index d4334b4..8ef1f3d 100644 +--- src/libudev/libudev-queue.c ++++ src/libudev/libudev-queue.c +@@ -245,7 +245,7 @@ _public_ int udev_queue_get_fd(struct udev_queue *udev_queue) { + if (fd < 0) + return -errno; + +- r = inotify_add_watch(fd, "/run/udev/queue" , IN_DELETE); ++ r = inotify_add_watch(fd, "/run/udev" , IN_DELETE); + if (r < 0) { + r = -errno; + close(fd); +diff --git src/udev/udevadm-settle.c src/udev/udevadm-settle.c +index 79e8b59..fa5b0c2 100644 +--- src/udev/udevadm-settle.c ++++ src/udev/udevadm-settle.c +@@ -135,7 +135,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) + } + + /* wake up when queue is empty */ +- if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN) ++ if (poll(pfd, 1, MSEC_PER_SEC) > 0 && pfd[0].revents & POLLIN) + udev_queue_flush(queue); + } + +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index f0dee4ff..9982508c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 1 08:56:48 UTC 2014 - werner@suse.de + +- Add upstream patches + 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch + 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch + ------------------------------------------------------------------- Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index a9082139..132c4e4f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -31,7 +31,9 @@ %else %define has_efi 0 %endif -%bcond_with udevsettle +##%bcond_with udevsettle +%define suse_version 1320 +%bcond_without udevsettle Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd @@ -698,6 +700,10 @@ Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch # PATCH-FIX-UPSTREAM 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch +# PATCH-FIX-UPSTREAM 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch +Patch1042: 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch +# PATCH-FIX-UPSTREAM 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch +Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1209,6 +1215,8 @@ cp %{SOURCE7} m4/ %if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1041 -p0 +%patch1042 -p0 +%patch1043 -p0 %endif %endif diff --git a/systemd.changes b/systemd.changes index f0dee4ff..9982508c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 1 08:56:48 UTC 2014 - werner@suse.de + +- Add upstream patches + 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch + 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch + ------------------------------------------------------------------- Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 4eb30653..3723ab3a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -29,7 +29,9 @@ %else %define has_efi 0 %endif -%bcond_with udevsettle +##%bcond_with udevsettle +%define suse_version 1320 +%bcond_without udevsettle Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd @@ -693,6 +695,10 @@ Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch # PATCH-FIX-UPSTREAM 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch +# PATCH-FIX-UPSTREAM 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch +Patch1042: 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch +# PATCH-FIX-UPSTREAM 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch +Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1204,6 +1210,8 @@ cp %{SOURCE7} m4/ %if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1041 -p0 +%patch1042 -p0 +%patch1043 -p0 %endif %endif From f061002b97bbd53dcdad901516bbdee25fe3c16a6ddbde8c8be22a8de7b51c92 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Jul 2014 08:58:04 +0000 Subject: [PATCH 03/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=696 --- systemd.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/systemd.spec b/systemd.spec index 3723ab3a..6e5f23b7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -29,9 +29,7 @@ %else %define has_efi 0 %endif -##%bcond_with udevsettle -%define suse_version 1320 -%bcond_without udevsettle +%bcond_with udevsettle Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd From 4f24633fada6eb5311c15acaa800539f2bbccfff2f0b5f5979eefd48c3d34ba1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Jul 2014 09:00:10 +0000 Subject: [PATCH 04/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=697 --- systemd-mini.spec | 10 +--------- systemd.spec | 6 ------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/systemd-mini.spec b/systemd-mini.spec index 132c4e4f..db05c2af 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -31,9 +31,7 @@ %else %define has_efi 0 %endif -##%bcond_with udevsettle -%define suse_version 1320 -%bcond_without udevsettle +%bcond_with udevsettle Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd @@ -1185,11 +1183,9 @@ cp %{SOURCE7} m4/ %patch1019 -p0 %patch1020 -p0 %patch1021 -p1 -%if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1022 -p1 %endif -%endif %patch1023 -p0 %patch1024 -p0 %patch1025 -p1 @@ -1206,19 +1202,15 @@ cp %{SOURCE7} m4/ %patch1036 -p1 %patch1037 -p1 %patch1038 -p0 -%if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1039 -p0 %endif -%endif %patch1040 -p1 -%if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1041 -p0 %patch1042 -p0 %patch1043 -p0 %endif -%endif # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.spec b/systemd.spec index 6e5f23b7..711d0f1b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1178,11 +1178,9 @@ cp %{SOURCE7} m4/ %patch1019 -p0 %patch1020 -p0 %patch1021 -p1 -%if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1022 -p1 %endif -%endif %patch1023 -p0 %patch1024 -p0 %patch1025 -p1 @@ -1199,19 +1197,15 @@ cp %{SOURCE7} m4/ %patch1036 -p1 %patch1037 -p1 %patch1038 -p0 -%if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1039 -p0 %endif -%endif %patch1040 -p1 -%if 0%{?suse_version} > 1310 %if %{with udevsettle} %patch1041 -p0 %patch1042 -p0 %patch1043 -p0 %endif -%endif # ensure generate files are removed rm -f units/emergency.service From c898064f3d9e3175e74a530972637aa113bd14816cec9723bc72c6064c77e6d0 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Jul 2014 09:04:15 +0000 Subject: [PATCH 05/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=698 --- ...libudev-queue-provide-file-descriptor-to-watch-busy-.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch b/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch index 55ae6bc4..16cc646a 100644 --- a/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch +++ b/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch @@ -1,4 +1,4 @@ -From 14cb733684d3c3f50d088a3a370ddf8e8894dfa4 Mon Sep 17 00:00:00 2001 +Based on 14cb733684d3c3f50d088a3a370ddf8e8894dfa4 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 27 Jun 2014 17:42:44 +0200 Subject: [PATCH] libudev: queue provide file descriptor to watch busy event @@ -57,7 +57,7 @@ index c32a7ef..d4334b4 100644 if (udev_queue->refcount > 0) return NULL; -+ safe_close(udev_queue->fd); ++ close_nointr_nofail(udev_queue->fd); + free(udev_queue); return NULL; From 1f78014dae45ce5e6318af116ad09568c2090ad2d0a6a5bb9f05d8810bb9038d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Jul 2014 10:11:44 +0000 Subject: [PATCH 06/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=699 --- 0001-core-close-socket-fds-asynchronously.patch | 12 +++++++----- ...ueue-provide-file-descriptor-to-watch-busy-.patch | 7 ++++--- systemd-mini.changes | 5 +++++ systemd.changes | 5 +++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/0001-core-close-socket-fds-asynchronously.patch b/0001-core-close-socket-fds-asynchronously.patch index 70eebd3c..b94b3802 100644 --- a/0001-core-close-socket-fds-asynchronously.patch +++ b/0001-core-close-socket-fds-asynchronously.patch @@ -5,9 +5,9 @@ Subject: [PATCH] core: close socket fds asynchronously http://lists.freedesktop.org/archives/systemd-devel/2014-April/018928.html --- - src/core/async.c | 22 ++++++++++++++++++++++ + src/core/async.c | 24 ++++++++++++++++++++++++ src/core/service.c | 5 +++-- - 2 files changed, 25 insertions(+), 2 deletions(-) + 2 files changed, 27 insertions(+), 2 deletions(-) --- src/core/service.c +++ src/core/service.c 2014-05-16 11:41:50.150735247 +0000 @@ -47,13 +47,15 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-April/018928.html int asynchronous_job(void* (*func)(void *p), void *arg) { pthread_attr_t a; -@@ -70,3 +71,24 @@ int asynchronous_sync(void) { +@@ -70,3 +71,26 @@ int asynchronous_sync(void) { return asynchronous_job(sync_thread, NULL); } + +static void *close_thread(void *p) { -+ close_nointr_nofail(PTR_TO_INT(p)); ++ int fd = PTR_TO_INT(p); ++ if (fd >= 0) ++ close_nointr_nofail(fd); + return NULL; +} + @@ -67,7 +69,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-April/018928.html + * far away as we can. */ + + r = asynchronous_job(close_thread, INT_TO_PTR(fd)); -+ if (r < 0) ++ if (r < 0 && fd >= 0) + close_nointr_nofail(fd); + + return -1; diff --git a/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch b/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch index 16cc646a..a9458e36 100644 --- a/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch +++ b/1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch @@ -53,16 +53,17 @@ index c32a7ef..d4334b4 100644 return udev_queue; } -@@ -107,6 +110,8 @@ _public_ struct udev_queue *udev_queue_unref(struct udev_queue *udev_queue) +@@ -107,6 +110,9 @@ _public_ struct udev_queue *udev_queue_unref(struct udev_queue *udev_queue) if (udev_queue->refcount > 0) return NULL; -+ close_nointr_nofail(udev_queue->fd); ++ if (udev_queue->fd >= 0) ++ close_nointr_nofail(udev_queue->fd); + free(udev_queue); return NULL; } -@@ -222,3 +227,44 @@ _public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_qu +@@ -222,3 +228,44 @@ _public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_qu { return NULL; } diff --git a/systemd-mini.changes b/systemd-mini.changes index 9982508c..0ac93793 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 1 09:58:04 UTC 2014 - werner@suse.de + +- Be aware that close_nointr_nofail() may fail whereas safe_close() not + ------------------------------------------------------------------- Tue Jul 1 08:56:48 UTC 2014 - werner@suse.de diff --git a/systemd.changes b/systemd.changes index 9982508c..0ac93793 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 1 09:58:04 UTC 2014 - werner@suse.de + +- Be aware that close_nointr_nofail() may fail whereas safe_close() not + ------------------------------------------------------------------- Tue Jul 1 08:56:48 UTC 2014 - werner@suse.de From 9bfb58b4da4db7d548df0f49d665c368b6a8b93b39c0828090014b4627b36cbf Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Jul 2014 12:43:04 +0000 Subject: [PATCH 07/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=700 --- ...-might-fail-due-to-OOM-protect-again.patch | 26 +++++ ...-MaxFileSec-really-default-to-1month.patch | 30 ++++++ ...useManualStart-from-units-which-are-.patch | 65 +++++++++++++ ...idering-UID-0xFFFF-and-0xFFFFFFFF-va.patch | 31 ++++++ ...n_by_handle_at-and-others-via-seccom.patch | 94 +++++++++++++++++++ ...o-automatic-cleanup-in-XDG_RUNTIME_D.patch | 26 +++++ ...skip-mounting-tmp-if-it-is-a-symlink.patch | 26 +++++ 1044-rules-update-qemu-hid-rules.patch | 45 +++++++++ ...-t-enable-usb-pm-for-Avocent-devices.patch | 29 ++++++ systemd-mini.changes | 14 +++ systemd-mini.spec | 26 +++++ systemd.changes | 14 +++ systemd.spec | 26 +++++ 13 files changed, 452 insertions(+) create mode 100644 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch create mode 100644 0002-journald-make-MaxFileSec-really-default-to-1month.patch create mode 100644 0003-units-remove-RefuseManualStart-from-units-which-are-.patch create mode 100644 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch create mode 100644 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch create mode 100644 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch create mode 100644 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch create mode 100644 1044-rules-update-qemu-hid-rules.patch create mode 100644 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch diff --git a/0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch b/0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch new file mode 100644 index 00000000..df04192f --- /dev/null +++ b/0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch @@ -0,0 +1,26 @@ +Based on 1f97091d3cb0887c264176b47b0a86c269acf0b5 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Fri, 27 Jun 2014 18:34:37 +0200 +Subject: [PATCH] main: uid_to_name() might fail due to OOM, protect against + that + +--- + src/core/main.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- src/core/main.c ++++ src/core/main.c 2014-07-01 12:25:17.906235000 +0000 +@@ -1525,9 +1525,10 @@ int main(int argc, char *argv[]) { + log_info("Running in initial RAM disk."); + + } else { +- _cleanup_free_ char *t = uid_to_name(getuid()); +- log_debug(PACKAGE_STRING " running in user mode for user "UID_FMT"/%s. (" SYSTEMD_FEATURES ")", +- getuid(), t); ++ _cleanup_free_ char *t; ++ ++ t = uid_to_name(getuid()); ++ log_debug(PACKAGE_STRING " running in user mode for user "UID_FMT"/%s. (" SYSTEMD_FEATURES ")", getuid(), strna(t)); + } + + if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) { diff --git a/0002-journald-make-MaxFileSec-really-default-to-1month.patch b/0002-journald-make-MaxFileSec-really-default-to-1month.patch new file mode 100644 index 00000000..9b48fcae --- /dev/null +++ b/0002-journald-make-MaxFileSec-really-default-to-1month.patch @@ -0,0 +1,30 @@ +Based on e150e82097211f09b911c7784a89ef9efed713ca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20Bartoszkiewicz?= +Date: Thu, 26 Jun 2014 22:11:35 +0200 +Subject: [PATCH] journald: make MaxFileSec really default to 1month + +journald.conf(5) states that the default for MaxFileSec is one month, +but the code didn't respect that. +--- + src/journal/journald-server.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- src/journal/journald-server.c ++++ src/journal/journald-server.c 2014-07-01 12:28:25.506735287 +0000 +@@ -68,6 +68,7 @@ + #define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE) + #define DEFAULT_RATE_LIMIT_INTERVAL (30*USEC_PER_SEC) + #define DEFAULT_RATE_LIMIT_BURST 1000 ++#define DEFAULT_MAX_FILE_USEC USEC_PER_MONTH + + #define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC) + +@@ -1496,6 +1497,8 @@ int server_init(Server *s) { + + s->forward_to_syslog = true; + ++ s->max_file_usec = DEFAULT_MAX_FILE_USEC; ++ + s->max_level_store = LOG_DEBUG; + s->max_level_syslog = LOG_DEBUG; + s->max_level_kmsg = LOG_NOTICE; diff --git a/0003-units-remove-RefuseManualStart-from-units-which-are-.patch b/0003-units-remove-RefuseManualStart-from-units-which-are-.patch new file mode 100644 index 00000000..d9ffedbf --- /dev/null +++ b/0003-units-remove-RefuseManualStart-from-units-which-are-.patch @@ -0,0 +1,65 @@ +Based on 0fdeb6e011dfdb17636c81e2d7e0d632186359ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sat, 28 Jun 2014 00:06:30 -0400 +Subject: [PATCH] units: remove RefuseManualStart from units which are always + around + +In a normal running system, non-passive targets and units used during +early bootup are always started. So refusing "manual start" for them +doesn't make any difference, because a "start" command doesn't cause +any action. + +In early boot however, the administrator might want to start on +of those targets or services by hand. We shouldn't interfere with that. + +Note: in case of systemd-tmpfiles-setup.service, really running the +unit after system is up would break the system. So e.g. restarting +should not be allowed. The unit has "RefuseManualStop=yes", which +prevents restart too. +--- + units/basic.target | 1 - + units/sysinit.target | 1 - + units/systemd-tmpfiles-setup.service.in | 1 - + units/user/basic.target | 1 - + 4 files changed, 4 deletions(-) + +diff --git units/basic.target units/basic.target +index d7c68f4..b890d48 100644 +--- units/basic.target ++++ units/basic.target +@@ -11,4 +11,3 @@ Documentation=man:systemd.special(7) + Requires=sysinit.target + Wants=sockets.target timers.target paths.target slices.target + After=sysinit.target sockets.target timers.target paths.target slices.target +-RefuseManualStart=yes +diff --git units/sysinit.target units/sysinit.target +index 8f4fb8f..ec33503 100644 +--- units/sysinit.target ++++ units/sysinit.target +@@ -11,4 +11,3 @@ Documentation=man:systemd.special(7) + Conflicts=emergency.service emergency.target + Wants=local-fs.target swap.target + After=local-fs.target swap.target emergency.service emergency.target +-RefuseManualStart=yes +--- units/systemd-tmpfiles-setup.service.in ++++ units/systemd-tmpfiles-setup.service.in 2014-07-01 12:17:48.154235348 +0000 +@@ -18,7 +18,6 @@ ConditionDirectoryNotEmpty=|/lib/tmpfile + ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d + ConditionDirectoryNotEmpty=|/etc/tmpfiles.d + ConditionDirectoryNotEmpty=|/run/tmpfiles.d +-RefuseManualStart=yes + RefuseManualStop=yes + + [Service] +diff --git units/user/basic.target units/user/basic.target +index b74d13c..afc6e93 100644 +--- units/user/basic.target ++++ units/user/basic.target +@@ -10,4 +10,3 @@ Description=Basic System + Documentation=man:systemd.special(7) + Wants=sockets.target timers.target paths.target + After=sockets.target timers.target paths.target +-RefuseManualStart=yes +-- +1.7.9.2 + diff --git a/0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch b/0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch new file mode 100644 index 00000000..f50e568d --- /dev/null +++ b/0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch @@ -0,0 +1,31 @@ +From 306a55c86360a7ae7b2509771d5ea6ab0d166d85 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Sun, 29 Jun 2014 22:15:33 +0200 +Subject: [PATCH] util: refuse considering UID 0xFFFF and 0xFFFFFFFF valid + +--- + src/shared/util.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git src/shared/util.c src/shared/util.c +index e7ff0f8..1709bb7 100644 +--- src/shared/util.c ++++ src/shared/util.c +@@ -280,6 +280,14 @@ int parse_uid(const char *s, uid_t* ret_uid) { + if ((unsigned long) uid != ul) + return -ERANGE; + ++ /* Some libc APIs use (uid_t) -1 as special placeholder */ ++ if (uid == (uid_t) 0xFFFFFFFF) ++ return -EINVAL; ++ ++ /* A long time ago UIDs where 16bit, hence explicitly avoid the 32bit -1 too */ ++ if (uid == (uid_t) 0xFFFF) ++ return -EINVAL; ++ + *ret_uid = uid; + return 0; + } +-- +1.7.9.2 + diff --git a/0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch b/0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch new file mode 100644 index 00000000..e5b6706d --- /dev/null +++ b/0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch @@ -0,0 +1,94 @@ +From 28650077f36466d9c5ee27ef2006fae3171a2430 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 30 Jun 2014 16:22:12 +0200 +Subject: [PATCH] nspawn: block open_by_handle_at() and others via seccomp + +Let's protect ourselves against the recently reported docker security +issue. Our man page makes clear that we do not make any security +promises anyway, but well, this one is easy to mitigate, so let's do it. +While we are at it block a couple of more syscalls that are no good in +containers, too. +--- + src/nspawn/nspawn.c | 47 +++++++++++++++++++++++++++++++++++------------ + 1 file changed, 35 insertions(+), 12 deletions(-) + +diff --git src/nspawn/nspawn.c src/nspawn/nspawn.c +index fd61d07..656c1bf 100644 +--- src/nspawn/nspawn.c ++++ src/nspawn/nspawn.c +@@ -1864,22 +1864,25 @@ static int setup_macvlan(pid_t pid) { + return 0; + } + +-static int audit_still_doesnt_work_in_containers(void) { ++static int setup_seccomp(void) { + + #ifdef HAVE_SECCOMP ++ static const int blacklist[] = { ++ SCMP_SYS(kexec_load), ++ SCMP_SYS(open_by_handle_at), ++ SCMP_SYS(init_module), ++ SCMP_SYS(finit_module), ++ SCMP_SYS(delete_module), ++ SCMP_SYS(iopl), ++ SCMP_SYS(ioperm), ++ SCMP_SYS(swapon), ++ SCMP_SYS(swapoff), ++ }; ++ + scmp_filter_ctx seccomp; ++ unsigned i; + int r; + +- /* +- Audit is broken in containers, much of the userspace audit +- hookup will fail if running inside a container. We don't +- care and just turn off creation of audit sockets. +- +- This will make socket(AF_NETLINK, *, NETLINK_AUDIT) fail +- with EAFNOSUPPORT which audit userspace uses as indication +- that audit is disabled in the kernel. +- */ +- + seccomp = seccomp_init(SCMP_ACT_ALLOW); + if (!seccomp) + return log_oom(); +@@ -1890,6 +1893,26 @@ static int audit_still_doesnt_work_in_containers(void) { + goto finish; + } + ++ for (i = 0; i < ELEMENTSOF(blacklist); i++) { ++ r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), blacklist[i], 0); ++ if (r == -EFAULT) ++ continue; /* unknown syscall */ ++ if (r < 0) { ++ log_error("Failed to block syscall: %s", strerror(-r)); ++ goto finish; ++ } ++ } ++ ++ /* ++ Audit is broken in containers, much of the userspace audit ++ hookup will fail if running inside a container. We don't ++ care and just turn off creation of audit sockets. ++ ++ This will make socket(AF_NETLINK, *, NETLINK_AUDIT) fail ++ with EAFNOSUPPORT which audit userspace uses as indication ++ that audit is disabled in the kernel. ++ */ ++ + r = seccomp_rule_add( + seccomp, + SCMP_ACT_ERRNO(EAFNOSUPPORT), +@@ -3050,7 +3073,7 @@ int main(int argc, char *argv[]) { + + dev_setup(arg_directory); + +- if (audit_still_doesnt_work_in_containers() < 0) ++ if (setup_seccomp() < 0) + goto child_fail; + + if (setup_dev_console(arg_directory, console) < 0) +-- +1.7.9.2 + diff --git a/0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch b/0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch new file mode 100644 index 00000000..8647f1e1 --- /dev/null +++ b/0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch @@ -0,0 +1,26 @@ +Based on 6fc27667950fe153033f0f49cb5b57e8954c3e54 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 30 Jun 2014 19:06:18 +0200 +Subject: [PATCH] tmpfiles: don't do automatic cleanup in $XDG_RUNTIME_DIR + +Now that logind will clean up all IPC resources of a user we should +really consider $XDG_RUNTIME_DIR as just another kind of IPC with the +same life-cycle logic as the other IPC resources. This should be safe +now to do since every user gets his own $XDG_RUNTIME_DIR tmpfs instance +with a fixed size limit, so that flooding of it will more effectively be +averted. +--- + tmpfiles.d/systemd.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- tmpfiles.d/systemd.conf ++++ tmpfiles.d/systemd.conf 2014-07-01 12:31:01.858735866 +0000 +@@ -7,7 +7,7 @@ + + # See tmpfiles.d(5) for details + +-d /run/user 0755 root root ~10d ++d /run/user 0755 root root - + F! /run/utmp 0664 root utmp - + + f /var/log/wtmp 0664 root utmp - diff --git a/0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch b/0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch new file mode 100644 index 00000000..a1046c39 --- /dev/null +++ b/0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch @@ -0,0 +1,26 @@ +From 8ebf02d6f382ce1ac7e0d44a713b8795a07b08cd Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 30 Jun 2014 21:44:05 +0200 +Subject: [PATCH] units: skip mounting /tmp if it is a symlink + +We shouldn't get confused if people have symlinked /tmp somewhere, so +let's simply skip the mount then. +--- + units/tmp.mount | 1 + + 1 file changed, 1 insertion(+) + +diff --git units/tmp.mount units/tmp.mount +index 99a3ba3..00a0d28 100644 +--- units/tmp.mount ++++ units/tmp.mount +@@ -9,6 +9,7 @@ + Description=Temporary Directory + Documentation=man:hier(7) + Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems ++ConditionPathIsSymbolicLink=!/tmp + DefaultDependencies=no + Conflicts=umount.target + Before=local-fs.target umount.target +-- +1.7.9.2 + diff --git a/1044-rules-update-qemu-hid-rules.patch b/1044-rules-update-qemu-hid-rules.patch new file mode 100644 index 00000000..52741afe --- /dev/null +++ b/1044-rules-update-qemu-hid-rules.patch @@ -0,0 +1,45 @@ +From cd31d1884f1ecf38e11bc6268f446d75dfafbc25 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Mon, 24 Mar 2014 12:07:41 +0100 +Subject: [PATCH] rules: update qemu hid rules + +Update comment to be a bit more specific. + +Change match to blacklist the serial number of the broken devices +instead of whitelisting the serial number of the fixed devices. +This allows to do something useful with the serial number in the +future. +--- + rules/42-usb-hid-pm.rules | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git rules/42-usb-hid-pm.rules rules/42-usb-hid-pm.rules +index 3fd6e8a..c675b5b 100644 +--- rules/42-usb-hid-pm.rules ++++ rules/42-usb-hid-pm.rules +@@ -2,14 +2,15 @@ + # + # Enable autosuspend for qemu emulated usb hid devices + +-# Note that there are buggy qemu versions which advertise remote +-# wakeup support but don't actually implement it correctly. This +-# is the reason why we need a match for the serial number here. +-# The serial number "42" is used to tag the implementations where ++# Note that there are buggy qemu versions (0.13 & older) which ++# advertise remote wakeup support but don't actually implement ++# it correctly. This is the reason why we need a match for the ++# serial number here. Old, broken versions have serial "1". ++# It has been changed to "42" after fixing the bug to indicate + # remote wakeup is working. +-ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" +-ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" +-ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto" ++ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" ++ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" ++ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" + + # Catch-all for Avocent HID devices. Keyed off interface in order to only + # trigger on HID class devices. +-- +1.7.9.2 + diff --git a/1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch b/1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch new file mode 100644 index 00000000..cd1f72c7 --- /dev/null +++ b/1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch @@ -0,0 +1,29 @@ +Based on 52fb538361053f8c4abce0e40cd0bae3d28ceb16 Mon Sep 17 00:00:00 2001 +From: Tom Hirst +Date: Wed, 25 Jun 2014 11:57:11 +0000 +Subject: [PATCH] rules: don't enable usb pm for Avocent devices + +The Avocent KVM over IP devices doesn't work correctly with USB power +management enabled. +--- + rules/42-usb-hid-pm.rules | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git rules/42-usb-hid-pm.rules rules/42-usb-hid-pm.rules +index c675b5b..4c300da 100644 +--- rules/42-usb-hid-pm.rules ++++ rules/42-usb-hid-pm.rules +@@ -12,10 +12,6 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}!= + ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" + ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto" + +-# Catch-all for Avocent HID devices. Keyed off interface in order to only +-# trigger on HID class devices. +-ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0624", ATTR{bInterfaceClass}=="03", TEST=="../power/control", ATTR{../power/control}="auto" +- + # Dell DRAC 4 + ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="2500", TEST=="power/control", ATTR{power/control}="auto" + +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 0ac93793..72a94b11 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch + 0002-journald-make-MaxFileSec-really-default-to-1month.patch + 0003-units-remove-RefuseManualStart-from-units-which-are-.patch + 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch + 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch + 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch + 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch + ------------------------------------------------------------------- Tue Jul 1 09:58:04 UTC 2014 - werner@suse.de @@ -9,6 +21,8 @@ Tue Jul 1 08:56:48 UTC 2014 - werner@suse.de - Add upstream patches 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch + 1044-rules-update-qemu-hid-rules.patch + 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch ------------------------------------------------------------------- Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index db05c2af..04ba9367 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -609,6 +609,19 @@ Patch297: 0001-core-use-correct-format-string-for-UIDs.patch Patch298: 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch # PATCH-FIX-UPSTREAM added at 2014/06/26 Patch299: 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch300: 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch301: 0002-journald-make-MaxFileSec-really-default-to-1month.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch302: 0003-units-remove-RefuseManualStart-from-units-which-are-.patch +Patch303: 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch304: 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch305: 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch306: 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch # UDEV PATCHES # ============ @@ -702,6 +715,10 @@ Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch Patch1042: 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch # PATCH-FIX-UPSTREAM 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch +# PATCH-FIX-UPSTREAM 1044-rules-update-qemu-hid-rules.patch +Patch1044: 1044-rules-update-qemu-hid-rules.patch +# PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch +Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1159,6 +1176,13 @@ cp %{SOURCE7} m4/ %patch297 -p0 %patch298 -p0 %patch299 -p0 +%patch300 -p0 +%patch301 -p0 +%patch302 -p0 +%patch303 -p0 +%patch304 -p0 +%patch305 -p0 +%patch306 -p0 # udev patches %patch1001 -p1 @@ -1211,6 +1235,8 @@ cp %{SOURCE7} m4/ %patch1042 -p0 %patch1043 -p0 %endif +%patch1044 -p0 +%patch1045 -p0 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 0ac93793..72a94b11 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch + 0002-journald-make-MaxFileSec-really-default-to-1month.patch + 0003-units-remove-RefuseManualStart-from-units-which-are-.patch + 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch + 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch + 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch + 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch + ------------------------------------------------------------------- Tue Jul 1 09:58:04 UTC 2014 - werner@suse.de @@ -9,6 +21,8 @@ Tue Jul 1 08:56:48 UTC 2014 - werner@suse.de - Add upstream patches 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch + 1044-rules-update-qemu-hid-rules.patch + 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch ------------------------------------------------------------------- Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 711d0f1b..6584e032 100644 --- a/systemd.spec +++ b/systemd.spec @@ -604,6 +604,19 @@ Patch297: 0001-core-use-correct-format-string-for-UIDs.patch Patch298: 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch # PATCH-FIX-UPSTREAM added at 2014/06/26 Patch299: 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch300: 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch301: 0002-journald-make-MaxFileSec-really-default-to-1month.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch302: 0003-units-remove-RefuseManualStart-from-units-which-are-.patch +Patch303: 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch304: 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch305: 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 +Patch306: 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch # UDEV PATCHES # ============ @@ -697,6 +710,10 @@ Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch Patch1042: 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch # PATCH-FIX-UPSTREAM 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch +# PATCH-FIX-UPSTREAM 1044-rules-update-qemu-hid-rules.patch +Patch1044: 1044-rules-update-qemu-hid-rules.patch +# PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch +Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1154,6 +1171,13 @@ cp %{SOURCE7} m4/ %patch297 -p0 %patch298 -p0 %patch299 -p0 +%patch300 -p0 +%patch301 -p0 +%patch302 -p0 +%patch303 -p0 +%patch304 -p0 +%patch305 -p0 +%patch306 -p0 # udev patches %patch1001 -p1 @@ -1206,6 +1230,8 @@ cp %{SOURCE7} m4/ %patch1042 -p0 %patch1043 -p0 %endif +%patch1044 -p0 +%patch1045 -p0 # ensure generate files are removed rm -f units/emergency.service From eac2d4db72fc2f1087b07cd5c8a997cd2418ede0f155c7700335175a12ea61ed Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Wed, 2 Jul 2014 18:09:12 +0000 Subject: [PATCH 08/14] Accepting request 239381 from home:rmilasan:branches:Base:System - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch OBS-URL: https://build.opensuse.org/request/show/239381 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=701 --- ...duplicated-rules-with-layer3-interfaces.patch | 16 ++++++++++++++++ systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 34 insertions(+) create mode 100644 1046-fix-duplicated-rules-with-layer3-interfaces.patch diff --git a/1046-fix-duplicated-rules-with-layer3-interfaces.patch b/1046-fix-duplicated-rules-with-layer3-interfaces.patch new file mode 100644 index 00000000..47445a83 --- /dev/null +++ b/1046-fix-duplicated-rules-with-layer3-interfaces.patch @@ -0,0 +1,16 @@ +Index: systemd-210/src/udev/rule_generator/write_net_rules +=================================================================== +--- systemd-210.orig/src/udev/rule_generator/write_net_rules ++++ systemd-210/src/udev/rule_generator/write_net_rules +@@ -101,6 +101,11 @@ if [ "$MATCHDEVID" ]; then + fi + + if [ "$MATCHID" ]; then ++ ID="$(find_all_rules 'KERNELS==' "$MATCHID")" ++ if [ "$ID" == "$MATCHID" ]; then ++ unlock_rules_file ++ exit 0 ++ fi + match="$match, KERNELS==\"$MATCHID\"" + fi + diff --git a/systemd-mini.changes b/systemd-mini.changes index 72a94b11..0621cdac 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com + +- Fix duplicated rules when having layer3 interfaces (bnc#882714). + Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch + ------------------------------------------------------------------- Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 04ba9367..5c2463dd 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -719,6 +719,8 @@ Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch Patch1044: 1044-rules-update-qemu-hid-rules.patch # PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch +# PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714) +Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1237,6 +1239,7 @@ cp %{SOURCE7} m4/ %endif %patch1044 -p0 %patch1045 -p0 +%patch1046 -p1 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 72a94b11..0621cdac 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com + +- Fix duplicated rules when having layer3 interfaces (bnc#882714). + Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch + ------------------------------------------------------------------- Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 6584e032..5aefa075 100644 --- a/systemd.spec +++ b/systemd.spec @@ -714,6 +714,8 @@ Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch Patch1044: 1044-rules-update-qemu-hid-rules.patch # PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch +# PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714) +Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1232,6 +1234,7 @@ cp %{SOURCE7} m4/ %endif %patch1044 -p0 %patch1045 -p0 +%patch1046 -p1 # ensure generate files are removed rm -f units/emergency.service From 5559c7a8321721172b3609a60187b138f87abe867c55c9f3725b962bea0c2a86 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 3 Jul 2014 07:03:56 +0000 Subject: [PATCH 09/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=702 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 2 +- systemd.changes | 5 +++++ systemd.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 0621cdac..1a41b8a8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -4,6 +4,11 @@ Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch +------------------------------------------------------------------- +Tue Jul 1 14:53:44 UTC 2014 - werner@suse.de + +- Require correct pam-config version overall even for scriptlets (bnc#885288) + ------------------------------------------------------------------- Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 5c2463dd..dbc79c61 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -145,7 +145,7 @@ Requires(post): coreutils Requires(post): findutils %endif %if ! 0%{?bootstrap} -Requires(post): pam-config +Requires(post): pam-config >= 0.79-5 %endif Requires(pre): /usr/bin/getent Requires(pre): /usr/sbin/groupadd diff --git a/systemd.changes b/systemd.changes index 0621cdac..1a41b8a8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -4,6 +4,11 @@ Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch +------------------------------------------------------------------- +Tue Jul 1 14:53:44 UTC 2014 - werner@suse.de + +- Require correct pam-config version overall even for scriptlets (bnc#885288) + ------------------------------------------------------------------- Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 5aefa075..bd1a737e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -140,7 +140,7 @@ Requires(post): coreutils Requires(post): findutils %endif %if ! 0%{?bootstrap} -Requires(post): pam-config +Requires(post): pam-config >= 0.79-5 %endif Requires(pre): /usr/bin/getent Requires(pre): /usr/sbin/groupadd From a69e46048010f436a894c65dcc4d406fac2ecf809a771beded6621b88f2b32e7 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 3 Jul 2014 13:01:21 +0000 Subject: [PATCH 10/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=703 --- 0001-parse_uid-return-ENXIO-for-1-uids.patch | 45 +++++++++++ ...ping-strings-don-t-allow-smuggling-i.patch | 74 +++++++++++++++++++ ...onsider-an-unset-model-as-a-wildcard.patch | 39 ++++++++++ ...vent-loop-terminates-explicitly-clos.patch | 27 +++++++ ...idering-UID-0xFFFF-and-0xFFFFFFFF-va.patch | 2 +- ...s-close-a-bus-that-failed-to-connect.patch | 28 +++++++ ...ink-builtin-should-print-the-reason-.patch | 61 +++++++++++++++ systemd-mini.changes | 11 +++ systemd-mini.spec | 19 +++++ systemd.changes | 11 +++ systemd.spec | 19 +++++ 11 files changed, 335 insertions(+), 1 deletion(-) create mode 100644 0001-parse_uid-return-ENXIO-for-1-uids.patch create mode 100644 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch create mode 100644 0003-localed-consider-an-unset-model-as-a-wildcard.patch create mode 100644 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch create mode 100644 0005-bus-close-a-bus-that-failed-to-connect.patch create mode 100644 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch diff --git a/0001-parse_uid-return-ENXIO-for-1-uids.patch b/0001-parse_uid-return-ENXIO-for-1-uids.patch new file mode 100644 index 00000000..bc23d1a9 --- /dev/null +++ b/0001-parse_uid-return-ENXIO-for-1-uids.patch @@ -0,0 +1,45 @@ +From f841a154efbb3162d2a732936f031ac7a6b0d4cf Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Tue, 1 Jul 2014 16:00:05 +0200 +Subject: [PATCH] parse_uid: return -ENXIO for -1 uids + +--- + src/shared/audit.c | 3 --- + src/shared/util.c | 4 ++-- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git src/shared/audit.c src/shared/audit.c +index 5466447..f101050 100644 +--- src/shared/audit.c ++++ src/shared/audit.c +@@ -77,9 +77,6 @@ int audit_loginuid_from_pid(pid_t pid, uid_t *uid) { + if (r < 0) + return r; + +- if (u == (uid_t) -1) +- return -ENXIO; +- + *uid = (uid_t) u; + return 0; + } +diff --git src/shared/util.c src/shared/util.c +index e75f6c9..9b5a47a 100644 +--- src/shared/util.c ++++ src/shared/util.c +@@ -282,11 +282,11 @@ int parse_uid(const char *s, uid_t* ret_uid) { + + /* Some libc APIs use (uid_t) -1 as special placeholder */ + if (uid == (uid_t) 0xFFFFFFFF) +- return -EINVAL; ++ return -ENXIO; + + /* A long time ago UIDs where 16bit, hence explicitly avoid the 16bit -1 too */ + if (uid == (uid_t) 0xFFFF) +- return -EINVAL; ++ return -ENXIO; + + *ret_uid = uid; + return 0; +-- +1.7.9.2 + diff --git a/0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch b/0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch new file mode 100644 index 00000000..b202ce37 --- /dev/null +++ b/0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch @@ -0,0 +1,74 @@ +Based on e0a33e7ba619eb44f732aaf23cb249fa43d0ce8d Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 2 Jul 2014 13:42:25 +0200 +Subject: [PATCH] util: when unescaping strings, don't allow smuggling in of + additional NUL bytes + +Better safe than sorry. +--- + src/shared/util.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git src/shared/util.c src/shared/util.c +index ceafa01..4ad3f20 100644 +--- src/shared/util.c ++++ src/shared/util.c +@@ -1256,7 +1256,7 @@ char *cunescape_length_with_prefix(const char *s, size_t length, const char *pre + a = unhexchar(f[1]); + b = unhexchar(f[2]); + +- if (a < 0 || b < 0) { ++ if (a < 0 || b < 0 || (a == 0 && b == 0)) { + /* Invalid escape code, let's take it literal then */ + *(t++) = '\\'; + *(t++) = 'x'; +@@ -1283,7 +1283,7 @@ char *cunescape_length_with_prefix(const char *s, size_t length, const char *pre + b = unoctchar(f[1]); + c = unoctchar(f[2]); + +- if (a < 0 || b < 0 || c < 0) { ++ if (a < 0 || b < 0 || c < 0 || (a == 0 && b == 0 && c == 0)) { + /* Invalid escape code, let's take it literal then */ + *(t++) = '\\'; + *(t++) = f[0]; +@@ -1566,8 +1566,7 @@ int chvt(int vt) { + + int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { + struct termios old_termios, new_termios; +- char c; +- char line[LINE_MAX]; ++ char c, line[LINE_MAX]; + + assert(f); + assert(ret); +@@ -1604,9 +1603,10 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { + } + } + +- if (t != (usec_t) -1) ++ if (t != (usec_t) -1) { + if (fd_wait_for_event(fileno(f), POLLIN, t) <= 0) + return -ETIMEDOUT; ++ } + + if (!fgets(line, sizeof(line), f)) + return -EIO; +@@ -1624,6 +1624,7 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { + } + + int ask(char *ret, const char *replies, const char *text, ...) { ++ int r; + + assert(ret); + assert(replies); +@@ -1632,7 +1633,6 @@ int ask(char *ret, const char *replies, const char *text, ...) { + for (;;) { + va_list ap; + char c; +- int r; + bool need_nl = true; + + if (on_tty()) +-- +1.7.9.2 + diff --git a/0003-localed-consider-an-unset-model-as-a-wildcard.patch b/0003-localed-consider-an-unset-model-as-a-wildcard.patch new file mode 100644 index 00000000..3fbdb74e --- /dev/null +++ b/0003-localed-consider-an-unset-model-as-a-wildcard.patch @@ -0,0 +1,39 @@ +From 387066c2e5bda159201896b194711965b52f34a9 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Fri, 30 May 2014 18:20:16 +0200 +Subject: [PATCH] localed: consider an unset model as a wildcard + +--- + src/locale/localed.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git src/locale/localed.c src/locale/localed.c +index e3061c8..358f6c2 100644 +--- src/locale/localed.c ++++ src/locale/localed.c +@@ -712,15 +712,16 @@ static int find_legacy_keymap(Context *c, char **new_keymap) { + } + } + +- if (matching > 0 && +- streq_ptr(c->x11_model, a[2])) { +- matching++; +- +- if (streq_ptr(c->x11_variant, a[3])) { ++ if (matching > 0) { ++ if (isempty(c->x11_model) || streq_ptr(c->x11_model, a[2])) { + matching++; + +- if (streq_ptr(c->x11_options, a[4])) ++ if (streq_ptr(c->x11_variant, a[3])) { + matching++; ++ ++ if (streq_ptr(c->x11_options, a[4])) ++ matching++; ++ } + } + } + +-- +1.7.9.2 + diff --git a/0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch b/0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch new file mode 100644 index 00000000..51b46fb4 --- /dev/null +++ b/0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch @@ -0,0 +1,27 @@ +From 7bb4d371af5ec6b8c50b71d2a80c2866d8134d9a Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 2 Jul 2014 17:36:47 +0200 +Subject: [PATCH] sd-bus: when an event loop terminates, explicitly close the + bus + +This makes sure we actually release the bus and all the messages it +references. +--- + src/libsystemd/sd-bus/sd-bus.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git src/libsystemd/sd-bus/sd-bus.c src/libsystemd/sd-bus/sd-bus.c +index d52afe8..eb267d4 100644 +--- src/libsystemd/sd-bus/sd-bus.c ++++ src/libsystemd/sd-bus/sd-bus.c +@@ -2940,6 +2940,7 @@ static int quit_callback(sd_event_source *event, void *userdata) { + assert(event); + + sd_bus_flush(bus); ++ sd_bus_close(bus); + + return 1; + } +-- +1.7.9.2 + diff --git a/0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch b/0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch index f50e568d..23ccc1d5 100644 --- a/0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch +++ b/0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch @@ -19,7 +19,7 @@ index e7ff0f8..1709bb7 100644 + if (uid == (uid_t) 0xFFFFFFFF) + return -EINVAL; + -+ /* A long time ago UIDs where 16bit, hence explicitly avoid the 32bit -1 too */ ++ /* A long time ago UIDs where 16bit, hence explicitly avoid the 16bit -1 too */ + if (uid == (uid_t) 0xFFFF) + return -EINVAL; + diff --git a/0005-bus-close-a-bus-that-failed-to-connect.patch b/0005-bus-close-a-bus-that-failed-to-connect.patch new file mode 100644 index 00000000..9633317f --- /dev/null +++ b/0005-bus-close-a-bus-that-failed-to-connect.patch @@ -0,0 +1,28 @@ +From db9bb83fa5ec72da38eb5bd0c259ef8c76a71858 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Thu, 3 Jul 2014 01:19:21 +0200 +Subject: [PATCH] bus: close a bus that failed to connect + +--- + src/libsystemd/sd-bus/sd-bus.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git src/libsystemd/sd-bus/sd-bus.c src/libsystemd/sd-bus/sd-bus.c +index c25375c..28fc19e 100644 +--- src/libsystemd/sd-bus/sd-bus.c ++++ src/libsystemd/sd-bus/sd-bus.c +@@ -1033,8 +1033,10 @@ _public_ int sd_bus_start(sd_bus *bus) { + else + return -EINVAL; + +- if (r < 0) ++ if (r < 0) { ++ sd_bus_close(bus); + return r; ++ } + + return bus_send_hello(bus); + } +-- +1.7.9.2 + diff --git a/1047-udev-net_setup_link-builtin-should-print-the-reason-.patch b/1047-udev-net_setup_link-builtin-should-print-the-reason-.patch new file mode 100644 index 00000000..47fce280 --- /dev/null +++ b/1047-udev-net_setup_link-builtin-should-print-the-reason-.patch @@ -0,0 +1,61 @@ +From 01d4590b775661ebc71c7b81b0c62ccd69395268 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 2 Jul 2014 15:13:29 +0200 +Subject: [PATCH] udev: net_setup_link builtin should print the reason why + something fails + +Let's tell users what is going wrong. +--- + src/udev/udev-builtin-net_setup_link.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git src/udev/udev-builtin-net_setup_link.c src/udev/udev-builtin-net_setup_link.c +index 3cd384e..6207269 100644 +--- src/udev/udev-builtin-net_setup_link.c ++++ src/udev/udev-builtin-net_setup_link.c +@@ -43,17 +43,17 @@ static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv + r = link_config_get(ctx, dev, &link); + if (r < 0) { + if (r == -ENOENT) { +- log_debug("No matching link configuration found"); ++ log_debug("No matching link configuration found."); + return EXIT_SUCCESS; + } else { +- log_error("Could not get link config"); ++ log_error("Could not get link config: %s", strerror(-r)); + return EXIT_FAILURE; + } + } + + r = link_config_apply(ctx, link, dev, &name); + if (r < 0) { +- log_error("Could not apply link config to %s", udev_device_get_sysname(dev)); ++ log_error("Could not apply link config to %s: %s", udev_device_get_sysname(dev), strerror(-r)); + return EXIT_FAILURE; + } + +@@ -77,18 +77,18 @@ static int builtin_net_setup_link_init(struct udev *udev) { + if (r < 0) + return r; + +- log_debug("Created link configuration context"); ++ log_debug("Created link configuration context."); + return 0; + } + + static void builtin_net_setup_link_exit(struct udev *udev) { + link_config_ctx_free(ctx); + ctx = NULL; +- log_debug("Unloaded link configuration context"); ++ log_debug("Unloaded link configuration context."); + } + + static bool builtin_net_setup_link_validate(struct udev *udev) { +- log_debug("Check if link configuration needs reloading"); ++ log_debug("Check if link configuration needs reloading."); + if (!ctx) + return false; + +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 1a41b8a8..90e46fec 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 3 12:48:27 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-parse_uid-return-ENXIO-for-1-uids.patch + 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch + 0003-localed-consider-an-unset-model-as-a-wildcard.patch + 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch + 0005-bus-close-a-bus-that-failed-to-connect.patch + 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch + ------------------------------------------------------------------- Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index dbc79c61..fe5fc917 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -615,6 +615,7 @@ Patch300: 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch Patch301: 0002-journald-make-MaxFileSec-really-default-to-1month.patch # PATCH-FIX-UPSTREAM added at 2014/07/01 Patch302: 0003-units-remove-RefuseManualStart-from-units-which-are-.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 Patch303: 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch # PATCH-FIX-UPSTREAM added at 2014/07/01 Patch304: 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch @@ -622,6 +623,16 @@ Patch304: 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch Patch305: 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch # PATCH-FIX-UPSTREAM added at 2014/07/01 Patch306: 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch307: 0001-parse_uid-return-ENXIO-for-1-uids.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch308: 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch309: 0003-localed-consider-an-unset-model-as-a-wildcard.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch310: 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch311: 0005-bus-close-a-bus-that-failed-to-connect.patch # UDEV PATCHES # ============ @@ -721,6 +732,8 @@ Patch1044: 1044-rules-update-qemu-hid-rules.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch # PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714) Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch1047: 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1185,6 +1198,11 @@ cp %{SOURCE7} m4/ %patch304 -p0 %patch305 -p0 %patch306 -p0 +%patch307 -p0 +%patch308 -p0 +%patch309 -p0 +%patch310 -p0 +%patch311 -p0 # udev patches %patch1001 -p1 @@ -1240,6 +1258,7 @@ cp %{SOURCE7} m4/ %patch1044 -p0 %patch1045 -p0 %patch1046 -p1 +%patch1047 -p0 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 1a41b8a8..90e46fec 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 3 12:48:27 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-parse_uid-return-ENXIO-for-1-uids.patch + 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch + 0003-localed-consider-an-unset-model-as-a-wildcard.patch + 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch + 0005-bus-close-a-bus-that-failed-to-connect.patch + 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch + ------------------------------------------------------------------- Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index bd1a737e..1927cd59 100644 --- a/systemd.spec +++ b/systemd.spec @@ -610,6 +610,7 @@ Patch300: 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch Patch301: 0002-journald-make-MaxFileSec-really-default-to-1month.patch # PATCH-FIX-UPSTREAM added at 2014/07/01 Patch302: 0003-units-remove-RefuseManualStart-from-units-which-are-.patch +# PATCH-FIX-UPSTREAM added at 2014/07/01 Patch303: 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch # PATCH-FIX-UPSTREAM added at 2014/07/01 Patch304: 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch @@ -617,6 +618,16 @@ Patch304: 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch Patch305: 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch # PATCH-FIX-UPSTREAM added at 2014/07/01 Patch306: 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch307: 0001-parse_uid-return-ENXIO-for-1-uids.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch308: 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch309: 0003-localed-consider-an-unset-model-as-a-wildcard.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch310: 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch311: 0005-bus-close-a-bus-that-failed-to-connect.patch # UDEV PATCHES # ============ @@ -716,6 +727,8 @@ Patch1044: 1044-rules-update-qemu-hid-rules.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch # PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714) Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch +# PATCH-FIX-UPSTREAM added at 2014/07/03 +Patch1047: 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1180,6 +1193,11 @@ cp %{SOURCE7} m4/ %patch304 -p0 %patch305 -p0 %patch306 -p0 +%patch307 -p0 +%patch308 -p0 +%patch309 -p0 +%patch310 -p0 +%patch311 -p0 # udev patches %patch1001 -p1 @@ -1235,6 +1253,7 @@ cp %{SOURCE7} m4/ %patch1044 -p0 %patch1045 -p0 %patch1046 -p1 +%patch1047 -p0 # ensure generate files are removed rm -f units/emergency.service From 153bd884cf14312c33dc3c026367635c66002229e3bf7a093bf38f31dfa8f81d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 4 Jul 2014 10:28:58 +0000 Subject: [PATCH 11/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=704 --- 0001-architecture-Add-tilegx.patch | 56 + ...et_setup_link-add-a-bit-more-logging.patch | 39 + 0002-architecture-Add-cris.patch | 55 + ...pace-fix-uninitialized-memory-access.patch | 28 + 0003-arch-add-crisv32-to-uname-check.patch | 24 + ...ure-tmp-var-tmp-and-dev-are-writable.patch | 34 + ...itecture-remove-cris-from-uname-list.patch | 27 + 0006-hwdb-update.patch | 4392 +++++++++++++++++ ...base-of-Bluetooth-company-identifier.patch | 49 + systemd-mini.changes | 24 + systemd-mini.spec | 27 + systemd.changes | 24 + systemd.spec | 27 + 13 files changed, 4806 insertions(+) create mode 100644 0001-architecture-Add-tilegx.patch create mode 100644 0001-udev-net_setup_link-add-a-bit-more-logging.patch create mode 100644 0002-architecture-Add-cris.patch create mode 100644 0002-namespace-fix-uninitialized-memory-access.patch create mode 100644 0003-arch-add-crisv32-to-uname-check.patch create mode 100644 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch create mode 100644 0004-architecture-remove-cris-from-uname-list.patch create mode 100644 0006-hwdb-update.patch create mode 100644 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch diff --git a/0001-architecture-Add-tilegx.patch b/0001-architecture-Add-tilegx.patch new file mode 100644 index 00000000..277587c3 --- /dev/null +++ b/0001-architecture-Add-tilegx.patch @@ -0,0 +1,56 @@ +From 46eea341c36f0caf0bdd5b2274a1ef7cb4e83e97 Mon Sep 17 00:00:00 2001 +From: Henrik Grindal Bakken +Date: Thu, 27 Feb 2014 21:19:13 +0100 +Subject: [PATCH] architecture: Add tilegx + +Add Tilera's TILE-GX processor family support. +--- + src/shared/architecture.c | 3 +++ + src/shared/architecture.h | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git src/shared/architecture.c src/shared/architecture.c +index ceba492..fcdb3d5 100644 +--- src/shared/architecture.c ++++ src/shared/architecture.c +@@ -112,6 +112,8 @@ Architecture uname_architecture(void) { + { "sh", ARCHITECTURE_SH }, + #elif defined(__m68k__) + { "m68k", ARCHITECTURE_M68K }, ++#elif defined(__tilegx__) ++ { "tilegx", ARCHITECTURE_TILEGX }, + #else + #error "Please register your architecture here!" + #endif +@@ -158,6 +160,7 @@ static const char *const architecture_table[_ARCHITECTURE_MAX] = { + [ARCHITECTURE_SH] = "sh", + [ARCHITECTURE_SH64] = "sh64", + [ARCHITECTURE_M68K] = "m68k", ++ [ARCHITECTURE_TILEGX] = "tilegx", + }; + + DEFINE_STRING_TABLE_LOOKUP(architecture, Architecture); +diff --git src/shared/architecture.h src/shared/architecture.h +index 3183645..e589a91 100644 +--- src/shared/architecture.h ++++ src/shared/architecture.h +@@ -47,6 +47,7 @@ typedef enum Architecture { + ARCHITECTURE_SH, + ARCHITECTURE_SH64, + ARCHITECTURE_M68K, ++ ARCHITECTURE_TILEGX, + _ARCHITECTURE_MAX, + _ARCHITECTURE_INVALID = -1 + } Architecture; +@@ -107,6 +108,8 @@ Architecture uname_architecture(void); + # define native_architecture() ARCHITECTURE_SH + #elif defined(__m68k__) + # define native_architecture() ARCHITECTURE_M68K ++#elif defined(__tilegx__) ++# define native_architecture() ARCHITECTURE_TILEGX + #else + #error "Please register your architecture here!" + #endif +-- +1.7.9.2 + diff --git a/0001-udev-net_setup_link-add-a-bit-more-logging.patch b/0001-udev-net_setup_link-add-a-bit-more-logging.patch new file mode 100644 index 00000000..740e3c36 --- /dev/null +++ b/0001-udev-net_setup_link-add-a-bit-more-logging.patch @@ -0,0 +1,39 @@ +From 866ee3682213789f85b877700457fdca05695a0e Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Thu, 3 Jul 2014 09:57:27 +0200 +Subject: [PATCH] udev: net_setup_link - add a bit more logging + +--- + src/udev/net/link-config.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git src/udev/net/link-config.c src/udev/net/link-config.c +index 7a9d01b..b8650a6 100644 +--- src/udev/net/link-config.c ++++ src/udev/net/link-config.c +@@ -92,14 +92,20 @@ static int link_config_ctx_connect(link_config_ctx *ctx) { + + if (ctx->ethtool_fd == -1) { + r = ethtool_connect(&ctx->ethtool_fd); +- if (r < 0) ++ if (r < 0) { ++ log_warning("link_config: could not connect to ethtool: %s", ++ strerror(-r)); + return r; ++ } + } + + if (!ctx->rtnl) { + r = sd_rtnl_open(&ctx->rtnl, 0); +- if (r < 0) ++ if (r < 0) { ++ log_warning("link_config: could not connect to rtnl: %s", ++ strerror(-r)); + return r; ++ } + } + + return 0; +-- +1.7.9.2 + diff --git a/0002-architecture-Add-cris.patch b/0002-architecture-Add-cris.patch new file mode 100644 index 00000000..a93d29d9 --- /dev/null +++ b/0002-architecture-Add-cris.patch @@ -0,0 +1,55 @@ +From 86bafac9540ba9e111ccba2fdf4161fe3a67cd3b Mon Sep 17 00:00:00 2001 +From: Umut Tezduyar Lindskog +Date: Tue, 4 Mar 2014 13:58:35 +0100 +Subject: [PATCH] architecture: Add cris + +--- + src/shared/architecture.c | 3 +++ + src/shared/architecture.h | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git src/shared/architecture.c src/shared/architecture.c +index fcdb3d5..9e0c3ef 100644 +--- src/shared/architecture.c ++++ src/shared/architecture.c +@@ -114,6 +114,8 @@ Architecture uname_architecture(void) { + { "m68k", ARCHITECTURE_M68K }, + #elif defined(__tilegx__) + { "tilegx", ARCHITECTURE_TILEGX }, ++#elif defined(__cris__) ++ { "cris", ARCHITECTURE_CRIS }, + #else + #error "Please register your architecture here!" + #endif +@@ -161,6 +163,7 @@ static const char *const architecture_table[_ARCHITECTURE_MAX] = { + [ARCHITECTURE_SH64] = "sh64", + [ARCHITECTURE_M68K] = "m68k", + [ARCHITECTURE_TILEGX] = "tilegx", ++ [ARCHITECTURE_CRIS] = "cris", + }; + + DEFINE_STRING_TABLE_LOOKUP(architecture, Architecture); +diff --git src/shared/architecture.h src/shared/architecture.h +index e589a91..20e848b 100644 +--- src/shared/architecture.h ++++ src/shared/architecture.h +@@ -48,6 +48,7 @@ typedef enum Architecture { + ARCHITECTURE_SH64, + ARCHITECTURE_M68K, + ARCHITECTURE_TILEGX, ++ ARCHITECTURE_CRIS, + _ARCHITECTURE_MAX, + _ARCHITECTURE_INVALID = -1 + } Architecture; +@@ -110,6 +111,8 @@ Architecture uname_architecture(void); + # define native_architecture() ARCHITECTURE_M68K + #elif defined(__tilegx__) + # define native_architecture() ARCHITECTURE_TILEGX ++#elif defined(__cris__) ++# define native_architecture() ARCHITECTURE_CRIS + #else + #error "Please register your architecture here!" + #endif +-- +1.7.9.2 + diff --git a/0002-namespace-fix-uninitialized-memory-access.patch b/0002-namespace-fix-uninitialized-memory-access.patch new file mode 100644 index 00000000..bb6ea8ea --- /dev/null +++ b/0002-namespace-fix-uninitialized-memory-access.patch @@ -0,0 +1,28 @@ +Based on 002b226843e77630128da580225f9c3ef8474db2 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Thu, 3 Jul 2014 16:27:53 +0200 +Subject: [PATCH] namespace: fix uninitialized memory access + +--- + src/core/namespace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- src/core/namespace.c ++++ src/core/namespace.c 2014-07-04 00:00:00.000000000 +0000 +@@ -68,6 +68,7 @@ static int append_mounts(BindMount **p, + STRV_FOREACH(i, strv) { + + (*p)->ignore = false; ++ (*p)->done = false; + + if ((mode == INACCESSIBLE || mode == READONLY) && (*i)[0] == '-') { + (*p)->ignore = true; +@@ -298,7 +299,7 @@ int setup_namespace( + private_dev; + + if (n > 0) { +- m = mounts = (BindMount *) alloca(n * sizeof(BindMount)); ++ m = mounts = (BindMount *) alloca0(n * sizeof(BindMount)); + r = append_mounts(&m, read_write_dirs, READWRITE); + if (r < 0) + return r; diff --git a/0003-arch-add-crisv32-to-uname-check.patch b/0003-arch-add-crisv32-to-uname-check.patch new file mode 100644 index 00000000..c8a9e7f3 --- /dev/null +++ b/0003-arch-add-crisv32-to-uname-check.patch @@ -0,0 +1,24 @@ +From 9b3a0ba3e9e28382a1072bf0e2c07a3661432743 Mon Sep 17 00:00:00 2001 +From: Umut Tezduyar Lindskog +Date: Thu, 3 Jul 2014 09:54:45 +0200 +Subject: [PATCH] arch: add crisv32 to uname check + +--- + src/shared/architecture.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git src/shared/architecture.c src/shared/architecture.c +index 9e0c3ef..7dd049a 100644 +--- src/shared/architecture.c ++++ src/shared/architecture.c +@@ -116,6 +116,7 @@ Architecture uname_architecture(void) { + { "tilegx", ARCHITECTURE_TILEGX }, + #elif defined(__cris__) + { "cris", ARCHITECTURE_CRIS }, ++ { "crisv32", ARCHITECTURE_CRIS }, + #else + #error "Please register your architecture here!" + #endif +-- +1.7.9.2 + diff --git a/0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch b/0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch new file mode 100644 index 00000000..a8e538e2 --- /dev/null +++ b/0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch @@ -0,0 +1,34 @@ +Based on 664064d60c36e1f62c7e9177e4c7498035467e07 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Thu, 3 Jul 2014 16:27:57 +0200 +Subject: [PATCH] namespace: make sure /tmp, /var/tmp and /dev are writable in + namespaces we set up + +--- + src/core/namespace.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +--- src/core/namespace.c ++++ src/core/namespace.c 2014-07-04 09:55:21.582234949 +0000 +@@ -263,14 +263,17 @@ static int make_read_only(BindMount *m) + + assert(m); + +- if (m->mode != INACCESSIBLE && m->mode != READONLY) +- return 0; ++ if (IN_SET(m->mode, INACCESSIBLE, READONLY)) ++ r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL); ++ else if (IN_SET(m->mode, READWRITE, PRIVATE_TMP, PRIVATE_VAR_TMP, PRIVATE_DEV)) ++ r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_REC, NULL); ++ else ++ r = 0; + +- r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL); + if (r < 0 && !(m->ignore && errno == ENOENT)) + return -errno; + +- return 0; ++ return r; + } + + int setup_namespace( diff --git a/0004-architecture-remove-cris-from-uname-list.patch b/0004-architecture-remove-cris-from-uname-list.patch new file mode 100644 index 00000000..dc1aa466 --- /dev/null +++ b/0004-architecture-remove-cris-from-uname-list.patch @@ -0,0 +1,27 @@ +From bc4bc52bc3de56405045b0437e145a7067fb085d Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Thu, 3 Jul 2014 22:52:44 +0200 +Subject: [PATCH] architecture: remove "cris" from uname list + +the only correct name appears to be "crisv32"... + +http://lists.freedesktop.org/archives/systemd-devel/2014-July/020899.html +--- + src/shared/architecture.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git src/shared/architecture.c src/shared/architecture.c +index 7dd049a..6cdca4e 100644 +--- src/shared/architecture.c ++++ src/shared/architecture.c +@@ -115,7 +115,6 @@ Architecture uname_architecture(void) { + #elif defined(__tilegx__) + { "tilegx", ARCHITECTURE_TILEGX }, + #elif defined(__cris__) +- { "cris", ARCHITECTURE_CRIS }, + { "crisv32", ARCHITECTURE_CRIS }, + #else + #error "Please register your architecture here!" +-- +1.7.9.2 + diff --git a/0006-hwdb-update.patch b/0006-hwdb-update.patch new file mode 100644 index 00000000..080bd96c --- /dev/null +++ b/0006-hwdb-update.patch @@ -0,0 +1,4392 @@ +From 98be1a746ac0d7a17e69ccb05936a4d6b3223e97 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 3 Jul 2014 16:28:40 +0200 +Subject: [PATCH] hwdb: update + +--- + hwdb/20-OUI.hwdb | 543 +++++++++++++++++++-- + hwdb/20-pci-classes.hwdb | 27 ++ + hwdb/20-pci-vendor-model.hwdb | 1071 +++++++++++++++++++++++++++-------------- + hwdb/20-usb-classes.hwdb | 3 + + hwdb/20-usb-vendor-model.hwdb | 102 +++- + 5 files changed, 1362 insertions(+), 384 deletions(-) + +diff --git hwdb/20-OUI.hwdb hwdb/20-OUI.hwdb +index 6188bfc..97f1e6b 100644 +--- hwdb/20-OUI.hwdb ++++ hwdb/20-OUI.hwdb +@@ -6446,7 +6446,7 @@ OUI:0050C2871* + ID_OUI_FROM_DATABASE=R-S-I Elektrotechnik GmbH & Co. KG + + OUI:0050C2872* +- ID_OUI_FROM_DATABASE=Oliotalo - Objecthouse Oy ++ ID_OUI_FROM_DATABASE=Oliotalo Oy + + OUI:0050C2873* + ID_OUI_FROM_DATABASE=XRONET Corporation +@@ -37139,76 +37139,76 @@ OUI:001EC7* + ID_OUI_FROM_DATABASE=2Wire, Inc. + + OUI:001EC8* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Rapid Mobile (Pty) Ltd + + OUI:001EC9* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Dell Inc + + OUI:001ECA* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Nortel + + OUI:001ECB* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE="RPC "Energoautomatika" Ltd + + OUI:001ECC* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=CDVI + + OUI:001ECD* + ID_OUI_FROM_DATABASE=KYLAND Technology Co. LTD + + OUI:001ECE* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=BISA Technologies (Hong Kong) Limited + + OUI:001ECF* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=PHILIPS ELECTRONICS UK LTD + + OUI:001ED0* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Ingespace + + OUI:001ED1* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Keyprocessor B.V. + + OUI:001ED2* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Ray Shine Video Technology Inc + + OUI:001ED3* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Dot Technology Int'l Co., Ltd. + + OUI:001ED4* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Doble Engineering + + OUI:001ED5* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Tekon-Automatics + + OUI:001ED6* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Alentec & Orion AB + + OUI:001ED7* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=H-Stream Wireless, Inc. + + OUI:001ED8* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Digital United Inc. + + OUI:001ED9* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Mitsubishi Precision Co.,LTd. + + OUI:001EDA* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Wesemann Elektrotechniek B.V. + + OUI:001EDB* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Giken Trastem Co., Ltd. + + OUI:001EDC* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Sony Ericsson Mobile Communications AB + + OUI:001EDD* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=WASKO S.A. + + OUI:001EDE* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=BYD COMPANY LIMITED + + OUI:001EDF* +- ID_OUI_FROM_DATABASE=2Wire, Inc. ++ ID_OUI_FROM_DATABASE=Master Industrialization Center Kista + + OUI:001EE0* + ID_OUI_FROM_DATABASE=Urmet Domus SpA +@@ -45800,7 +45800,7 @@ OUI:0050F8* + ID_OUI_FROM_DATABASE=ENTREGA TECHNOLOGIES, INC. + + OUI:0050F9* +- ID_OUI_FROM_DATABASE=SENSORMATIC ACD ++ ID_OUI_FROM_DATABASE=Sensormatic Electronics LLC + + OUI:0050FA* + ID_OUI_FROM_DATABASE=OXTEL, LTD. +@@ -45829,6 +45829,9 @@ OUI:0054AF* + OUI:005907* + ID_OUI_FROM_DATABASE=LenovoEMC Products USA, LLC + ++OUI:005A39* ++ ID_OUI_FROM_DATABASE=SHENZHEN FAST TECHNOLOGIES CO., LTD. ++ + OUI:005CB1* + ID_OUI_FROM_DATABASE=Gospell DIGITAL TECHNOLOGY CO., LTD + +@@ -46603,6 +46606,9 @@ OUI:0060FE* + OUI:0060FF* + ID_OUI_FROM_DATABASE=QuVis, Inc. + ++OUI:006171* ++ ID_OUI_FROM_DATABASE=Apple ++ + OUI:006440* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + +@@ -48238,6 +48244,9 @@ OUI:009C02* + OUI:009D8E* + ID_OUI_FROM_DATABASE=CARDIAC RECORDERS, INC. + ++OUI:009EC8* ++ ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronic Products Co., Ltd. ++ + OUI:00A000* + ID_OUI_FROM_DATABASE=CENTILLION NETWORKS, INC. + +@@ -50740,6 +50749,9 @@ OUI:00D38D* + OUI:00D632* + ID_OUI_FROM_DATABASE=GE Energy + ++OUI:00D9D1* ++ ID_OUI_FROM_DATABASE=Sony Computer Entertainment Inc. ++ + OUI:00DB1E* + ID_OUI_FROM_DATABASE=Albedo Telecom SL + +@@ -51778,6 +51790,9 @@ OUI:0462D7* + OUI:0463E0* + ID_OUI_FROM_DATABASE=Nome Oy + ++OUI:046785* ++ ID_OUI_FROM_DATABASE=scemtec Hard- und Software fuer Mess- und Steuerungstechnik GmbH ++ + OUI:046D42* + ID_OUI_FROM_DATABASE=Bryston Ltd. + +@@ -51901,6 +51916,9 @@ OUI:04DB8A* + OUI:04DD4C* + ID_OUI_FROM_DATABASE=Velocytech + ++OUI:04DEDB* ++ ID_OUI_FROM_DATABASE=Rockport Networks Inc ++ + OUI:04DF69* + ID_OUI_FROM_DATABASE=Car Connectivity Consortium + +@@ -52498,6 +52516,9 @@ OUI:083F76* + OUI:084027* + ID_OUI_FROM_DATABASE=Gridstore Inc. + ++OUI:084656* ++ ID_OUI_FROM_DATABASE=VODALYS Ingénierie ++ + OUI:08482C* + ID_OUI_FROM_DATABASE=Raycore Taiwan Co., LTD. + +@@ -52966,6 +52987,9 @@ OUI:0CCDD3* + OUI:0CCDFB* + ID_OUI_FROM_DATABASE=EDIC Systems Inc. + ++OUI:0CCFD1* ++ ID_OUI_FROM_DATABASE=SPRINGWAVE Co., Ltd ++ + OUI:0CD292* + ID_OUI_FROM_DATABASE=Intel Corporate + +@@ -53089,6 +53113,9 @@ OUI:1010B6* + OUI:101212* + ID_OUI_FROM_DATABASE=Vivo International Corporation Pty Ltd + ++OUI:101218* ++ ID_OUI_FROM_DATABASE=Korins Inc. ++ + OUI:101248* + ID_OUI_FROM_DATABASE=ITG, Inc. + +@@ -53128,6 +53155,9 @@ OUI:102D96* + OUI:102EAF* + ID_OUI_FROM_DATABASE=Texas Instruments + ++OUI:102F6B* ++ ID_OUI_FROM_DATABASE=Microsoft Corporation ++ + OUI:103047* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -53164,6 +53194,9 @@ OUI:104780* + OUI:1048B1* + ID_OUI_FROM_DATABASE=Beijing Duokan Technology Limited + ++OUI:104B46* ++ ID_OUI_FROM_DATABASE=Mitsubishi Electric Corporation ++ + OUI:104D77* + ID_OUI_FROM_DATABASE=Innovative Computer Engineering + +@@ -53242,6 +53275,9 @@ OUI:10880F* + OUI:1088CE* + ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Tech.Co.,Ltd. + ++OUI:108A1B* ++ ID_OUI_FROM_DATABASE=RAONIX Inc. ++ + OUI:108CCF* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + +@@ -53458,6 +53494,9 @@ OUI:144319* + OUI:1446E4* + ID_OUI_FROM_DATABASE=AVISTEL + ++OUI:14488B* ++ ID_OUI_FROM_DATABASE=Shenzhen Doov Technology Co.,Ltd ++ + OUI:144978* + ID_OUI_FROM_DATABASE=Digital Control Incorporated + +@@ -53473,6 +53512,9 @@ OUI:145412* + OUI:145645* + ID_OUI_FROM_DATABASE=Savitech Corp. + ++OUI:1458D0* ++ ID_OUI_FROM_DATABASE=Hewlett Packard ++ + OUI:145A05* + ID_OUI_FROM_DATABASE=Apple + +@@ -53608,6 +53650,9 @@ OUI:14EB33* + OUI:14EDA5* + ID_OUI_FROM_DATABASE=Wächter GmbH Sicherheitssysteme + ++OUI:14EDE4* ++ ID_OUI_FROM_DATABASE=Kaiam Corporation ++ + OUI:14EE9D* + ID_OUI_FROM_DATABASE=AirNav Systems LLC + +@@ -53794,6 +53839,9 @@ OUI:1867B0* + OUI:186D99* + ID_OUI_FROM_DATABASE=Adanis Inc. + ++OUI:187117* ++ ID_OUI_FROM_DATABASE=eta plus electronic gmbh ++ + OUI:1879A2* + ID_OUI_FROM_DATABASE=GMJ ELECTRIC LIMITED + +@@ -53812,6 +53860,9 @@ OUI:1880CE* + OUI:1880F5* + ID_OUI_FROM_DATABASE=Alcatel-Lucent Shanghai Bell Co., Ltd + ++OUI:188219* ++ ID_OUI_FROM_DATABASE=Alibaba Cloud Computing Ltd. ++ + OUI:188331* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -53857,6 +53908,9 @@ OUI:189EFC* + OUI:18A905* + ID_OUI_FROM_DATABASE=Hewlett-Packard Company + ++OUI:18A958* ++ ID_OUI_FROM_DATABASE=PROVISION THAI CO., LTD. ++ + OUI:18A99B* + ID_OUI_FROM_DATABASE=Dell Inc + +@@ -54049,6 +54103,9 @@ OUI:1C43EC* + OUI:1C4593* + ID_OUI_FROM_DATABASE=Texas Instruments + ++OUI:1C4840* ++ ID_OUI_FROM_DATABASE=IMS Messsysteme GmbH ++ + OUI:1C48F9* + ID_OUI_FROM_DATABASE=GN Netcom A/S + +@@ -54064,6 +54121,9 @@ OUI:1C4BD6* + OUI:1C51B5* + ID_OUI_FROM_DATABASE=Techaya LTD + ++OUI:1C5216* ++ ID_OUI_FROM_DATABASE=DONGGUAN HELE ELECTRONICS CO., LTD ++ + OUI:1C52D6* + ID_OUI_FROM_DATABASE=FLAT DISPLAY TECHNOLOGY CORPORATION + +@@ -54100,6 +54160,9 @@ OUI:1C66AA* + OUI:1C69A5* + ID_OUI_FROM_DATABASE=Research In Motion + ++OUI:1C6A7A* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:1C6BCA* + ID_OUI_FROM_DATABASE=Mitsunami Co., Ltd. + +@@ -54163,6 +54226,12 @@ OUI:1C973D* + OUI:1C994C* + ID_OUI_FROM_DATABASE=Murata Manufactuaring Co.,Ltd. + ++OUI:1C9C26* ++ ID_OUI_FROM_DATABASE=Zoovel Technologies ++ ++OUI:1CA2B1* ++ ID_OUI_FROM_DATABASE=ruwido austria gmbh ++ + OUI:1CA770* + ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT + +@@ -54217,6 +54286,9 @@ OUI:1CC63C* + OUI:1CD40C* + ID_OUI_FROM_DATABASE=Kriwan Industrie-Elektronik GmbH + ++OUI:1CDEA7* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:1CDF0F* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + +@@ -54286,6 +54358,9 @@ OUI:20107A* + OUI:201257* + ID_OUI_FROM_DATABASE=Most Lucky Trading Ltd + ++OUI:2012D5* ++ ID_OUI_FROM_DATABASE=Scientech Materials Corporation ++ + OUI:2013E0* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -54370,6 +54445,9 @@ OUI:205A00* + OUI:205B5E* + ID_OUI_FROM_DATABASE=Shenzhen Wonhe Technology Co., Ltd + ++OUI:205CFA* ++ ID_OUI_FROM_DATABASE=Yangzhou ChangLian Network Technology Co,ltd. ++ + OUI:206432* + ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO MECHANICS CO.,LTD. + +@@ -54439,6 +54517,9 @@ OUI:20A2E7* + OUI:20A787* + ID_OUI_FROM_DATABASE=Bointec Taiwan Corporation Limited + ++OUI:20A99B* ++ ID_OUI_FROM_DATABASE=Microsoft Corporation ++ + OUI:20AA25* + ID_OUI_FROM_DATABASE=IP-NET LLC + +@@ -54469,6 +54550,9 @@ OUI:20BFDB* + OUI:20C1AF* + ID_OUI_FROM_DATABASE=i Wit Digital Co., Limited + ++OUI:20C38F* ++ ID_OUI_FROM_DATABASE=Texas Instruments Inc ++ + OUI:20C60D* + ID_OUI_FROM_DATABASE=Shanghai annijie Information technology Co.,LTD + +@@ -54616,6 +54700,9 @@ OUI:2437EF* + OUI:243C20* + ID_OUI_FROM_DATABASE=Dynamode Group + ++OUI:2442BC* ++ ID_OUI_FROM_DATABASE=Alinco,incorporated ++ + OUI:244597* + ID_OUI_FROM_DATABASE=GEMUE Gebr. Mueller Apparatebau + +@@ -55027,6 +55114,9 @@ OUI:28A241* + OUI:28A574* + ID_OUI_FROM_DATABASE=Miller Electric Mfg. Co. + ++OUI:28A5EE* ++ ID_OUI_FROM_DATABASE=Shenzhen SDGI CATV Co., Ltd ++ + OUI:28AF0A* + ID_OUI_FROM_DATABASE=Sirius XM Radio Inc + +@@ -55177,6 +55267,9 @@ OUI:2C0033* + OUI:2C00F7* + ID_OUI_FROM_DATABASE=XOS + ++OUI:2C010B* ++ ID_OUI_FROM_DATABASE=NASCENT Technology, LLC - RemKon ++ + OUI:2C0623* + ID_OUI_FROM_DATABASE=Win Leader Inc. + +@@ -55192,6 +55285,9 @@ OUI:2C18AE* + OUI:2C1984* + ID_OUI_FROM_DATABASE=IDN Telecom, Inc. + ++OUI:2C1A31* ++ ID_OUI_FROM_DATABASE=Electronics Company Limited ++ + OUI:2C1EEA* + ID_OUI_FROM_DATABASE=AERODEV + +@@ -55369,6 +55465,9 @@ OUI:2C9EFC* + OUI:2CA157* + ID_OUI_FROM_DATABASE=acromate, Inc. + ++OUI:2CA30E* ++ ID_OUI_FROM_DATABASE=POWER DRAGON DEVELOPMENT LIMITED ++ + OUI:2CA780* + ID_OUI_FROM_DATABASE=True Technologies Inc. + +@@ -55540,6 +55639,9 @@ OUI:303EAD* + OUI:304174* + ID_OUI_FROM_DATABASE=ALTEC LANSING LLC + ++OUI:304225* ++ ID_OUI_FROM_DATABASE=BURG-WÄCHTER KG ++ + OUI:304449* + ID_OUI_FROM_DATABASE=PLATH GmbH + +@@ -55603,6 +55705,9 @@ OUI:306E5C* + OUI:3071B2* + ID_OUI_FROM_DATABASE=Hangzhou Prevail Optoelectronic Equipment Co.,LTD. + ++OUI:307512* ++ ID_OUI_FROM_DATABASE=Sony Mobile Communications AB ++ + OUI:30766F* + ID_OUI_FROM_DATABASE=LG Electronics + +@@ -55735,6 +55840,9 @@ OUI:3400A3* + OUI:340286* + ID_OUI_FROM_DATABASE=Intel Corporate + ++OUI:34029B* ++ ID_OUI_FROM_DATABASE=CloudBerry Technologies Private Limited ++ + OUI:3407FB* + ID_OUI_FROM_DATABASE=Ericsson AB + +@@ -55774,6 +55882,9 @@ OUI:3423BA* + OUI:34255D* + ID_OUI_FROM_DATABASE=Shenzhen Loadcom Technology Co.,Ltd + ++OUI:3428F0* ++ ID_OUI_FROM_DATABASE=ATN International Limited ++ + OUI:3429EA* + ID_OUI_FROM_DATABASE=MCD ELECTRONICS SP. Z O.O. + +@@ -55798,6 +55909,9 @@ OUI:344B3D* + OUI:344B50* + ID_OUI_FROM_DATABASE=ZTE Corporation + ++OUI:344DF7* ++ ID_OUI_FROM_DATABASE=LG Electronics ++ + OUI:344F3F* + ID_OUI_FROM_DATABASE=IO-Power Technology Co., Ltd. + +@@ -55825,6 +55939,9 @@ OUI:345D10* + OUI:346178* + ID_OUI_FROM_DATABASE=The Boeing Company + ++OUI:346288* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:34684A* + ID_OUI_FROM_DATABASE=Teraworks Co., Ltd. + +@@ -55939,6 +56056,9 @@ OUI:34B1F7* + OUI:34B571* + ID_OUI_FROM_DATABASE=PLDS + ++OUI:34B7FD* ++ ID_OUI_FROM_DATABASE=Guangzhou Younghead Electronic Technology Co.,Ltd ++ + OUI:34BA51* + ID_OUI_FROM_DATABASE=Se-Kure Controls, Inc. + +@@ -56047,6 +56167,9 @@ OUI:34F39B* + OUI:34F62D* + ID_OUI_FROM_DATABASE=SHARP Corporation + ++OUI:34F6D2* ++ ID_OUI_FROM_DATABASE=Panasonic Taiwan Co.,Ltd. ++ + OUI:34F968* + ID_OUI_FROM_DATABASE=ATEK Products, LLC + +@@ -56062,6 +56185,9 @@ OUI:380197* + OUI:3806B4* + ID_OUI_FROM_DATABASE=A.D.C. GmbH + ++OUI:3808FD* ++ ID_OUI_FROM_DATABASE=Silca Spa ++ + OUI:380A0A* + ID_OUI_FROM_DATABASE=Sky-City Communication and Electronics Limited Company + +@@ -56137,6 +56263,9 @@ OUI:384608* + OUI:38484C* + ID_OUI_FROM_DATABASE=Apple + ++OUI:384B76* ++ ID_OUI_FROM_DATABASE=AIRTAME ApS ++ + OUI:384FF0* + ID_OUI_FROM_DATABASE=Azurewave Technologies, Inc. + +@@ -56227,6 +56356,9 @@ OUI:38AA3C* + OUI:38B12D* + ID_OUI_FROM_DATABASE=Sonotronic Nagel GmbH + ++OUI:38B1DB* ++ ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. ++ + OUI:38B5BD* + ID_OUI_FROM_DATABASE=E.G.O. Elektro-Ger + +@@ -56302,6 +56434,9 @@ OUI:38EE9D* + OUI:38F098* + ID_OUI_FROM_DATABASE=Vapor Stone Rail Systems + ++OUI:38F33F* ++ ID_OUI_FROM_DATABASE=TATSUNO CORPORATION ++ + OUI:38F597* + ID_OUI_FROM_DATABASE=home2net GmbH + +@@ -56443,6 +56578,9 @@ OUI:3C57D5* + OUI:3C5A37* + ID_OUI_FROM_DATABASE=Samsung Electronics + ++OUI:3C5AB4* ++ ID_OUI_FROM_DATABASE=Google ++ + OUI:3C5F01* + ID_OUI_FROM_DATABASE=Synerchip Co., Ltd. + +@@ -56803,6 +56941,9 @@ OUI:407074* + OUI:407496* + ID_OUI_FROM_DATABASE=aFUN TECHNOLOGY INC. + ++OUI:40786A* ++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC ++ + OUI:407875* + ID_OUI_FROM_DATABASE=IMBEL - Industria de Material Belico do Brasil + +@@ -56929,6 +57070,9 @@ OUI:40D40E* + OUI:40D559* + ID_OUI_FROM_DATABASE=MICRO S.E.R.I. + ++OUI:40E230* ++ ID_OUI_FROM_DATABASE=AzureWave Technologies, Inc. ++ + OUI:40E730* + ID_OUI_FROM_DATABASE=DEY Storage Systems, Inc. + +@@ -57145,6 +57289,9 @@ OUI:4486C1* + OUI:4487FC* + ID_OUI_FROM_DATABASE=ELITEGROUP COMPUTER SYSTEM CO., LTD. + ++OUI:4488CB* ++ ID_OUI_FROM_DATABASE=Camco Technologies NV ++ + OUI:448A5B* + ID_OUI_FROM_DATABASE=Micro-Star INT'L CO., LTD. + +@@ -57337,6 +57484,9 @@ OUI:4851B7* + OUI:485261* + ID_OUI_FROM_DATABASE=SOREEL + ++OUI:4857DD* ++ ID_OUI_FROM_DATABASE=Facebook ++ + OUI:485929* + ID_OUI_FROM_DATABASE=LG Electronics + +@@ -57361,6 +57511,9 @@ OUI:4861A3* + OUI:486276* + ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD + ++OUI:486B2C* ++ ID_OUI_FROM_DATABASE=BBK Electronics Corp., Ltd., ++ + OUI:486B91* + ID_OUI_FROM_DATABASE=Fleetwood Group Inc. + +@@ -57391,6 +57544,9 @@ OUI:4891F6* + OUI:489BE2* + ID_OUI_FROM_DATABASE=SCI Innovations Ltd + ++OUI:489D18* ++ ID_OUI_FROM_DATABASE=Flashbay Limited ++ + OUI:489D24* + ID_OUI_FROM_DATABASE=Research In Motion + +@@ -57655,6 +57811,9 @@ OUI:4C7367* + OUI:4C73A5* + ID_OUI_FROM_DATABASE=KOVE + ++OUI:4C7403* ++ ID_OUI_FROM_DATABASE=Mundo Reader (bq) ++ + OUI:4C774F* + ID_OUI_FROM_DATABASE=Embedded Wireless Labs + +@@ -57745,6 +57904,9 @@ OUI:4CBAA3* + OUI:4CBB58* + ID_OUI_FROM_DATABASE=Chicony Electronics Co., Ltd. + ++OUI:4CBC42* ++ ID_OUI_FROM_DATABASE=Shenzhen Hangsheng Electronics Co.,Ltd. ++ + OUI:4CBCA5* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -57784,6 +57946,9 @@ OUI:4CE1BB* + OUI:4CE676* + ID_OUI_FROM_DATABASE=Buffalo Inc. + ++OUI:4CE933* ++ ID_OUI_FROM_DATABASE=RailComm, LLC ++ + OUI:4CEB42* + ID_OUI_FROM_DATABASE=Intel Corporate + +@@ -57799,6 +57964,9 @@ OUI:4CF2BF* + OUI:4CF45B* + ID_OUI_FROM_DATABASE=Blue Clover Devices + ++OUI:4CF5A0* ++ ID_OUI_FROM_DATABASE=Scalable Network Technologies Inc ++ + OUI:4CF737* + ID_OUI_FROM_DATABASE=SamJi Electronics Co., Ltd + +@@ -57823,6 +57991,9 @@ OUI:500E6D* + OUI:5011EB* + ID_OUI_FROM_DATABASE=SilverNet Ltd + ++OUI:5014B5* ++ ID_OUI_FROM_DATABASE=Richfit Information Technology Co., Ltd ++ + OUI:5017FF* + ID_OUI_FROM_DATABASE=Cisco + +@@ -57847,6 +58018,9 @@ OUI:502690* + OUI:5027C7* + ID_OUI_FROM_DATABASE=TECHNART Co.,Ltd + ++OUI:50294D* ++ ID_OUI_FROM_DATABASE=NANJING IOT SENSOR TECHNOLOGY CO,LTD ++ + OUI:502A7E* + ID_OUI_FROM_DATABASE=Smart electronic GmbH + +@@ -57937,6 +58111,9 @@ OUI:506441* + OUI:506787* + ID_OUI_FROM_DATABASE=iTellus + ++OUI:5067AE* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:5067F0* + ID_OUI_FROM_DATABASE=ZyXEL Communications Corporation + +@@ -58276,6 +58453,9 @@ OUI:549B12* + OUI:549D85* + ID_OUI_FROM_DATABASE=EnerAccess inc + ++OUI:549F35* ++ ID_OUI_FROM_DATABASE=Dell Inc. ++ + OUI:54A04F* + ID_OUI_FROM_DATABASE=t-mac Technologies Ltd + +@@ -58366,6 +58546,9 @@ OUI:54F5B6* + OUI:54F666* + ID_OUI_FROM_DATABASE=Berthold Technologies GmbH and Co.KG + ++OUI:54F876* ++ ID_OUI_FROM_DATABASE=ABB AG ++ + OUI:54FA3E* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD + +@@ -58375,6 +58558,9 @@ OUI:54FB58* + OUI:54FDBF* + ID_OUI_FROM_DATABASE=Scheidt & Bachmann GmbH + ++OUI:54FFCF* ++ ID_OUI_FROM_DATABASE=Mopria Alliance ++ + OUI:580528* + ID_OUI_FROM_DATABASE=LABRIS NETWORKS + +@@ -58390,6 +58576,9 @@ OUI:5809E5* + OUI:580A20* + ID_OUI_FROM_DATABASE=Cisco + ++OUI:58108C* ++ ID_OUI_FROM_DATABASE=Intelbras ++ + OUI:581243* + ID_OUI_FROM_DATABASE=AcSiP Technology Corp. + +@@ -58504,9 +58693,15 @@ OUI:587521* + OUI:587675* + ID_OUI_FROM_DATABASE=Beijing ECHO Technologies Co.,Ltd + ++OUI:5876C5* ++ ID_OUI_FROM_DATABASE=DIGI I'S LTD ++ + OUI:587A4D* + ID_OUI_FROM_DATABASE=Stonesoft Corporation + ++OUI:587BE9* ++ ID_OUI_FROM_DATABASE=AirPro Technology India Pvt. Ltd ++ + OUI:587E61* + ID_OUI_FROM_DATABASE=Hisense Electric Co., Ltd + +@@ -58633,6 +58828,9 @@ OUI:58EECE* + OUI:58F387* + ID_OUI_FROM_DATABASE=HCCP + ++OUI:58F39C* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:58F67B* + ID_OUI_FROM_DATABASE=Xia Men UnionCore Technology LTD. + +@@ -58810,6 +59008,12 @@ OUI:5C89D4* + OUI:5C8D4E* + ID_OUI_FROM_DATABASE=Apple + ++OUI:5C8FE0* ++ ID_OUI_FROM_DATABASE=ARRIS Group, Inc. ++ ++OUI:5C93A2* ++ ID_OUI_FROM_DATABASE=Liteon Technology Corporation ++ + OUI:5C95AE* + ID_OUI_FROM_DATABASE=Apple + +@@ -59011,6 +59215,9 @@ OUI:60334B* + OUI:603553* + ID_OUI_FROM_DATABASE=Buwon Technology + ++OUI:603696* ++ ID_OUI_FROM_DATABASE=The Sapling Company ++ + OUI:6036DD* + ID_OUI_FROM_DATABASE=Intel Corporate + +@@ -59038,9 +59245,18 @@ OUI:604616* + OUI:6047D4* + ID_OUI_FROM_DATABASE=FORICS Electronic Technology Co., Ltd. + ++OUI:604826* ++ ID_OUI_FROM_DATABASE=Newbridge Technologies Int. Ltd. ++ + OUI:604A1C* + ID_OUI_FROM_DATABASE=SUYIN Corporation + ++OUI:6050C1* ++ ID_OUI_FROM_DATABASE=Kinetek Sports ++ ++OUI:60512C* ++ ID_OUI_FROM_DATABASE=TCT mobile limited ++ + OUI:6052D0* + ID_OUI_FROM_DATABASE=FACTS Engineering + +@@ -59125,6 +59341,9 @@ OUI:609084* + OUI:609217* + ID_OUI_FROM_DATABASE=Apple + ++OUI:6099D1* ++ ID_OUI_FROM_DATABASE=Vuzix / Lenovo ++ + OUI:609AA4* + ID_OUI_FROM_DATABASE=GVI SECURITY INC. + +@@ -59284,6 +59503,9 @@ OUI:60FEF9* + OUI:60FFDD* + ID_OUI_FROM_DATABASE=C.E. ELECTRONICS, INC + ++OUI:64002D* ++ ID_OUI_FROM_DATABASE=Powerlinq Co., LTD ++ + OUI:6400F1* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + +@@ -59557,6 +59779,9 @@ OUI:64B310* + OUI:64B370* + ID_OUI_FROM_DATABASE=PowerComm Solutons LLC + ++OUI:64B473* ++ ID_OUI_FROM_DATABASE=Xiaomi inc. ++ + OUI:64B64A* + ID_OUI_FROM_DATABASE=ViVOtech, Inc. + +@@ -59917,6 +60142,9 @@ OUI:68D247* + OUI:68D925* + ID_OUI_FROM_DATABASE=ProSys Development Services + ++OUI:68D93C* ++ ID_OUI_FROM_DATABASE=Apple ++ + OUI:68DB67* + ID_OUI_FROM_DATABASE=Nantong Coship Electronics Co., Ltd + +@@ -59950,6 +60178,9 @@ OUI:68EE96* + OUI:68EFBD* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + ++OUI:68F06D* ++ ID_OUI_FROM_DATABASE=ALONG INDUSTRIAL CO., LIMITED ++ + OUI:68F125* + ID_OUI_FROM_DATABASE=Data Controls Inc. + +@@ -60079,6 +60310,9 @@ OUI:6C626D* + OUI:6C641A* + ID_OUI_FROM_DATABASE=Penguin Computing + ++OUI:6C6EFE* ++ ID_OUI_FROM_DATABASE=Core Logic Inc. ++ + OUI:6C6F18* + ID_OUI_FROM_DATABASE=Stereotaxis, Inc. + +@@ -60091,6 +60325,9 @@ OUI:6C709F* + OUI:6C71D9* + ID_OUI_FROM_DATABASE=AzureWave Technologies, Inc + ++OUI:6C7660* ++ ID_OUI_FROM_DATABASE=KYOCERA Corporation ++ + OUI:6C81FE* + ID_OUI_FROM_DATABASE=Mitsuba Corporation + +@@ -60122,7 +60359,7 @@ OUI:6C92BF* + ID_OUI_FROM_DATABASE=Inspur Electronic Information Industry Co.,Ltd. + + OUI:6C98EB* +- ID_OUI_FROM_DATABASE=Xyne GmbH ++ ID_OUI_FROM_DATABASE=Ocedo GmbH + + OUI:6C9989* + ID_OUI_FROM_DATABASE=Cisco +@@ -60187,6 +60424,9 @@ OUI:6CB7F4* + OUI:6CBEE9* + ID_OUI_FROM_DATABASE=Alcatel-Lucent-IPD + ++OUI:6CBFB5* ++ ID_OUI_FROM_DATABASE=Noon Technology Co., Ltd ++ + OUI:6CC1D2* + ID_OUI_FROM_DATABASE=ARRIS Group, Inc. + +@@ -60514,6 +60754,9 @@ OUI:70A8E3* + OUI:70AAB2* + ID_OUI_FROM_DATABASE=Research In Motion + ++OUI:70AF25* ++ ID_OUI_FROM_DATABASE=Nishiyama Industry Co.,LTD. ++ + OUI:70B035* + ID_OUI_FROM_DATABASE=Shenzhen Zowee Technology Co., Ltd + +@@ -60535,6 +60778,9 @@ OUI:70B599* + OUI:70B921* + ID_OUI_FROM_DATABASE=FiberHome Telecommunication Technologies CO.,LTD + ++OUI:70BAEF* ++ ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited ++ + OUI:70C6AC* + ID_OUI_FROM_DATABASE=Bosch Automotive Aftermarket + +@@ -60586,6 +60832,9 @@ OUI:70EE50* + OUI:70F176* + ID_OUI_FROM_DATABASE=Data Modul AG + ++OUI:70F196* ++ ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc ++ + OUI:70F1A1* + ID_OUI_FROM_DATABASE=Liteon Technology Corporation + +@@ -60796,6 +61045,9 @@ OUI:74B00C* + OUI:74B9EB* + ID_OUI_FROM_DATABASE=Fujian JinQianMao Electronic Technology Co.,Ltd + ++OUI:74BADB* ++ ID_OUI_FROM_DATABASE=Longconn Electornics(shenzhen)Co.,Ltd ++ + OUI:74BE08* + ID_OUI_FROM_DATABASE=ATEK Products, LLC + +@@ -60844,6 +61096,9 @@ OUI:74DE2B* + OUI:74E06E* + ID_OUI_FROM_DATABASE=Ergophone GmbH + ++OUI:74E14A* ++ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. ++ + OUI:74E1B6* + ID_OUI_FROM_DATABASE=Apple + +@@ -61318,6 +61573,9 @@ OUI:7C092B* + OUI:7C0A50* + ID_OUI_FROM_DATABASE=J-MEX Inc. + ++OUI:7C0ECE* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:7C11BE* + ID_OUI_FROM_DATABASE=Apple + +@@ -61345,6 +61603,9 @@ OUI:7C2048* + OUI:7C2064* + ID_OUI_FROM_DATABASE=Alcatel Lucent IPD + ++OUI:7C2587* ++ ID_OUI_FROM_DATABASE=chaowifi.com ++ + OUI:7C2CF3* + ID_OUI_FROM_DATABASE=Secure Electrans Ltd + +@@ -61504,6 +61765,9 @@ OUI:7CAD74* + OUI:7CB03E* + ID_OUI_FROM_DATABASE=OSRAM GmbH + ++OUI:7CB177* ++ ID_OUI_FROM_DATABASE=Satelco AG ++ + OUI:7CB21B* + ID_OUI_FROM_DATABASE=Cisco SPVTG + +@@ -61774,6 +62038,9 @@ OUI:8065E9* + OUI:806629* + ID_OUI_FROM_DATABASE=Prescope Technologies CO.,LTD. + ++OUI:806C1B* ++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC ++ + OUI:806C8B* + ID_OUI_FROM_DATABASE=KAESER KOMPRESSOREN AG + +@@ -61918,9 +62185,15 @@ OUI:80D733* + OUI:80DB31* + ID_OUI_FROM_DATABASE=Power Quotient International Co., Ltd. + ++OUI:80E650* ++ ID_OUI_FROM_DATABASE=Apple ++ + OUI:80EA96* + ID_OUI_FROM_DATABASE=Apple + ++OUI:80EACA* ++ ID_OUI_FROM_DATABASE=Dialog Semiconductor Hellas SA ++ + OUI:80EE73* + ID_OUI_FROM_DATABASE=Shuttle Inc. + +@@ -61933,6 +62206,9 @@ OUI:80F593* + OUI:80F62E* + ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited + ++OUI:80F8EB* ++ ID_OUI_FROM_DATABASE=RayTight ++ + OUI:80FA5B* + ID_OUI_FROM_DATABASE=CLEVO CO. + +@@ -62116,6 +62392,9 @@ OUI:848506* + OUI:84850A* + ID_OUI_FROM_DATABASE=Hella Sonnen- und Wetterschutztechnik GmbH + ++OUI:8486F3* ++ ID_OUI_FROM_DATABASE=Greenvity Communications ++ + OUI:848D84* + ID_OUI_FROM_DATABASE=Rajant Corporation + +@@ -62134,9 +62413,15 @@ OUI:848F69* + OUI:849000* + ID_OUI_FROM_DATABASE=Arnold & Richter Cine Technik + ++OUI:84930C* ++ ID_OUI_FROM_DATABASE=InCoax Networks Europe AB ++ + OUI:84948C* + ID_OUI_FROM_DATABASE=Hitron Technologies. Inc + ++OUI:849681* ++ ID_OUI_FROM_DATABASE=Cathay Communication Co.,Ltd ++ + OUI:8496D8* + ID_OUI_FROM_DATABASE=Pace plc + +@@ -62206,6 +62491,9 @@ OUI:84DE3D* + OUI:84DF0C* + ID_OUI_FROM_DATABASE=NET2GRID BV + ++OUI:84E058* ++ ID_OUI_FROM_DATABASE=Pace plc ++ + OUI:84E4D9* + ID_OUI_FROM_DATABASE=Shenzhen NEED technology Ltd. + +@@ -62545,6 +62833,9 @@ OUI:8C0EE3* + OUI:8C11CB* + ID_OUI_FROM_DATABASE=ABUS Security-Center GmbH & Co. KG + ++OUI:8C18D9* ++ ID_OUI_FROM_DATABASE=Shenzhen RF Technology Co., Ltd ++ + OUI:8C1F94* + ID_OUI_FROM_DATABASE=RF Surgical System Inc. + +@@ -62632,6 +62923,9 @@ OUI:8C5AF0* + OUI:8C5CA1* + ID_OUI_FROM_DATABASE=d-broad,INC + ++OUI:8C5D60* ++ ID_OUI_FROM_DATABASE=UCI Corporation Co.,Ltd. ++ + OUI:8C5FDF* + ID_OUI_FROM_DATABASE=Beijing Railway Signal Factory + +@@ -62683,6 +62977,9 @@ OUI:8C7CFF* + OUI:8C7EB3* + ID_OUI_FROM_DATABASE=Lytro, Inc. + ++OUI:8C7F3B* ++ ID_OUI_FROM_DATABASE=ARRIS Group, Inc. ++ + OUI:8C82A8* + ID_OUI_FROM_DATABASE=Insigma Technology Co.,Ltd + +@@ -62716,6 +63013,9 @@ OUI:8CAE4C* + OUI:8CAE89* + ID_OUI_FROM_DATABASE=Y-cam Solutions Ltd + ++OUI:8CB094* ++ ID_OUI_FROM_DATABASE=Airtech I&C Co., Ltd ++ + OUI:8CB64F* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + +@@ -62770,6 +63070,9 @@ OUI:8CD628* + OUI:8CDB25* + ID_OUI_FROM_DATABASE=ESG Solutions + ++OUI:8CDCD4* ++ ID_OUI_FROM_DATABASE=Hewlett Packard ++ + OUI:8CDD8D* + ID_OUI_FROM_DATABASE=Wifly-City System Inc. + +@@ -62788,6 +63091,9 @@ OUI:8CE7B3* + OUI:8CEEC6* + ID_OUI_FROM_DATABASE=Precepscion Pty. Ltd. + ++OUI:8CF813* ++ ID_OUI_FROM_DATABASE=ORANGE POLSKA ++ + OUI:8CF945* + ID_OUI_FROM_DATABASE=Power Automation pte Ltd + +@@ -62851,6 +63157,9 @@ OUI:901D27* + OUI:901EDD* + ID_OUI_FROM_DATABASE=GREAT COMPUTER CORPORATION + ++OUI:90203A* ++ ID_OUI_FROM_DATABASE=BYD Precision Manufacture Co.,Ltd ++ + OUI:902083* + ID_OUI_FROM_DATABASE=General Engine Management Systems Ltd. + +@@ -63127,6 +63436,9 @@ OUI:90E6BA* + OUI:90EA60* + ID_OUI_FROM_DATABASE=SPI Lasers Ltd + ++OUI:90EF68* ++ ID_OUI_FROM_DATABASE=ZyXEL Communications Corporation ++ + OUI:90F1AA* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD + +@@ -63154,6 +63466,9 @@ OUI:90FB5B* + OUI:90FBA6* + ID_OUI_FROM_DATABASE=Hon Hai Precision Ind.Co.Ltd + ++OUI:90FD61* ++ ID_OUI_FROM_DATABASE=Apple ++ + OUI:90FF79* + ID_OUI_FROM_DATABASE=Metro Ethernet Forum + +@@ -63247,6 +63562,9 @@ OUI:945103* + OUI:9451BF* + ID_OUI_FROM_DATABASE=Hyundai ESG + ++OUI:945493* ++ ID_OUI_FROM_DATABASE=Rigado, LLC ++ + OUI:94592D* + ID_OUI_FROM_DATABASE=EKE Building Technology Systems Ltd + +@@ -63256,6 +63574,9 @@ OUI:945B7E* + OUI:946124* + ID_OUI_FROM_DATABASE=Pason Systems + ++OUI:946269* ++ ID_OUI_FROM_DATABASE=Arris Group, Inc. ++ + OUI:9463D1* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -63622,6 +63943,9 @@ OUI:988EDD* + OUI:989080* + ID_OUI_FROM_DATABASE=Linkpower Network System Inc Ltd. + ++OUI:989096* ++ ID_OUI_FROM_DATABASE=Dell Inc ++ + OUI:9893CC* + ID_OUI_FROM_DATABASE=LG Electronics Inc. + +@@ -63781,6 +64105,9 @@ OUI:9C3178* + OUI:9C31B6* + ID_OUI_FROM_DATABASE=Kulite Semiconductor Products Inc + ++OUI:9C3583* ++ ID_OUI_FROM_DATABASE=Nipro Diagnostics, Inc ++ + OUI:9C3AAF* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -64234,6 +64561,9 @@ OUI:A08C9B* + OUI:A090DE* + ID_OUI_FROM_DATABASE=VEEDIMS,LLC + ++OUI:A09347* ++ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD. ++ + OUI:A09805* + ID_OUI_FROM_DATABASE=OpenVox Communication Co Ltd + +@@ -64336,6 +64666,9 @@ OUI:A0E534* + OUI:A0E5E9* + ID_OUI_FROM_DATABASE=enimai Inc + ++OUI:A0E6F8* ++ ID_OUI_FROM_DATABASE=Texas Instruments Inc ++ + OUI:A0E9DB* + ID_OUI_FROM_DATABASE=Ningbo FreeWings Technologies Co.,Ltd + +@@ -64498,6 +64831,9 @@ OUI:A46CC1* + OUI:A46E79* + ID_OUI_FROM_DATABASE=DFT System Co.Ltd + ++OUI:A470D6* ++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC ++ + OUI:A47733* + ID_OUI_FROM_DATABASE=Google + +@@ -64643,7 +64979,7 @@ OUI:A4D3B5* + ID_OUI_FROM_DATABASE=GLITEL Stropkov, s.r.o. + + OUI:A4D856* +- ID_OUI_FROM_DATABASE=Qualcomm Labs Inc. ++ ID_OUI_FROM_DATABASE=Gimbal, Inc + + OUI:A4DA3F* + ID_OUI_FROM_DATABASE=Bionics Corp. +@@ -64732,6 +65068,9 @@ OUI:A81758* + OUI:A81B18* + ID_OUI_FROM_DATABASE=XTS CORP + ++OUI:A81B5D* ++ ID_OUI_FROM_DATABASE=Foxtel Management Pty Ltd ++ + OUI:A81FAF* + ID_OUI_FROM_DATABASE=KRYPTON POLSKA + +@@ -64984,6 +65323,9 @@ OUI:AC0A61* + OUI:AC0DFE* + ID_OUI_FROM_DATABASE=Ekon GmbH - myGEKKO + ++OUI:AC11D3* ++ ID_OUI_FROM_DATABASE=Suzhou HOTEK Video Technology Co. Ltd ++ + OUI:AC1461* + ID_OUI_FROM_DATABASE=ATAW Co., Ltd. + +@@ -65023,6 +65365,9 @@ OUI:AC34CB* + OUI:AC3613* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + ++OUI:AC3870* ++ ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd. ++ + OUI:AC3C0B* + ID_OUI_FROM_DATABASE=Apple + +@@ -65191,6 +65536,9 @@ OUI:ACAB8D* + OUI:ACB313* + ID_OUI_FROM_DATABASE=ARRIS Group, Inc. + ++OUI:ACB74F* ++ ID_OUI_FROM_DATABASE=METEL s.r.o. ++ + OUI:ACB859* + ID_OUI_FROM_DATABASE=Uniband Electronic Corp, + +@@ -65356,6 +65704,9 @@ OUI:B03850* + OUI:B0435D* + ID_OUI_FROM_DATABASE=NuLEDs, Inc. + ++OUI:B04515* ++ ID_OUI_FROM_DATABASE=mira fitness,LLC. ++ + OUI:B04545* + ID_OUI_FROM_DATABASE=YACOUB Automation GmbH + +@@ -65635,6 +65986,9 @@ OUI:B41489* + OUI:B41513* + ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD + ++OUI:B41780* ++ ID_OUI_FROM_DATABASE=DTI Group Ltd ++ + OUI:B418D1* + ID_OUI_FROM_DATABASE=Apple + +@@ -65746,6 +66100,12 @@ OUI:B4749F* + OUI:B4750E* + ID_OUI_FROM_DATABASE=Belkin International Inc. + ++OUI:B479A7* ++ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD. ++ ++OUI:B47C29* ++ ID_OUI_FROM_DATABASE=Shenzhen Guzidi Technology Co.,Ltd ++ + OUI:B47F5E* + ID_OUI_FROM_DATABASE=Foresight Manufacture (S) Pte Ltd + +@@ -65923,6 +66283,9 @@ OUI:B81619* + OUI:B817C2* + ID_OUI_FROM_DATABASE=Apple + ++OUI:B8186F* ++ ID_OUI_FROM_DATABASE=ORIENTAL MOTOR CO., LTD. ++ + OUI:B81999* + ID_OUI_FROM_DATABASE=Nesys + +@@ -65989,6 +66352,9 @@ OUI:B843E4* + OUI:B847C6* + ID_OUI_FROM_DATABASE=SanJet Technology Corp. + ++OUI:B84FD5* ++ ID_OUI_FROM_DATABASE=Microsoft Corporation ++ + OUI:B85510* + ID_OUI_FROM_DATABASE=Zioncom Electronics (Shenzhen) Ltd. + +@@ -66109,6 +66475,9 @@ OUI:B89AED* + OUI:B89BC9* + ID_OUI_FROM_DATABASE=SMC Networks Inc + ++OUI:B89BE4* ++ ID_OUI_FROM_DATABASE=ABB Power Systems Power Generation ++ + OUI:B8A386* + ID_OUI_FROM_DATABASE=D-Link International + +@@ -66151,6 +66520,9 @@ OUI:B8BA72* + OUI:B8BB6D* + ID_OUI_FROM_DATABASE=ENERES Co.,Ltd. + ++OUI:B8BD79* ++ ID_OUI_FROM_DATABASE=TrendPoint Systems ++ + OUI:B8BEBF* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + +@@ -66226,6 +66598,9 @@ OUI:B8EE65* + OUI:B8EE79* + ID_OUI_FROM_DATABASE=YWire Technologies, Inc. + ++OUI:B8F317* ++ ID_OUI_FROM_DATABASE=iSun Smasher Communications Private Limited ++ + OUI:B8F4D0* + ID_OUI_FROM_DATABASE=Herrmann Ultraschalltechnik GmbH & Co. Kg + +@@ -66373,6 +66748,9 @@ OUI:BC5FF4* + OUI:BC629F* + ID_OUI_FROM_DATABASE=Telenet Systems P. Ltd. + ++OUI:BC6641* ++ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. ++ + OUI:BC671C* + ID_OUI_FROM_DATABASE=Cisco + +@@ -66838,6 +67216,9 @@ OUI:C4017C* + OUI:C401B1* + ID_OUI_FROM_DATABASE=SeekTech INC + ++OUI:C401CE* ++ ID_OUI_FROM_DATABASE=PRESITION (2000) CO., LTD. ++ + OUI:C40415* + ID_OUI_FROM_DATABASE=NETGEAR INC., + +@@ -66970,6 +67351,12 @@ OUI:C455C2* + OUI:C45600* + ID_OUI_FROM_DATABASE=Galleon Embedded Computing + ++OUI:C456FE* ++ ID_OUI_FROM_DATABASE=Lava International Ltd. ++ ++OUI:C4576E* ++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD ++ + OUI:C458C2* + ID_OUI_FROM_DATABASE=Shenzhen TATFOOK Technology Co., Ltd. + +@@ -67081,6 +67468,9 @@ OUI:C4B512* + OUI:C4BA99* + ID_OUI_FROM_DATABASE=I+ME Actia Informatik und Mikro-Elektronik GmbH + ++OUI:C4BD6A* ++ ID_OUI_FROM_DATABASE=SKF GmbH ++ + OUI:C4C0AE* + ID_OUI_FROM_DATABASE=MIDORI ELECTRONIC CO., LTD. + +@@ -67429,6 +67819,9 @@ OUI:C8E1A7* + OUI:C8E42F* + ID_OUI_FROM_DATABASE=Technical Research Design and Development + ++OUI:C8E7D8* ++ ID_OUI_FROM_DATABASE=SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. ++ + OUI:C8EE08* + ID_OUI_FROM_DATABASE=TANGTOP TECHNOLOGY CO.,LTD + +@@ -67480,6 +67873,9 @@ OUI:C8FF77* + OUI:CC0080* + ID_OUI_FROM_DATABASE=BETTINI SRL + ++OUI:CC03FA* ++ ID_OUI_FROM_DATABASE=Technicolor CH USA ++ + OUI:CC047C* + ID_OUI_FROM_DATABASE=G-WAY Microwave + +@@ -67507,6 +67903,9 @@ OUI:CC0CDA* + OUI:CC0DEC* + ID_OUI_FROM_DATABASE=Cisco SPVTG + ++OUI:CC10A3* ++ ID_OUI_FROM_DATABASE=Beijing Nan Bao Technology Co., Ltd. ++ + OUI:CC14A6* + ID_OUI_FROM_DATABASE=Yichun MyEnergy Domain, Inc + +@@ -67531,6 +67930,9 @@ OUI:CC2A80* + OUI:CC2D8C* + ID_OUI_FROM_DATABASE=LG ELECTRONICS INC + ++OUI:CC3080* ++ ID_OUI_FROM_DATABASE=VAIO Corporation ++ + OUI:CC33BB* + ID_OUI_FROM_DATABASE=SAGEMCOM SAS + +@@ -67756,9 +68158,15 @@ OUI:CCD539* + OUI:CCD811* + ID_OUI_FROM_DATABASE=Aiconn Technology Corporation + ++OUI:CCD8C1* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:CCD9E9* + ID_OUI_FROM_DATABASE=SCR Engineers Ltd. + ++OUI:CCE17F* ++ ID_OUI_FROM_DATABASE=juniper networks ++ + OUI:CCE1D5* + ID_OUI_FROM_DATABASE=Buffalo Inc. + +@@ -67786,6 +68194,9 @@ OUI:CCF3A5* + OUI:CCF407* + ID_OUI_FROM_DATABASE=EUKREA ELECTROMATIQUE SARL + ++OUI:CCF538* ++ ID_OUI_FROM_DATABASE=3isysnetworks ++ + OUI:CCF67A* + ID_OUI_FROM_DATABASE=Ayecka Communication Systems LTD + +@@ -67825,6 +68236,9 @@ OUI:D00AAB* + OUI:D00EA4* + ID_OUI_FROM_DATABASE=Porsche Cars North America + ++OUI:D01242* ++ ID_OUI_FROM_DATABASE=BIOS Corporation ++ + OUI:D0131E* + ID_OUI_FROM_DATABASE=Sunrex Technology Corp + +@@ -67915,6 +68329,9 @@ OUI:D05FB8* + OUI:D05FCE* + ID_OUI_FROM_DATABASE=Hitachi Data Systems + ++OUI:D062A0* ++ ID_OUI_FROM_DATABASE=China Essence Technology (Zhumadian) Co., Ltd. ++ + OUI:D0634D* + ID_OUI_FROM_DATABASE=Meiko Maschinenbau GmbH & Co. KG + +@@ -67963,6 +68380,9 @@ OUI:D07E28* + OUI:D07E35* + ID_OUI_FROM_DATABASE=Intel Corporate + ++OUI:D084B0* ++ ID_OUI_FROM_DATABASE=Sagemcom ++ + OUI:D08999* + ID_OUI_FROM_DATABASE=APCON, Inc. + +@@ -68110,6 +68530,9 @@ OUI:D0F27F* + OUI:D0F73B* + ID_OUI_FROM_DATABASE=Helmut Mauell GmbH + ++OUI:D0FA1D* ++ ID_OUI_FROM_DATABASE=Qihoo 360 Technology Co.,Ltd ++ + OUI:D0FF50* + ID_OUI_FROM_DATABASE=Texas Instruments, Inc + +@@ -68191,6 +68614,9 @@ OUI:D42F23* + OUI:D4319D* + ID_OUI_FROM_DATABASE=Sinwatec + ++OUI:D437D7* ++ ID_OUI_FROM_DATABASE=zte corporation ++ + OUI:D43A65* + ID_OUI_FROM_DATABASE=IGRS Engineering Lab Ltd. + +@@ -68278,6 +68704,9 @@ OUI:D46F42* + OUI:D479C3* + ID_OUI_FROM_DATABASE=Cameronet GmbH & Co. KG + ++OUI:D47B35* ++ ID_OUI_FROM_DATABASE=NEO Monitors AS ++ + OUI:D47B75* + ID_OUI_FROM_DATABASE=HARTING Electronics GmbH + +@@ -68299,6 +68728,9 @@ OUI:D48890* + OUI:D48CB5* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + ++OUI:D48F33* ++ ID_OUI_FROM_DATABASE=Microsoft Corporation ++ + OUI:D48FAA* + ID_OUI_FROM_DATABASE=Sogecam Industrial, S.A. + +@@ -68440,6 +68872,9 @@ OUI:D4EA0E* + OUI:D4EC0C* + ID_OUI_FROM_DATABASE=Harley-Davidson Motor Company + ++OUI:D4EC86* ++ ID_OUI_FROM_DATABASE=LinkedHope Intelligent Technologies Co., Ltd ++ + OUI:D4EE07* + ID_OUI_FROM_DATABASE=HIWIFI Co., Ltd. + +@@ -68551,6 +68986,9 @@ OUI:D8490B* + OUI:D8492F* + ID_OUI_FROM_DATABASE=CANON INC. + ++OUI:D84A87* ++ ID_OUI_FROM_DATABASE=OI ELECTRIC CO.,LTD ++ + OUI:D84B2A* + ID_OUI_FROM_DATABASE=Cognitas Technologies, Inc. + +@@ -68860,6 +69298,9 @@ OUI:DC37D2* + OUI:DC38E1* + ID_OUI_FROM_DATABASE=Juniper networks + ++OUI:DC3979* ++ ID_OUI_FROM_DATABASE=Skyport Systems ++ + OUI:DC3A5E* + ID_OUI_FROM_DATABASE=Roku, Inc + +@@ -69199,6 +69640,9 @@ OUI:E09467* + OUI:E09579* + ID_OUI_FROM_DATABASE=ORTHOsoft inc, d/b/a Zimmer CAS + ++OUI:E09796* ++ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD ++ + OUI:E097F2* + ID_OUI_FROM_DATABASE=Atomax Inc. + +@@ -69226,6 +69670,9 @@ OUI:E0AAB0* + OUI:E0ABFE* + ID_OUI_FROM_DATABASE=Orb Networks, Inc. + ++OUI:E0ACF1* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:E0AE5E* + ID_OUI_FROM_DATABASE=ALPS Co,. Ltd. + +@@ -69523,6 +69970,9 @@ OUI:E492E7* + OUI:E492FB* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + ++OUI:E4956E* ++ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. ++ + OUI:E496AE* + ID_OUI_FROM_DATABASE=ALTOGRAPHICS Inc. + +@@ -69553,6 +70003,9 @@ OUI:E4B021* + OUI:E4C146* + ID_OUI_FROM_DATABASE=Objetivos y Servicios de Valor A + ++OUI:E4C62B* ++ ID_OUI_FROM_DATABASE=Airware ++ + OUI:E4C63D* + ID_OUI_FROM_DATABASE=Apple, Inc. + +@@ -69910,6 +70363,9 @@ OUI:E8EA6A* + OUI:E8EADA* + ID_OUI_FROM_DATABASE=Denkovi Assembly Electroncs LTD + ++OUI:E8ED05* ++ ID_OUI_FROM_DATABASE=ARRIS Group, Inc. ++ + OUI:E8EDF3* + ID_OUI_FROM_DATABASE=Cisco + +@@ -69931,6 +70387,9 @@ OUI:E8FC60* + OUI:E8FCAF* + ID_OUI_FROM_DATABASE=NETGEAR INC., + ++OUI:EC0EC4* ++ ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. ++ + OUI:EC0ED6* + ID_OUI_FROM_DATABASE=ITECH INSTRUMENTS SAS + +@@ -69949,6 +70408,9 @@ OUI:EC1766* + OUI:EC1A59* + ID_OUI_FROM_DATABASE=Belkin International Inc. + ++OUI:EC1D7F* ++ ID_OUI_FROM_DATABASE=zte corporation ++ + OUI:EC219F* + ID_OUI_FROM_DATABASE=VidaBox LLC + +@@ -69982,6 +70444,9 @@ OUI:EC3586* + OUI:EC3BF0* + ID_OUI_FROM_DATABASE=NovelSat + ++OUI:EC3C5A* ++ ID_OUI_FROM_DATABASE=SHEN ZHEN HENG SHENG HUI DIGITAL TECHNOLOGY CO.,LTD ++ + OUI:EC3E09* + ID_OUI_FROM_DATABASE=PERFORMANCE DESIGNED PRODUCTS, LLC + +@@ -70522,6 +70987,9 @@ OUI:F4068D* + OUI:F406A5* + ID_OUI_FROM_DATABASE=Hangzhou Bianfeng Networking Technology Co., Ltd. + ++OUI:F409D8* ++ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD. ++ + OUI:F40B93* + ID_OUI_FROM_DATABASE=Research In Motion + +@@ -70555,6 +71023,9 @@ OUI:F42012* + OUI:F42833* + ID_OUI_FROM_DATABASE=MMPC Inc. + ++OUI:F42853* ++ ID_OUI_FROM_DATABASE=Zioncom Electronics (Shenzhen) Ltd. ++ + OUI:F42896* + ID_OUI_FROM_DATABASE=SPECTO PAINEIS ELETRONICOS LTDA + +@@ -70780,6 +71251,9 @@ OUI:F4EC38* + OUI:F4F15A* + ID_OUI_FROM_DATABASE=Apple + ++OUI:F4F1E1* ++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC ++ + OUI:F4F26D* + ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD. + +@@ -70855,6 +71329,9 @@ OUI:F81EDF* + OUI:F82285* + ID_OUI_FROM_DATABASE=Cypress Technology CO., LTD. + ++OUI:F82441* ++ ID_OUI_FROM_DATABASE=Yeelink ++ + OUI:F82793* + ID_OUI_FROM_DATABASE=Apple, Inc + +@@ -71119,6 +71596,9 @@ OUI:F8E4FB* + OUI:F8E7B5* + ID_OUI_FROM_DATABASE=µTech Tecnologia LTDA + ++OUI:F8E811* ++ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD ++ + OUI:F8E968* + ID_OUI_FROM_DATABASE=Egker Kft. + +@@ -71221,6 +71701,9 @@ OUI:FC1BFF* + OUI:FC1D59* + ID_OUI_FROM_DATABASE=I Smart Cities HK Ltd + ++OUI:FC1D84* ++ ID_OUI_FROM_DATABASE=Autobase ++ + OUI:FC1E16* + ID_OUI_FROM_DATABASE=IPEVO corp + +@@ -71359,6 +71842,9 @@ OUI:FC9947* + OUI:FC9FAE* + ID_OUI_FROM_DATABASE=Fidus Systems Inc + ++OUI:FC9FE1* ++ ID_OUI_FROM_DATABASE=CONWIN.Tech. Ltd ++ + OUI:FCA13E* + ID_OUI_FROM_DATABASE=Samsung Electronics + +@@ -71419,6 +71905,9 @@ OUI:FCD817* + OUI:FCDB96* + ID_OUI_FROM_DATABASE=ENERVALLEY CO., LTD + ++OUI:FCDBB3* ++ ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd. ++ + OUI:FCDD55* + ID_OUI_FROM_DATABASE=Shenzhen WeWins wireless Co.,Ltd + +diff --git hwdb/20-pci-classes.hwdb hwdb/20-pci-classes.hwdb +index fd1d5d0..5702c40 100644 +--- hwdb/20-pci-classes.hwdb ++++ hwdb/20-pci-classes.hwdb +@@ -47,12 +47,24 @@ pci:v*d*sv*sd*bc01sc06i00* + pci:v*d*sv*sd*bc01sc06i01* + ID_PCI_INTERFACE_FROM_DATABASE=AHCI 1.0 + ++pci:v*d*sv*sd*bc01sc06i02* ++ ID_PCI_INTERFACE_FROM_DATABASE=Serial Storage Bus ++ + pci:v*d*sv*sd*bc01sc07* + ID_PCI_SUBCLASS_FROM_DATABASE=Serial Attached SCSI controller + ++pci:v*d*sv*sd*bc01sc07i01* ++ ID_PCI_INTERFACE_FROM_DATABASE=Serial Storage Bus ++ + pci:v*d*sv*sd*bc01sc08* + ID_PCI_SUBCLASS_FROM_DATABASE=Non-Volatile memory controller + ++pci:v*d*sv*sd*bc01sc08i01* ++ ID_PCI_INTERFACE_FROM_DATABASE=NVMHCI ++ ++pci:v*d*sv*sd*bc01sc08i02* ++ ID_PCI_INTERFACE_FROM_DATABASE=NVM Express ++ + pci:v*d*sv*sd*bc01sc80* + ID_PCI_SUBCLASS_FROM_DATABASE=Mass storage controller + +@@ -80,6 +92,9 @@ pci:v*d*sv*sd*bc02sc05* + pci:v*d*sv*sd*bc02sc06* + ID_PCI_SUBCLASS_FROM_DATABASE=PICMG controller + ++pci:v*d*sv*sd*bc02sc07* ++ ID_PCI_SUBCLASS_FROM_DATABASE=Infiniband controller ++ + pci:v*d*sv*sd*bc02sc80* + ID_PCI_SUBCLASS_FROM_DATABASE=Network controller + +@@ -311,6 +326,9 @@ pci:v*d*sv*sd*bc08sc02i01* + pci:v*d*sv*sd*bc08sc02i02* + ID_PCI_INTERFACE_FROM_DATABASE=EISA Timers + ++pci:v*d*sv*sd*bc08sc02i03* ++ ID_PCI_INTERFACE_FROM_DATABASE=HPET ++ + pci:v*d*sv*sd*bc08sc03* + ID_PCI_SUBCLASS_FROM_DATABASE=RTC + +@@ -527,5 +545,14 @@ pci:v*d*sv*sd*bc11sc20* + pci:v*d*sv*sd*bc11sc80* + ID_PCI_SUBCLASS_FROM_DATABASE=Signal processing controller + ++pci:v*d*sv*sd*bc12* ++ ID_PCI_CLASS_FROM_DATABASE=Processing accelerators ++ ++pci:v*d*sv*sd*bc12sc00* ++ ID_PCI_SUBCLASS_FROM_DATABASE=Processing accelerators ++ ++pci:v*d*sv*sd*bc13* ++ ID_PCI_CLASS_FROM_DATABASE=Non-Essential Instrumentation ++ + pci:v*d*sv*sd*bcFF* + ID_PCI_CLASS_FROM_DATABASE=Unassigned class +diff --git hwdb/20-pci-vendor-model.hwdb hwdb/20-pci-vendor-model.hwdb +index 62941b9..77c727d 100644 +--- hwdb/20-pci-vendor-model.hwdb ++++ hwdb/20-pci-vendor-model.hwdb +@@ -959,6 +959,15 @@ pci:v00001000d0000005Dsv00001028sd00001F49* + pci:v00001000d0000005Dsv00001028sd00001F4A* + ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC H730 Mini (for blades)) + ++pci:v00001000d0000005Dsv00001028sd00001F4D* ++ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC FS33xS) ++ ++pci:v00001000d0000005Dsv00001028sd00001F4F* ++ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC H730P Slim) ++ ++pci:v00001000d0000005Dsv00001028sd00001F54* ++ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC FS33xD) ++ + pci:v00001000d0000005Dsv000017AAsd00001052* + ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (ThinkServer RAID 720i) + +@@ -1677,7 +1686,7 @@ pci:v00001002d00001308* + ID_MODEL_FROM_DATABASE=Kaveri HDMI/DP Audio Controller + + pci:v00001002d00001309* +- ID_MODEL_FROM_DATABASE=Kaveri [Radeon R7 Graphics] ++ ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6/R7 Graphics] + + pci:v00001002d0000130A* + ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6 Graphics] +@@ -3003,7 +3012,7 @@ pci:v00001002d00004C57sv00001014sd00000517* + ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (ThinkPad T30) + + pci:v00001002d00004C57sv00001014sd00000530* +- ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (ThinkPad T42 2373-4WU) ++ ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (ThinkPad T4x Series) + + pci:v00001002d00004C57sv00001028sd000000E6* + ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (Radeon Mobility M7 LW (Dell Inspiron 8100)) +@@ -4362,7 +4371,7 @@ pci:v00001002d00006667* + ID_MODEL_FROM_DATABASE=Jet ULT [Radeon R5 M230] + + pci:v00001002d0000666F* +- ID_MODEL_FROM_DATABASE=Sun LE [Radeon HD 8550M] ++ ID_MODEL_FROM_DATABASE=Sun LE [Radeon HD 8550M / R5 M230] + + pci:v00001002d00006670* + ID_MODEL_FROM_DATABASE=Hainan +@@ -5937,10 +5946,10 @@ pci:v00001002d0000679F* + ID_MODEL_FROM_DATABASE=Tahiti + + pci:v00001002d000067A0* +- ID_MODEL_FROM_DATABASE=Hawaii XT GL ++ ID_MODEL_FROM_DATABASE=Hawaii XT GL [FirePro W9100] + + pci:v00001002d000067A1* +- ID_MODEL_FROM_DATABASE=Hawaii GL ++ ID_MODEL_FROM_DATABASE=Hawaii PRO GL [FirePro W8100] + + pci:v00001002d000067A2* + ID_MODEL_FROM_DATABASE=Hawaii GL +@@ -5961,7 +5970,7 @@ pci:v00001002d000067B1* + ID_MODEL_FROM_DATABASE=Hawaii PRO [Radeon R9 290] + + pci:v00001002d000067B9* +- ID_MODEL_FROM_DATABASE=Vesuvius [Radeon R9 295 X2] ++ ID_MODEL_FROM_DATABASE=Vesuvius [Radeon R9 295X2] + + pci:v00001002d000067BE* + ID_MODEL_FROM_DATABASE=Hawaii LE +@@ -7860,7 +7869,13 @@ pci:v00001002d000068FE* + ID_MODEL_FROM_DATABASE=Cedar LE + + pci:v00001002d00006900* +- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260] ++ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265] ++ ++pci:v00001002d00006900sv00001028sd00000640* ++ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265] (Radeon R7 M265) ++ ++pci:v00001002d00006900sv00001179sd0000F934* ++ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265] (Radeon R7 M260) + + pci:v00001002d00006901* + ID_MODEL_FROM_DATABASE=Topaz PRO [Radeon R5 M255] +@@ -8027,6 +8042,9 @@ pci:v00001002d0000718A* + pci:v00001002d0000718B* + ID_MODEL_FROM_DATABASE=RV516/M62 [Mobility Radeon X1350] + ++pci:v00001002d0000718Bsv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=RV516/M62 [Mobility Radeon X1350] (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00001002d0000718C* + ID_MODEL_FROM_DATABASE=RV516/M62-CSP64 [Mobility Radeon X1350] + +@@ -8969,26 +8987,29 @@ pci:v00001002d0000983E* + pci:v00001002d0000983F* + ID_MODEL_FROM_DATABASE=Kabini + ++pci:v00001002d00009840* ++ ID_MODEL_FROM_DATABASE=Kabini HDMI/DP Audio ++ + pci:v00001002d00009850* +- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU A6-6200 with R3 Graphics] ++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R3 Graphics] + + pci:v00001002d00009851* +- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU A4-6000 with R2 Graphics] ++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R4/R5 Graphics] + + pci:v00001002d00009852* +- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU A4-6000 with R2 Graphics] ++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R2 Graphics] + + pci:v00001002d00009853* +- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU E2-4000 with R2 Graphics] ++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R2 Graphics] + + pci:v00001002d00009854* +- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU E2-3700 with R2 Graphics] ++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R3 Graphics] + + pci:v00001002d00009855* +- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU XX-2450M with R3 Graphics] ++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R6 Graphics] + + pci:v00001002d00009856* +- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU XX-2200M with R2 Graphics] ++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R2 Graphics] + + pci:v00001002d00009857* + ID_MODEL_FROM_DATABASE=Mullins [Radeon APU XX-2200M with R2 Graphics] +@@ -12347,6 +12368,9 @@ pci:v0000102Bd00000532sv00001028sd0000029C* + pci:v0000102Bd00000532sv00001028sd000002A4* + ID_MODEL_FROM_DATABASE=MGA G200eW WPCM450 (PowerEdge T310 MGA G200eW WPCM450) + ++pci:v0000102Bd00000532sv000015D9sd00000624* ++ ID_MODEL_FROM_DATABASE=MGA G200eW WPCM450 (X9SCM-F Motherboard) ++ + pci:v0000102Bd00000532sv000015D9sd0000A811* + ID_MODEL_FROM_DATABASE=MGA G200eW WPCM450 (H8DGU) + +@@ -13169,6 +13193,9 @@ pci:v00001039d00000016* + pci:v00001039d00000018* + ID_MODEL_FROM_DATABASE=SiS85C503/5513 (LPC Bridge) + ++pci:v00001039d00000163* ++ ID_MODEL_FROM_DATABASE=163 802.11b/g Wireless LAN Adapter ++ + pci:v00001039d00000180* + ID_MODEL_FROM_DATABASE=RAID bus controller 180 SATA/PATA [SiS] + +@@ -14141,6 +14168,9 @@ pci:v00001042d00003020* + pci:v00001043* + ID_VENDOR_FROM_DATABASE=ASUSTeK Computer Inc. + ++pci:v00001043d00000464* ++ ID_MODEL_FROM_DATABASE=Radeon R9 270x GPU ++ + pci:v00001043d00000675* + ID_MODEL_FROM_DATABASE=ISDNLink P-IN100-ST-D + +@@ -17978,6 +18008,9 @@ pci:v00001095d00003512sv00001095sd00006512* + pci:v00001095d00003531* + ID_MODEL_FROM_DATABASE=SiI 3531 [SATALink/SATARaid] Serial ATA Controller + ++pci:v00001095d00003531sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=SiI 3531 [SATALink/SATARaid] Serial ATA Controller (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00001096* + ID_VENDOR_FROM_DATABASE=Alacron + +@@ -26261,6 +26294,9 @@ pci:v000010DEd00000F00* + pci:v000010DEd00000F01* + ID_MODEL_FROM_DATABASE=GF108 [GeForce GT 620] + ++pci:v000010DEd00000F02* ++ ID_MODEL_FROM_DATABASE=GF108 [GeForce GT 730] ++ + pci:v000010DEd00000FC0* + ID_MODEL_FROM_DATABASE=GK107 [GeForce GT 640 OEM] + +@@ -26276,6 +26312,9 @@ pci:v000010DEd00000FC6* + pci:v000010DEd00000FC6sv00001043sd00008428* + ID_MODEL_FROM_DATABASE=GK107 [GeForce GTX 650] (GTX650-DC-1GD5) + ++pci:v000010DEd00000FC8* ++ ID_MODEL_FROM_DATABASE=GK107 [GeForce GT 740] ++ + pci:v000010DEd00000FCD* + ID_MODEL_FROM_DATABASE=GK107M [GeForce GT 755M] + +@@ -26420,6 +26459,9 @@ pci:v000010DEd00000FFE* + pci:v000010DEd00000FFF* + ID_MODEL_FROM_DATABASE=GK107GL [Quadro 410] + ++pci:v000010DEd00001001* ++ ID_MODEL_FROM_DATABASE=GK110B [GeForce GTX TITAN Z] ++ + pci:v000010DEd00001003* + ID_MODEL_FROM_DATABASE=GK110 [GeForce GTX Titan LE] + +@@ -26828,9 +26870,57 @@ pci:v000010DEd00001140sv00001025sd00000830* + pci:v000010DEd00001140sv00001025sd00000837* + ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce GT 720M) + ++pci:v000010DEd00001140sv00001025sd0000083E* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ + pci:v000010DEd00001140sv00001025sd00000841* + ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 710M) + ++pci:v000010DEd00001140sv00001025sd00000854* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000855* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000856* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000857* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000858* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000868* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000869* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 810M) ++ ++pci:v000010DEd00001140sv00001025sd00000873* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000878* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd0000087B* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd0000087C* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 810M) ++ ++pci:v000010DEd00001140sv00001025sd00000881* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd0000088A* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd0000090F* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001025sd00000921* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ + pci:v000010DEd00001140sv00001028sd0000054D* + ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce GT 630M) + +@@ -26966,6 +27056,18 @@ pci:v000010DEd00001140sv00001043sd000016DD* + pci:v000010DEd00001140sv00001043sd0000170D* + ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) + ++pci:v000010DEd00001140sv00001043sd0000176D* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001043sd0000178D* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001043sd0000179D* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ ++pci:v000010DEd00001140sv00001043sd000017DD* ++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M) ++ + pci:v000010DEd00001140sv00001043sd00002132* + ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce GT 620M) + +@@ -27713,6 +27815,9 @@ pci:v000010DEd00001284* + pci:v000010DEd00001286* + ID_MODEL_FROM_DATABASE=GK208 [GeForce GT 720] + ++pci:v000010DEd00001287* ++ ID_MODEL_FROM_DATABASE=GK208 [GeForce GT 730] ++ + pci:v000010DEd00001290* + ID_MODEL_FROM_DATABASE=GK208M [GeForce GT 730M] + +@@ -27749,6 +27854,21 @@ pci:v000010DEd00001294* + pci:v000010DEd00001295* + ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] + ++pci:v000010DEd00001295sv0000103Csd00002B0D* ++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 710A) ++ ++pci:v000010DEd00001295sv0000103Csd00002B0F* ++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 710A) ++ ++pci:v000010DEd00001295sv0000103Csd00002B11* ++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 710A) ++ ++pci:v000010DEd00001295sv0000103Csd00002B21* ++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 810A) ++ ++pci:v000010DEd00001295sv0000103Csd00002B22* ++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 810A) ++ + pci:v000010DEd00001296* + ID_MODEL_FROM_DATABASE=GK208M [GeForce 825M] + +@@ -28302,7 +28422,7 @@ pci:v000010ECd00008136* + ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller + + pci:v000010ECd00008136sv0000103Csd00002AB1* +- ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (Pavillion p6774) ++ ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (Pavilion p6774) + + pci:v000010ECd00008136sv0000103Csd000030CC* + ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (Pavilion dv6700) +@@ -28310,6 +28430,9 @@ pci:v000010ECd00008136sv0000103Csd000030CC* + pci:v000010ECd00008136sv00001179sd0000FF64* + ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (RTL8102E PCI-E Fast Ethernet NIC) + ++pci:v000010ECd00008136sv000017C0sd00001053* ++ ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (AzureWave AW-NE766 802.11B/G/N Mini PCIe Card Model RT2700E) ++ + pci:v000010ECd00008138* + ID_MODEL_FROM_DATABASE=RT8139 (B/C) Cardbus Fast Ethernet Adapter + +@@ -29036,6 +29159,9 @@ pci:v00001102d0000000B* + pci:v00001102d0000000Bsv00001102sd00000041* + ID_MODEL_FROM_DATABASE=EMU20k2 [X-Fi Titanium Series] (SB0880 [SoundBlaster X-Fi Titanium PCI-e]) + ++pci:v00001102d00000012* ++ ID_MODEL_FROM_DATABASE=SB Recon3D ++ + pci:v00001102d00004001* + ID_MODEL_FROM_DATABASE=SB Audigy FireWire Port + +@@ -30878,6 +31004,9 @@ pci:v00001106d0000E340* + pci:v00001106d0000E353* + ID_MODEL_FROM_DATABASE=VX800/VX820 PCI Express Root Port + ++pci:v00001106d0000E410* ++ ID_MODEL_FROM_DATABASE=VX900 PCI Express Physical Layer Electrical Sub-block ++ + pci:v00001106d0000F208* + ID_MODEL_FROM_DATABASE=PT890 PCI to PCI Bridge Controller + +@@ -35045,6 +35174,9 @@ pci:v000011ABd00004353sv0000104Dsd0000902D* + pci:v000011ABd00004354* + ID_MODEL_FROM_DATABASE=88E8040 PCI-E Fast Ethernet Controller + ++pci:v000011ABd00004354sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=88E8040 PCI-E Fast Ethernet Controller (R730 Laptop) ++ + pci:v000011ABd00004354sv0000144Dsd0000C072* + ID_MODEL_FROM_DATABASE=88E8040 PCI-E Fast Ethernet Controller (Notebook N150P) + +@@ -36557,6 +36689,9 @@ pci:v00001217* + pci:v00001217d000000F7* + ID_MODEL_FROM_DATABASE=Firewire (IEEE 1394) + ++pci:v00001217d000000F7sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=Firewire (IEEE 1394) (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00001217d000000F7sv00001179sd0000FF50* + ID_MODEL_FROM_DATABASE=Firewire (IEEE 1394) (Satellite P305D-S8995E) + +@@ -36635,12 +36770,18 @@ pci:v00001217d00007114* + pci:v00001217d00007120* + ID_MODEL_FROM_DATABASE=Integrated MMC/SD Controller + ++pci:v00001217d00007120sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=Integrated MMC/SD Controller (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00001217d00007120sv00001179sd0000FF50* + ID_MODEL_FROM_DATABASE=Integrated MMC/SD Controller (Satellite P305D-S8995E) + + pci:v00001217d00007130* + ID_MODEL_FROM_DATABASE=Integrated MS/xD Controller + ++pci:v00001217d00007130sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=Integrated MS/xD Controller (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00001217d00007130sv00001179sd0000FF50* + ID_MODEL_FROM_DATABASE=Integrated MS/xD Controller (Satellite P305D-S8995E) + +@@ -42276,7 +42417,7 @@ pci:v00001425d00004083* + ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller + + pci:v00001425d00004084* +- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller + + pci:v00001425d00004085* + ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller +@@ -42348,7 +42489,7 @@ pci:v00001425d00004483* + ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller + + pci:v00001425d00004484* +- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller + + pci:v00001425d00004485* + ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller +@@ -42420,7 +42561,7 @@ pci:v00001425d00004583* + ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Storage Controller + + pci:v00001425d00004584* +- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Storage Controller ++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Storage Controller + + pci:v00001425d00004585* + ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Storage Controller +@@ -42492,7 +42633,7 @@ pci:v00001425d00004683* + ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Storage Controller + + pci:v00001425d00004684* +- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Storage Controller ++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Storage Controller + + pci:v00001425d00004685* + ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Storage Controller +@@ -42564,7 +42705,7 @@ pci:v00001425d00004783* + ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller + + pci:v00001425d00004784* +- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller + + pci:v00001425d00004785* + ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller +@@ -42579,76 +42720,76 @@ pci:v00001425d00004788* + ID_MODEL_FROM_DATABASE=T440-4088 Unified Wire Ethernet Controller + + pci:v00001425d00004801* +- ID_MODEL_FROM_DATABASE=T420-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004802* +- ID_MODEL_FROM_DATABASE=T422-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T422-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004803* +- ID_MODEL_FROM_DATABASE=T440-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004804* +- ID_MODEL_FROM_DATABASE=T420-BCH Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420-BCH Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004805* +- ID_MODEL_FROM_DATABASE=T440-BCH Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-BCH Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004806* +- ID_MODEL_FROM_DATABASE=T440-CH Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-CH Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004807* +- ID_MODEL_FROM_DATABASE=T420-SO Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420-SO Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004808* +- ID_MODEL_FROM_DATABASE=T420-CX Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420-CX Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004809* +- ID_MODEL_FROM_DATABASE=T420-BT Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420-BT Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000480A* +- ID_MODEL_FROM_DATABASE=T404-BT Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T404-BT Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000480B* +- ID_MODEL_FROM_DATABASE=B420-SR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=B420-SR Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000480C* +- ID_MODEL_FROM_DATABASE=B404-BT Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=B404-BT Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000480D* +- ID_MODEL_FROM_DATABASE=T480 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T480 Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000480E* +- ID_MODEL_FROM_DATABASE=T440-LP-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-LP-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000480F* +- ID_MODEL_FROM_DATABASE=T440 [Amsterdam] Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440 [Amsterdam] Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004880* +- ID_MODEL_FROM_DATABASE=T480-4080 T480 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T480-4080 T480 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004881* +- ID_MODEL_FROM_DATABASE=T440F-4081 T440-FCoE Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440F-4081 T440-FCoE Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004882* +- ID_MODEL_FROM_DATABASE=T420-4082 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420-4082 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004883* +- ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004884* +- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004885* +- ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004886* +- ID_MODEL_FROM_DATABASE=T440-4086 10Gbase-T Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-4086 10Gbase-T Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004887* +- ID_MODEL_FROM_DATABASE=T440T-4087 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440T-4087 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00004888* +- ID_MODEL_FROM_DATABASE=T440-4088 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T440-4088 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005001* + ID_MODEL_FROM_DATABASE=T520-CR Unified Wire Ethernet Controller +@@ -43041,82 +43182,82 @@ pci:v00001425d00005785* + ID_MODEL_FROM_DATABASE=T580-5085 Unified Wire Ethernet Controller + + pci:v00001425d00005801* +- ID_MODEL_FROM_DATABASE=T520-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T520-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005802* +- ID_MODEL_FROM_DATABASE=T522-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T522-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005803* +- ID_MODEL_FROM_DATABASE=T540-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005804* +- ID_MODEL_FROM_DATABASE=T520-BCH Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T520-BCH Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005805* +- ID_MODEL_FROM_DATABASE=T540-BCH Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540-BCH Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005806* +- ID_MODEL_FROM_DATABASE=T540-CH Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540-CH Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005807* +- ID_MODEL_FROM_DATABASE=T520-SO Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T520-SO Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005808* +- ID_MODEL_FROM_DATABASE=T520-CX Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T520-CX Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005809* +- ID_MODEL_FROM_DATABASE=T520-BT Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T520-BT Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000580A* +- ID_MODEL_FROM_DATABASE=T504-BT Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T504-BT Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000580B* +- ID_MODEL_FROM_DATABASE=B520-SR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=B520-SR Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000580C* +- ID_MODEL_FROM_DATABASE=B504-BT Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=B504-BT Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000580D* +- ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000580E* +- ID_MODEL_FROM_DATABASE=T540-LP-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540-LP-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000580F* +- ID_MODEL_FROM_DATABASE=T540 [Amsterdam] Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540 [Amsterdam] Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005810* +- ID_MODEL_FROM_DATABASE=T580-LP-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T580-LP-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005811* +- ID_MODEL_FROM_DATABASE=T520-LL-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T520-LL-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005812* +- ID_MODEL_FROM_DATABASE=T560-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T560-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005813* +- ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005814* +- ID_MODEL_FROM_DATABASE=T580-LP-SO-CR Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T580-LP-SO-CR Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005815* +- ID_MODEL_FROM_DATABASE=T502-BT Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T502-BT Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005880* +- ID_MODEL_FROM_DATABASE=T540-5080 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540-5080 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005881* +- ID_MODEL_FROM_DATABASE=T540-5081 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540-5081 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005883* +- ID_MODEL_FROM_DATABASE=T540-5083 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T540-5083 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005884* +- ID_MODEL_FROM_DATABASE=T580-5084 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T580-5084 Unified Wire Ethernet Controller [VF] + + pci:v00001425d00005885* +- ID_MODEL_FROM_DATABASE=T580-5085 Unified Wire Ethernet Controller ++ ID_MODEL_FROM_DATABASE=T580-5085 Unified Wire Ethernet Controller [VF] + + pci:v00001425d0000A000* + ID_MODEL_FROM_DATABASE=PE10K Unified Wire Ethernet Controller +@@ -43562,6 +43703,9 @@ pci:v0000148E* + pci:v0000148F* + ID_VENDOR_FROM_DATABASE=Plant Equipment, Inc. + ++pci:v0000148Fd00005370* ++ ID_MODEL_FROM_DATABASE=Dexlink AUWL15I1 ++ + pci:v00001490* + ID_VENDOR_FROM_DATABASE=Stone Microsystems PTY Ltd. + +@@ -44885,6 +45029,9 @@ pci:v000014E4d000016A2sv0000103Csd00001916* + pci:v000014E4d000016A2sv0000103Csd00001917* + ID_MODEL_FROM_DATABASE=BCM57840 NetXtreme II 10/20-Gigabit Ethernet (HP FlexFabric 20Gb 2-port 630M Adapter) + ++pci:v000014E4d000016A3* ++ ID_MODEL_FROM_DATABASE=NetXtreme BCM57786 Gigabit Ethernet PCIe ++ + pci:v000014E4d000016A4* + ID_MODEL_FROM_DATABASE=BCM57840 NetXtreme II Ethernet Multi Function + +@@ -47796,7 +47943,7 @@ pci:v000015B3d00001003* + ID_MODEL_FROM_DATABASE=MT27500 Family [ConnectX-3] + + pci:v000015B3d00001004* +- ID_MODEL_FROM_DATABASE=MT27500 Family [ConnectX-3 Virtual Function] ++ ID_MODEL_FROM_DATABASE=MT27500/MT27520 Family [ConnectX-3/ConnectX-3 Pro Virtual Function] + + pci:v000015B3d00001005* + ID_MODEL_FROM_DATABASE=MT27510 Family +@@ -47807,9 +47954,6 @@ pci:v000015B3d00001006* + pci:v000015B3d00001007* + ID_MODEL_FROM_DATABASE=MT27520 Family [ConnectX-3 Pro] + +-pci:v000015B3d00001008* +- ID_MODEL_FROM_DATABASE=MT27520 Family [ConnectX-3 Pro Virtual Function] +- + pci:v000015B3d00001009* + ID_MODEL_FROM_DATABASE=MT27530 Family + +@@ -49187,6 +49331,9 @@ pci:v0000168Cd0000002Bsv0000105Bsd0000E017* + pci:v0000168Cd0000002Bsv0000105Bsd0000E023* + ID_MODEL_FROM_DATABASE=AR9285 Wireless Network Adapter (PCI-Express) (T77H121.04 802.11bgn Wireless Half-size Mini PCIe Card) + ++pci:v0000168Cd0000002Bsv0000105Bsd0000E025* ++ ID_MODEL_FROM_DATABASE=AR9285 Wireless Network Adapter (PCI-Express) (T77H121.05 802.11bgn Wireless Half-size Mini PCIe Card) ++ + pci:v0000168Cd0000002Bsv00001113sd0000E811* + ID_MODEL_FROM_DATABASE=AR9285 Wireless Network Adapter (PCI-Express) (WN7811A (Toshiba PA3722U-1MPC) 802.11bgn Wireless Half-size Mini PCIe Card) + +@@ -50471,6 +50618,9 @@ pci:v00001814d00000701sv00001737sd00000074* + pci:v00001814d00000781* + ID_MODEL_FROM_DATABASE=RT2790 Wireless 802.11n 1T/2R PCIe + ++pci:v00001814d00000781sv00001814sd00002790* ++ ID_MODEL_FROM_DATABASE=RT2790 Wireless 802.11n 1T/2R PCIe ++ + pci:v00001814d00003060* + ID_MODEL_FROM_DATABASE=RT3060 Wireless 802.11n 1T/1R + +@@ -51911,6 +52061,9 @@ pci:v00001969d00001063* + pci:v00001969d00001063sv00001458sd0000E000* + ID_MODEL_FROM_DATABASE=AR8131 Gigabit Ethernet (GA-G31M-ES2L Motherboard) + ++pci:v00001969d00001063sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=AR8131 Gigabit Ethernet (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00001969d00001066* + ID_MODEL_FROM_DATABASE=Attansic L2c Gigabit Ethernet + +@@ -52358,6 +52511,18 @@ pci:v00001A2Bd0000000A* + pci:v00001A2Bd0000000E* + ID_MODEL_FROM_DATABASE=DSLP-104 v1.1 + ++pci:v00001A30* ++ ID_VENDOR_FROM_DATABASE=Lantiq ++ ++pci:v00001A30d00000680* ++ ID_MODEL_FROM_DATABASE=MtW8171 [Hyperion II] ++ ++pci:v00001A30d00000700* ++ ID_MODEL_FROM_DATABASE=Wave300 PSB8224 [Hyperion III] ++ ++pci:v00001A30d00000710* ++ ID_MODEL_FROM_DATABASE=Wave300 PSB8231 [Hyperion III] ++ + pci:v00001A32* + ID_VENDOR_FROM_DATABASE=Quanta Microsystems, Inc + +@@ -52497,19 +52662,19 @@ pci:v00001A78* + ID_VENDOR_FROM_DATABASE=Virident Systems Inc. + + pci:v00001A78d00000031* +- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive ++ ID_MODEL_FROM_DATABASE=FlashMAX Drive + + pci:v00001A78d00000031sv00001A78sd00000034* +- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 3]) ++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 3]) + + pci:v00001A78d00000031sv00001A78sd00000037* +- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 3D]) ++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 3D]) + + pci:v00001A78d00000031sv00001A78sd00000038* +- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 4]) ++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 4]) + + pci:v00001A78d00000031sv00001A78sd00000039* +- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 4D]) ++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 4D]) + + pci:v00001A78d00000040* + ID_MODEL_FROM_DATABASE=FlashMAX II +@@ -52520,6 +52685,9 @@ pci:v00001A78d00000041* + pci:v00001A78d00000042* + ID_MODEL_FROM_DATABASE=FlashMAX II + ++pci:v00001A78d00000050* ++ ID_MODEL_FROM_DATABASE=FlashMAX III ++ + pci:v00001A84* + ID_VENDOR_FROM_DATABASE=Commex Technologies + +@@ -52682,6 +52850,15 @@ pci:v00001AEDd00001008* + pci:v00001AEDd00002001* + ID_MODEL_FROM_DATABASE=ioDrive2 + ++pci:v00001AEDd00003001* ++ ID_MODEL_FROM_DATABASE=ioMemory FHHL ++ ++pci:v00001AEDd00003002* ++ ID_MODEL_FROM_DATABASE=ioMemory HHHL ++ ++pci:v00001AEDd00003003* ++ ID_MODEL_FROM_DATABASE=ioMemory Mezzanine ++ + pci:v00001AEE* + ID_VENDOR_FROM_DATABASE=Caustic Graphics Inc. + +@@ -52775,6 +52952,9 @@ pci:v00001B21d00001080* + pci:v00001B21d00001080sv00001849sd00001080* + ID_MODEL_FROM_DATABASE=ASM1083/1085 PCIe to PCI Bridge (Motherboard) + ++pci:v00001B21d00001142* ++ ID_MODEL_FROM_DATABASE=ASM1042A USB 3.0 Host Controller ++ + pci:v00001B2C* + ID_VENDOR_FROM_DATABASE=Opal-RT Technologies Inc. + +@@ -52916,6 +53096,9 @@ pci:v00001B4Bd00009485* + pci:v00001B55* + ID_VENDOR_FROM_DATABASE=NetUP Inc. + ++pci:v00001B55d000018F6* ++ ID_MODEL_FROM_DATABASE=Dual DVB Universal CI card ++ + pci:v00001B55d00002A2C* + ID_MODEL_FROM_DATABASE=Dual DVB-S2-CI card + +@@ -53135,6 +53318,9 @@ pci:v00001CE4d00000002* + pci:v00001CF7* + ID_VENDOR_FROM_DATABASE=Subspace Dynamics + ++pci:v00001D21* ++ ID_VENDOR_FROM_DATABASE=Allo ++ + pci:v00001D44* + ID_VENDOR_FROM_DATABASE=DPT + +@@ -54956,15 +55142,30 @@ pci:v00008086d00000044sv00001025sd00000347* + pci:v00008086d00000044sv00001025sd00000487* + ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (TravelMate 5742) + ++pci:v00008086d00000044sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (R730 Laptop) ++ ++pci:v00008086d00000044sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00000044sv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (PC1-GROOVE) + + pci:v00008086d00000045* + ID_MODEL_FROM_DATABASE=Core Processor PCI Express x16 Root Port + ++pci:v00008086d00000045sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=Core Processor PCI Express x16 Root Port (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00000046* + ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller + ++pci:v00008086d00000046sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller (R730 Laptop) ++ ++pci:v00008086d00000046sv000017C0sd000010D9* ++ ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00000046sv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller (PC1-GROOVE) + +@@ -55238,6 +55439,9 @@ pci:v00008086d00000150* + pci:v00008086d00000150sv00001043sd000084CA* + ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller (P8 series motherboard) + ++pci:v00008086d00000150sv000015D9sd00000624* ++ ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller (X9SCM-F Motherboard) ++ + pci:v00008086d00000150sv00001849sd00000150* + ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller (Motherboard) + +@@ -55445,6 +55649,9 @@ pci:v00008086d00000416sv000017AAsd0000220E* + pci:v00008086d0000041A* + ID_MODEL_FROM_DATABASE=Xeon E3-1200 v3 Processor Integrated Graphics Controller + ++pci:v00008086d0000041E* ++ ID_MODEL_FROM_DATABASE=4th Generation Core Processor Family Integrated Graphics Controller ++ + pci:v00008086d00000433* + ID_MODEL_FROM_DATABASE=Coleto Creek ACC - ME/CPM interface + +@@ -56727,241 +56934,85 @@ pci:v00008086d00000EFD* + ID_MODEL_FROM_DATABASE=Xeon E7 v2/Xeon E5 v2/Core i7 DDRIO + + pci:v00008086d00000F00* +- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit +- +-pci:v00008086d00000F01* +- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit +- +-pci:v00008086d00000F02* +- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit +- +-pci:v00008086d00000F03* +- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SoC Transaction Register + + pci:v00008086d00000F04* +- ID_MODEL_FROM_DATABASE=ValleyView High Definition Audio Controller +- +-pci:v00008086d00000F05* +- ID_MODEL_FROM_DATABASE=ValleyView High Definition Audio Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series High Definition Audio Controller + + pci:v00008086d00000F06* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 DMA Controller +- +-pci:v00008086d00000F07* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 DMA Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 DMA Controller + + pci:v00008086d00000F08* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 PWM Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 PWM Controller + + pci:v00008086d00000F09* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 PWM Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 PWM Controller + + pci:v00008086d00000F0A* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #1 +- +-pci:v00008086d00000F0B* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #1 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 HSUART Controller #1 + + pci:v00008086d00000F0C* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #2 +- +-pci:v00008086d00000F0D* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #2 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 HSUART Controller #2 + + pci:v00008086d00000F0E* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 SPI Controller +- +-pci:v00008086d00000F0F* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 SPI Controller +- +-pci:v00008086d00000F10* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 Controller +- +-pci:v00008086d00000F11* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 Controller +- +-pci:v00008086d00000F12* +- ID_MODEL_FROM_DATABASE=ValleyView SMBus Controller +- +-pci:v00008086d00000F13* +- ID_MODEL_FROM_DATABASE=ValleyView SMBus Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 SPI Controller + + pci:v00008086d00000F14* +- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SDIO Controller + + pci:v00008086d00000F15* +- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SDIO Controller + + pci:v00008086d00000F16* +- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller +- +-pci:v00008086d00000F17* +- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SDIO Controller + + pci:v00008086d00000F18* +- ID_MODEL_FROM_DATABASE=ValleyView SEC +- +-pci:v00008086d00000F19* +- ID_MODEL_FROM_DATABASE=ValleyView SEC +- +-pci:v00008086d00000F1A* +- ID_MODEL_FROM_DATABASE=ValleyView SEC +- +-pci:v00008086d00000F1B* +- ID_MODEL_FROM_DATABASE=ValleyView SEC ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Trusted Execution Engine + + pci:v00008086d00000F1C* +- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit +- +-pci:v00008086d00000F1D* +- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit +- +-pci:v00008086d00000F1E* +- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit +- +-pci:v00008086d00000F1F* +- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit +- +-pci:v00008086d00000F20* +- ID_MODEL_FROM_DATABASE=ValleyView 4-Port SATA Storage Controller +- +-pci:v00008086d00000F21* +- ID_MODEL_FROM_DATABASE=ValleyView 4-Port SATA Storage Controller +- +-pci:v00008086d00000F22* +- ID_MODEL_FROM_DATABASE=ValleyView 6-Port SATA AHCI Controller +- +-pci:v00008086d00000F23* +- ID_MODEL_FROM_DATABASE=ValleyView 6-Port SATA AHCI Controller +- +-pci:v00008086d00000F24* +- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller +- +-pci:v00008086d00000F25* +- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller +- +-pci:v00008086d00000F26* +- ID_MODEL_FROM_DATABASE=ValleyView 2-Port SATA Storage Controller +- +-pci:v00008086d00000F27* +- ID_MODEL_FROM_DATABASE=ValleyView 2-Port SATA Storage Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Power Control Unit + + pci:v00008086d00000F28* +- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller +- +-pci:v00008086d00000F29* +- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller +- +-pci:v00008086d00000F2A* +- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller +- +-pci:v00008086d00000F2B* +- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller +- +-pci:v00008086d00000F2E* +- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller +- +-pci:v00008086d00000F2F* +- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller +- +-pci:v00008086d00000F30* +- ID_MODEL_FROM_DATABASE=ValleyView Gen7 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPE Audio Controller + + pci:v00008086d00000F31* +- ID_MODEL_FROM_DATABASE=ValleyView Gen7 +- +-pci:v00008086d00000F32* +- ID_MODEL_FROM_DATABASE=ValleyView Gen7 +- +-pci:v00008086d00000F33* +- ID_MODEL_FROM_DATABASE=ValleyView Gen7 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Graphics & Display + + pci:v00008086d00000F34* +- ID_MODEL_FROM_DATABASE=ValleyView USB Enhanced Host Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series USB EHCI + + pci:v00008086d00000F35* +- ID_MODEL_FROM_DATABASE=ValleyView USB xHCI Host Controller +- +-pci:v00008086d00000F36* +- ID_MODEL_FROM_DATABASE=ValleyView USB xHCI Host Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series USB xHCI + + pci:v00008086d00000F37* +- ID_MODEL_FROM_DATABASE=ValleyView OTG ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series OTG USB Device + + pci:v00008086d00000F38* +- ID_MODEL_FROM_DATABASE=ValleyView ISP +- +-pci:v00008086d00000F39* +- ID_MODEL_FROM_DATABASE=ValleyView ISP +- +-pci:v00008086d00000F3A* +- ID_MODEL_FROM_DATABASE=ValleyView ISP +- +-pci:v00008086d00000F3B* +- ID_MODEL_FROM_DATABASE=ValleyView ISP +- +-pci:v00008086d00000F3C* +- ID_MODEL_FROM_DATABASE=ValleyView ISP +- +-pci:v00008086d00000F3D* +- ID_MODEL_FROM_DATABASE=ValleyView ISP +- +-pci:v00008086d00000F3E* +- ID_MODEL_FROM_DATABASE=ValleyView ISP +- +-pci:v00008086d00000F3F* +- ID_MODEL_FROM_DATABASE=ValleyView ISP ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Camera ISP + + pci:v00008086d00000F40* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 DMA Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 DMA Controller + + pci:v00008086d00000F41* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #1 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #1 + + pci:v00008086d00000F42* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #2 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #2 + + pci:v00008086d00000F43* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #3 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #3 + + pci:v00008086d00000F44* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #4 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #4 + + pci:v00008086d00000F45* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #5 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #5 + + pci:v00008086d00000F46* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #6 ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #6 + + pci:v00008086d00000F47* +- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #7 +- +-pci:v00008086d00000F48* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F49* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F4A* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F4B* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F4C* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F4D* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F4E* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F4F* +- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port +- +-pci:v00008086d00000F50* +- ID_MODEL_FROM_DATABASE=ValleyView MIPI-HSI Controller ++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #7 + + pci:v00008086d00001000* + ID_MODEL_FROM_DATABASE=82542 Gigabit Ethernet Controller (Fiber) +@@ -57842,6 +57893,9 @@ pci:v00008086d00001091* + pci:v00008086d00001092* + ID_MODEL_FROM_DATABASE=PRO/100 VE Network Connection + ++pci:v00008086d00001092sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=PRO/100 VE Network Connection (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d00001093* + ID_MODEL_FROM_DATABASE=PRO/100 VM Network Connection + +@@ -59403,7 +59457,7 @@ pci:v00008086d0000154Asv00008086sd0000011C* + ID_MODEL_FROM_DATABASE=Ethernet Server Adapter X520-4 (Ethernet Converged Network Adapter X520-4) + + pci:v00008086d0000154C* +- ID_MODEL_FROM_DATABASE=XL710 X710 Virtual Function ++ ID_MODEL_FROM_DATABASE=XL710/X710 Virtual Function + + pci:v00008086d0000154D* + ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X520 Adapter +@@ -59460,34 +59514,37 @@ pci:v00008086d00001570* + ID_MODEL_FROM_DATABASE=Ethernet Connection I219-V + + pci:v00008086d00001571* +- ID_MODEL_FROM_DATABASE=XL710 X710 Virtual Function ++ ID_MODEL_FROM_DATABASE=XL710/X710 Virtual Function + + pci:v00008086d00001572* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ + + pci:v00008086d00001572sv00001028sd00001F99* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet 10G 4P X710/I350 rNDC) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 4P X710/I350 rNDC) ++ ++pci:v00008086d00001572sv00008086sd00000000* ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710) + + pci:v00008086d00001572sv00008086sd00000001* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-4) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-4) + + pci:v00008086d00001572sv00008086sd00000002* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-4) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-4) + + pci:v00008086d00001572sv00008086sd00000004* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-4) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-4) + + pci:v00008086d00001572sv00008086sd00000005* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet 10G 4P X710 Adapter) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 4P X710 Adapter) + + pci:v00008086d00001572sv00008086sd00000006* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet 10G2P X710 Adapter) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 2P X710 Adapter) + + pci:v00008086d00001572sv00008086sd00000007* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-2) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-2) + + pci:v00008086d00001572sv00008086sd00000008* +- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-2) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-2) + + pci:v00008086d0000157B* + ID_MODEL_FROM_DATABASE=I210 Gigabit Network Connection +@@ -59496,17 +59553,20 @@ pci:v00008086d0000157C* + ID_MODEL_FROM_DATABASE=I210 Gigabit Backplane Connection + + pci:v00008086d00001580* +- ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40Gbe backplane ++ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE backplane + + pci:v00008086d00001581* +- ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10Gbe backplane ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE backplane + + pci:v00008086d00001581sv00001028sd00001F98* +- ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10Gbe backplane (Ethernet 10G 4P X710-k bNDC) ++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE backplane (Ethernet 10G 4P X710-k bNDC) + + pci:v00008086d00001583* + ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ + ++pci:v00008086d00001583sv00008086sd00000000* ++ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q2) ++ + pci:v00008086d00001583sv00008086sd00000001* + ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q2) + +@@ -59519,6 +59579,9 @@ pci:v00008086d00001583sv00008086sd00000003* + pci:v00008086d00001584* + ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ + ++pci:v00008086d00001584sv00008086sd00000000* ++ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q1) ++ + pci:v00008086d00001584sv00008086sd00000001* + ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q1) + +@@ -61244,9 +61307,15 @@ pci:v00008086d00002448sv0000104Dsd0000902D* + pci:v00008086d00002448sv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (D270S/D250S Motherboard) + ++pci:v00008086d00002448sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d00002448sv0000144Dsd0000C00C* + ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (P30 notebook) + ++pci:v00008086d00002448sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (R730 Laptop) ++ + pci:v00008086d00002448sv0000144Dsd0000C072* + ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Notebook N150P) + +@@ -61259,6 +61328,12 @@ pci:v00008086d00002448sv00001734sd00001055* + pci:v00008086d00002448sv000017AAsd000020AE* + ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (ThinkPad T61/R61) + ++pci:v00008086d00002448sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Medion Akoya E7214 Notebook PC [MD98410]) ++ ++pci:v00008086d00002448sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002448sv00008086sd0000544B* + ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Desktop Board D425KT) + +@@ -61872,7 +61947,7 @@ pci:v00008086d000024C5sv00001014sd00000267* + ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (NetVista A30p) + + pci:v00008086d000024C5sv00001014sd00000537* +- ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (ThinkPad T41) ++ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (ThinkPad T4x Series) + + pci:v00008086d000024C5sv00001014sd0000055F* + ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (Thinkpad R50e model 1634) +@@ -61944,7 +62019,7 @@ pci:v00008086d000024C6* + ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller + + pci:v00008086d000024C6sv00001014sd00000524* +- ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (ThinkPad T41) ++ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (ThinkPad T4x Series) + + pci:v00008086d000024C6sv00001014sd00000525* + ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (ThinkPad) +@@ -64358,6 +64433,9 @@ pci:v00008086d000027A0sv0000103Csd000030A3* + pci:v00008086d000027A0sv00001043sd00001237* + ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (A6J-Q008) + ++pci:v00008086d000027A0sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027A0sv000017AAsd00002015* + ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (ThinkPad T60) + +@@ -64373,6 +64451,9 @@ pci:v00008086d000027A1sv0000103Csd0000309F* + pci:v00008086d000027A1sv0000103Csd000030A3* + ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port (Compaq nw8440) + ++pci:v00008086d000027A1sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027A2* + ID_MODEL_FROM_DATABASE=Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller + +@@ -64457,6 +64538,9 @@ pci:v00008086d000027B9sv0000103Csd000030A1* + pci:v00008086d000027B9sv0000103Csd000030A3* + ID_MODEL_FROM_DATABASE=82801GBM (ICH7-M) LPC Interface Bridge (Compaq nw8440) + ++pci:v00008086d000027B9sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=82801GBM (ICH7-M) LPC Interface Bridge (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027B9sv000010F7sd00008338* + ID_MODEL_FROM_DATABASE=82801GBM (ICH7-M) LPC Interface Bridge (Panasonic CF-Y5 laptop) + +@@ -64568,6 +64652,9 @@ pci:v00008086d000027C4sv00001025sd0000006C* + pci:v00008086d000027C4sv00001028sd000001D7* + ID_MODEL_FROM_DATABASE=82801GBM/GHM (ICH7-M Family) SATA Controller [IDE mode] (XPS M1210) + ++pci:v00008086d000027C4sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=82801GBM/GHM (ICH7-M Family) SATA Controller [IDE mode] (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027C4sv000017AAsd0000200E* + ID_MODEL_FROM_DATABASE=82801GBM/GHM (ICH7-M Family) SATA Controller [IDE mode] (ThinkPad T60) + +@@ -64625,6 +64712,9 @@ pci:v00008086d000027C8sv00001043sd00008179* + pci:v00008086d000027C8sv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (D270S/D250S Motherboard) + ++pci:v00008086d000027C8sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027C8sv0000107Bsd00005048* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (E4500) + +@@ -64691,6 +64781,9 @@ pci:v00008086d000027C9sv00001043sd00008179* + pci:v00008086d000027C9sv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (D270S/D250S Motherboard) + ++pci:v00008086d000027C9sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027C9sv0000107Bsd00005048* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (E4500) + +@@ -64757,6 +64850,9 @@ pci:v00008086d000027CAsv00001043sd00008179* + pci:v00008086d000027CAsv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (D270S/D250S Motherboard) + ++pci:v00008086d000027CAsv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027CAsv0000107Bsd00005048* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (E4500) + +@@ -64817,6 +64913,9 @@ pci:v00008086d000027CBsv00001043sd00008179* + pci:v00008086d000027CBsv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (D270S/D250S Motherboard) + ++pci:v00008086d000027CBsv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027CBsv0000107Bsd00005048* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (E4500) + +@@ -64880,6 +64979,9 @@ pci:v00008086d000027CCsv00001043sd00008179* + pci:v00008086d000027CCsv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (D270S/D250S Motherboard) + ++pci:v00008086d000027CCsv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027CCsv0000144Dsd0000C072* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (Notebook N150P) + +@@ -64913,6 +65015,9 @@ pci:v00008086d000027D0sv0000103Csd0000309F* + pci:v00008086d000027D0sv0000103Csd000030A3* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 1 (Compaq nw8440) + ++pci:v00008086d000027D0sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 1 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027D0sv0000144Dsd0000C072* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 1 (Notebook N150P) + +@@ -64937,6 +65042,9 @@ pci:v00008086d000027D2sv0000103Csd0000309F* + pci:v00008086d000027D2sv0000103Csd000030A3* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 2 (Compaq nw8440) + ++pci:v00008086d000027D2sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 2 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027D2sv0000144Dsd0000C072* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 2 (Notebook N150P) + +@@ -64952,6 +65060,9 @@ pci:v00008086d000027D2sv00008086sd0000544B* + pci:v00008086d000027D4* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 3 + ++pci:v00008086d000027D4sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 3 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027D4sv0000144Dsd0000C072* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 3 (Notebook N150P) + +@@ -64970,6 +65081,9 @@ pci:v00008086d000027D6* + pci:v00008086d000027D6sv0000103Csd000030A3* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 4 (Compaq nw8440) + ++pci:v00008086d000027D6sv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 4 (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027D6sv0000144Dsd0000C072* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 4 (Notebook N150P) + +@@ -65021,6 +65135,9 @@ pci:v00008086d000027D8sv00001043sd000082EA* + pci:v00008086d000027D8sv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (D270S/D250S Motherboard) + ++pci:v00008086d000027D8sv00001071sd00008207* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027D8sv0000107Bsd00005048* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (E4500) + +@@ -65099,6 +65216,9 @@ pci:v00008086d000027DAsv00001043sd00008179* + pci:v00008086d000027DAsv0000105Bsd00000D7C* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (D270S/D250S Motherboard) + ++pci:v00008086d000027DAsv00001071sd00008209* ++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (Medion MIM 2240 Notebook PC [MD98100]) ++ + pci:v00008086d000027DAsv000010F7sd00008338* + ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (Panasonic CF-Y5 laptop) + +@@ -65258,6 +65378,9 @@ pci:v00008086d00002815sv0000104Dsd00009005* + pci:v00008086d00002815sv0000104Dsd0000902D* + ID_MODEL_FROM_DATABASE=82801HM (ICH8M) LPC Interface Controller (VAIO VGN-NR120E) + ++pci:v00008086d00002815sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801HM (ICH8M) LPC Interface Controller (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002820* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) 4 port SATA Controller [IDE mode] + +@@ -65342,6 +65465,9 @@ pci:v00008086d00002829sv0000104Dsd0000902D* + pci:v00008086d00002829sv000017AAsd000020A7* + ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (ThinkPad T61/R61) + ++pci:v00008086d00002829sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002829sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (CCG-RUMBA) + +@@ -65393,6 +65519,9 @@ pci:v00008086d00002830sv00001462sd00007235* + pci:v00008086d00002830sv000017AAsd000020AA* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (ThinkPad T61/R61) + ++pci:v00008086d00002830sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002830sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (CCG-RUMBA) + +@@ -65435,6 +65564,9 @@ pci:v00008086d00002831sv00001462sd00007235* + pci:v00008086d00002831sv000017AAsd000020AA* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (ThinkPad T61/R61) + ++pci:v00008086d00002831sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002831sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (CCG-RUMBA) + +@@ -65474,6 +65606,9 @@ pci:v00008086d00002832sv0000104Dsd0000902D* + pci:v00008086d00002832sv000017AAsd000020AA* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (ThinkPad T61/R61) + ++pci:v00008086d00002832sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002832sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (CCG-RUMBA) + +@@ -65519,6 +65654,9 @@ pci:v00008086d00002834sv00001462sd00007235* + pci:v00008086d00002834sv000017AAsd000020AA* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (ThinkPad T61/R61) + ++pci:v00008086d00002834sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002834sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (CCG-RUMBA) + +@@ -65555,6 +65693,9 @@ pci:v00008086d00002835sv0000104Dsd0000902D* + pci:v00008086d00002835sv000017AAsd000020AA* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (Thinkpad T61/R61) + ++pci:v00008086d00002835sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002835sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (CCG-RUMBA) + +@@ -65597,6 +65738,9 @@ pci:v00008086d00002836sv00001462sd00007235* + pci:v00008086d00002836sv000017AAsd000020AB* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (ThinkPad T61/R61) + ++pci:v00008086d00002836sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002836sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (CCG-RUMBA) + +@@ -65633,6 +65777,9 @@ pci:v00008086d0000283Asv0000104Dsd0000902D* + pci:v00008086d0000283Asv000017AAsd000020AB* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (ThinkPad T61/R61) + ++pci:v00008086d0000283Asv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d0000283Asv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (CCG-RUMBA) + +@@ -65669,6 +65816,9 @@ pci:v00008086d0000283Esv00001462sd00007235* + pci:v00008086d0000283Esv000017AAsd000020A9* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (ThinkPad T61/R61) + ++pci:v00008086d0000283Esv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d0000283Esv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (CCG-RUMBA) + +@@ -65687,6 +65837,9 @@ pci:v00008086d0000283Fsv0000104Dsd0000902D* + pci:v00008086d0000283Fsv000017AAsd000020AD* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 1 (ThinkPad T61/R61) + ++pci:v00008086d0000283Fsv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 1 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002841* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 + +@@ -65699,6 +65852,9 @@ pci:v00008086d00002841sv0000104Dsd0000902D* + pci:v00008086d00002841sv000017AAsd000020AD* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 (ThinkPad T61/R61) + ++pci:v00008086d00002841sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002843* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3 + +@@ -65708,12 +65864,18 @@ pci:v00008086d00002843sv0000104Dsd0000902D* + pci:v00008086d00002843sv000017AAsd000020AD* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3 (ThinkPad T61/R61) + ++pci:v00008086d00002843sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002845* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4 + + pci:v00008086d00002845sv000017AAsd000020AD* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4 (ThinkPad T61/R61) + ++pci:v00008086d00002845sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002847* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 5 + +@@ -65726,6 +65888,9 @@ pci:v00008086d00002847sv0000103Csd000030C1* + pci:v00008086d00002847sv000017AAsd000020AD* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 5 (ThinkPad T61/R61) + ++pci:v00008086d00002847sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 5 (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002849* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 6 + +@@ -65792,6 +65957,9 @@ pci:v00008086d0000284Bsv000014F1sd00005051* + pci:v00008086d0000284Bsv000017AAsd000020AC* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (ThinkPad T61/R61) + ++pci:v00008086d0000284Bsv000017C0sd00004088* ++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d0000284Bsv00008384sd00007616* + ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (Dell Vostro 1400) + +@@ -65831,6 +65999,9 @@ pci:v00008086d00002850sv0000104Dsd0000902D* + pci:v00008086d00002850sv000017AAsd000020A6* + ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (ThinkPad T61/R61) + ++pci:v00008086d00002850sv000017C0sd00004083* ++ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002850sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (CCG-RUMBA) + +@@ -66794,6 +66965,9 @@ pci:v00008086d00002A00sv000017AAsd000020B1* + pci:v00008086d00002A00sv000017AAsd000020B3* + ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (ThinkPad T61/R61) + ++pci:v00008086d00002A00sv000017C0sd00004082* ++ ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002A00sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (CCG-RUMBA) + +@@ -66821,6 +66995,9 @@ pci:v00008086d00002A02sv0000104Dsd0000902D* + pci:v00008086d00002A02sv000017AAsd000020B5* + ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (ThinkPad T61/R61) + ++pci:v00008086d00002A02sv000017C0sd00004082* ++ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002A02sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (CCG-RUMBA) + +@@ -66828,7 +67005,7 @@ pci:v00008086d00002A03* + ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) + + pci:v00008086d00002A03sv00001028sd000001F3* +- ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Dell Inspiron 1420) ++ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Inspiron 1420) + + pci:v00008086d00002A03sv0000103Csd000030C0* + ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Compaq 6710b) +@@ -66842,6 +67019,9 @@ pci:v00008086d00002A03sv0000104Dsd0000902D* + pci:v00008086d00002A03sv000017AAsd000020B5* + ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (ThinkPad T61/R61) + ++pci:v00008086d00002A03sv000017C0sd00004082* ++ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Medion WIM 2210 Notebook PC [MD96850]) ++ + pci:v00008086d00002A03sv0000E4BFsd0000CC47* + ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (CCG-RUMBA) + +@@ -67317,13 +67497,13 @@ pci:v00008086d00002D10* + ID_MODEL_FROM_DATABASE=Core Processor QPI Link 0 + + pci:v00008086d00002D11* +- ID_MODEL_FROM_DATABASE=Core Processor QPI Physical 0 ++ ID_MODEL_FROM_DATABASE=1st Generation Core Processor QPI Physical 0 + + pci:v00008086d00002D12* +- ID_MODEL_FROM_DATABASE=Core Processor Reserved ++ ID_MODEL_FROM_DATABASE=1st Generation Core Processor Reserved + + pci:v00008086d00002D13* +- ID_MODEL_FROM_DATABASE=Core Processor Reserved ++ ID_MODEL_FROM_DATABASE=1st Generation Core Processor Reserved + + pci:v00008086d00002D81* + ID_MODEL_FROM_DATABASE=Xeon 5600 Series QuickPath Architecture System Address Decoder +@@ -67427,6 +67607,9 @@ pci:v00008086d00002E11* + pci:v00008086d00002E12* + ID_MODEL_FROM_DATABASE=4 Series Chipset Integrated Graphics Controller + ++pci:v00008086d00002E12sv000017AAsd00003048* ++ ID_MODEL_FROM_DATABASE=4 Series Chipset Integrated Graphics Controller (ThinkCentre M6258) ++ + pci:v00008086d00002E13* + ID_MODEL_FROM_DATABASE=4 Series Chipset Integrated Graphics Controller + +@@ -69317,6 +69500,12 @@ pci:v00008086d00003B09* + pci:v00008086d00003B09sv00001025sd00000347* + ID_MODEL_FROM_DATABASE=Mobile 5 Series Chipset LPC Interface Controller (Aspire 7740G) + ++pci:v00008086d00003B09sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=Mobile 5 Series Chipset LPC Interface Controller (R730 Laptop) ++ ++pci:v00008086d00003B09sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=Mobile 5 Series Chipset LPC Interface Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B0A* + ID_MODEL_FROM_DATABASE=5 Series Chipset LPC Interface Controller + +@@ -69416,18 +69605,36 @@ pci:v00008086d00003B26* + pci:v00008086d00003B28* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA IDE Controller + ++pci:v00008086d00003B28sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA IDE Controller (R730 Laptop) ++ ++pci:v00008086d00003B28sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA IDE Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B29* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller + + pci:v00008086d00003B29sv00001025sd00000347* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller (Aspire 7740G) + ++pci:v00008086d00003B29sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller (R730 Laptop) ++ ++pci:v00008086d00003B29sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B2C* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SATA RAID Controller + + pci:v00008086d00003B2D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller + ++pci:v00008086d00003B2Dsv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller (R730 Laptop) ++ ++pci:v00008086d00003B2Dsv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B2Dsv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller (PC1-GROOVE) + +@@ -69458,9 +69665,15 @@ pci:v00008086d00003B30sv00001028sd000002DA* + pci:v00008086d00003B30sv00001028sd0000040B* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (Latitude E6510) + ++pci:v00008086d00003B30sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (R730 Laptop) ++ + pci:v00008086d00003B30sv000015D9sd0000060D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (C7SIM-Q Motherboard) + ++pci:v00008086d00003B30sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B30sv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (PC1-GROOVE) + +@@ -69470,6 +69683,12 @@ pci:v00008086d00003B32* + pci:v00008086d00003B32sv00001025sd00000347* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset Thermal Subsystem (Aspire 7740G) + ++pci:v00008086d00003B32sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset Thermal Subsystem (R730 Laptop) ++ ++pci:v00008086d00003B32sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset Thermal Subsystem (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B34* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller + +@@ -69482,9 +69701,15 @@ pci:v00008086d00003B34sv00001028sd000002DA* + pci:v00008086d00003B34sv00001028sd0000040B* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Latitude E6510) + ++pci:v00008086d00003B34sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (R730 Laptop) ++ + pci:v00008086d00003B34sv000015D9sd0000060D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (C7SIM-Q Motherboard) + ++pci:v00008086d00003B34sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B34sv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (PC1-GROOVE) + +@@ -69518,9 +69743,15 @@ pci:v00008086d00003B3Csv00001028sd000002DA* + pci:v00008086d00003B3Csv00001028sd0000040B* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Latitude E6510) + ++pci:v00008086d00003B3Csv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (R730 Laptop) ++ + pci:v00008086d00003B3Csv000015D9sd0000060D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (C7SIM-Q Motherboard) + ++pci:v00008086d00003B3Csv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B3Csv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (PC1-GROOVE) + +@@ -69545,9 +69776,15 @@ pci:v00008086d00003B42sv00001028sd000002DA* + pci:v00008086d00003B42sv00001028sd0000040B* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (Latitude E6510) + ++pci:v00008086d00003B42sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (R730 Laptop) ++ + pci:v00008086d00003B42sv000015D9sd0000060D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (C7SIM-Q Motherboard) + ++pci:v00008086d00003B42sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B44* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 2 + +@@ -69557,24 +69794,39 @@ pci:v00008086d00003B44sv00001028sd0000040B* + pci:v00008086d00003B44sv000015D9sd0000060D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 2 (C7SIM-Q Motherboard) + ++pci:v00008086d00003B44sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 2 (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B46* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3 + + pci:v00008086d00003B46sv00001028sd0000040B* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3 (Latitude E6510) + ++pci:v00008086d00003B46sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3 (R730 Laptop) ++ ++pci:v00008086d00003B46sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3 (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B48* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 4 + + pci:v00008086d00003B48sv00001028sd0000040B* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 4 (Latitude E6510) + ++pci:v00008086d00003B48sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 4 (R730 Laptop) ++ + pci:v00008086d00003B4A* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 5 + + pci:v00008086d00003B4Asv00001028sd000002DA* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 5 (OptiPlex 980) + ++pci:v00008086d00003B4Asv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 5 (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B4C* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 6 + +@@ -69599,9 +69851,15 @@ pci:v00008086d00003B56sv00001028sd000002DA* + pci:v00008086d00003B56sv00001028sd0000040B* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (Latitude E6510) + ++pci:v00008086d00003B56sv0000144Dsd0000C06A* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (R730 Laptop) ++ + pci:v00008086d00003B56sv000015D9sd0000060D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (C7SIM-Q Motherboard) + ++pci:v00008086d00003B56sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B56sv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (PC1-GROOVE) + +@@ -69617,6 +69875,9 @@ pci:v00008086d00003B64sv00001025sd00000347* + pci:v00008086d00003B64sv000015D9sd0000060D* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset HECI Controller (C7SIM-Q Motherboard) + ++pci:v00008086d00003B64sv000017C0sd000010D2* ++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset HECI Controller (Medion Akoya E7214 Notebook PC [MD98410]) ++ + pci:v00008086d00003B64sv0000E4BFsd000050C1* + ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset HECI Controller (PC1-GROOVE) + +@@ -69990,7 +70251,7 @@ pci:v00008086d00004222sv00008086sd00001000* + ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (PRO/Wireless 3945ABG Network Connection) + + pci:v00008086d00004222sv00008086sd00001001* +- ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (PRO/Wireless 3945ABG Network Connection) ++ ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (WM3945ABG MOW2) + + pci:v00008086d00004222sv00008086sd00001005* + ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (PRO/Wireless 3945BG Network Connection) +@@ -71168,6 +71429,114 @@ pci:v00008086d00008C5E* + pci:v00008086d00008C5F* + ID_MODEL_FROM_DATABASE=8 Series/C220 Series Chipset Family LPC Controller + ++pci:v00008086d00008C80* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode] ++ ++pci:v00008086d00008C81* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode] ++ ++pci:v00008086d00008C82* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [AHCI Mode] ++ ++pci:v00008086d00008C83* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [AHCI Mode] ++ ++pci:v00008086d00008C84* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode] ++ ++pci:v00008086d00008C85* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode] ++ ++pci:v00008086d00008C86* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode] ++ ++pci:v00008086d00008C87* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode] ++ ++pci:v00008086d00008C88* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode] ++ ++pci:v00008086d00008C89* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode] ++ ++pci:v00008086d00008C8E* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode] ++ ++pci:v00008086d00008C8F* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode] ++ ++pci:v00008086d00008C90* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 1 ++ ++pci:v00008086d00008C92* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 2 ++ ++pci:v00008086d00008C94* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 3 ++ ++pci:v00008086d00008C96* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 4 ++ ++pci:v00008086d00008C98* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 5 ++ ++pci:v00008086d00008C9A* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 6 ++ ++pci:v00008086d00008C9C* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 7 ++ ++pci:v00008086d00008C9E* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 8 ++ ++pci:v00008086d00008CA0* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family HD Audio Controller ++ ++pci:v00008086d00008CA2* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SMBus Controller ++ ++pci:v00008086d00008CA4* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family Thermal Controller ++ ++pci:v00008086d00008CA6* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family USB EHCI Controller #1 ++ ++pci:v00008086d00008CAD* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family USB EHCI Controller #2 ++ ++pci:v00008086d00008CB1* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family USB xHCI Controller ++ ++pci:v00008086d00008CB3* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family LAN Controller ++ ++pci:v00008086d00008CBA* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family ME Interface #1 ++ ++pci:v00008086d00008CBB* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family ME Interface #2 ++ ++pci:v00008086d00008CBC* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family IDE-R Controller ++ ++pci:v00008086d00008CBD* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family KT Controller ++ ++pci:v00008086d00008CC1* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family LPC Controller ++ ++pci:v00008086d00008CC2* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family LPC Controller ++ ++pci:v00008086d00008CC3* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family HM97 LPC Controller ++ ++pci:v00008086d00008CC4* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family Z97 LPC Controller ++ ++pci:v00008086d00008CC6* ++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family H97 Controller ++ + pci:v00008086d00008D00* + ID_MODEL_FROM_DATABASE=Wellsburg 4-port SATA Controller [IDE mode] + +@@ -71379,208 +71748,208 @@ pci:v00008086d000096A1* + ID_MODEL_FROM_DATABASE=Integrated RAID + + pci:v00008086d00009C00* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [IDE mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [IDE mode] + + pci:v00008086d00009C01* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [IDE mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [IDE mode] + + pci:v00008086d00009C02* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [AHCI mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [AHCI mode] + + pci:v00008086d00009C03* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [AHCI mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [AHCI mode] + + pci:v00008086d00009C03sv000017AAsd00002214* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [AHCI mode] (ThinkPad X240) ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [AHCI mode] (ThinkPad X240) + + pci:v00008086d00009C04* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode] + + pci:v00008086d00009C05* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode] + + pci:v00008086d00009C06* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode] + + pci:v00008086d00009C07* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode] + + pci:v00008086d00009C08* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 2 [IDE mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 2 [IDE mode] + + pci:v00008086d00009C09* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 2 [IDE mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 2 [IDE mode] + + pci:v00008086d00009C0A* +- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved] + + pci:v00008086d00009C0B* +- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved] + + pci:v00008086d00009C0C* +- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved] + + pci:v00008086d00009C0D* +- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved] + + pci:v00008086d00009C0E* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode] + + pci:v00008086d00009C0F* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode] ++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode] + + pci:v00008086d00009C10* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 1 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 1 + + pci:v00008086d00009C11* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 1 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 1 + + pci:v00008086d00009C12* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 2 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 2 + + pci:v00008086d00009C13* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 2 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 2 + + pci:v00008086d00009C14* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 3 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 3 + + pci:v00008086d00009C15* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 3 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 3 + + pci:v00008086d00009C16* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 4 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 4 + + pci:v00008086d00009C17* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 4 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 4 + + pci:v00008086d00009C18* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 5 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 5 + + pci:v00008086d00009C19* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 5 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 5 + + pci:v00008086d00009C1A* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 6 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 6 + + pci:v00008086d00009C1B* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 6 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 6 + + pci:v00008086d00009C1C* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 7 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 7 + + pci:v00008086d00009C1D* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 7 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 7 + + pci:v00008086d00009C1E* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 8 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 8 + + pci:v00008086d00009C1F* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 8 ++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 8 + + pci:v00008086d00009C20* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HD Audio Controller ++ ID_MODEL_FROM_DATABASE=8 Series HD Audio Controller + + pci:v00008086d00009C20sv000017AAsd00002214* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HD Audio Controller (ThinkPad X240) ++ ID_MODEL_FROM_DATABASE=8 Series HD Audio Controller (ThinkPad X240) + + pci:v00008086d00009C21* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HD Audio Controller ++ ID_MODEL_FROM_DATABASE=8 Series HD Audio Controller + + pci:v00008086d00009C22* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SMBus Controller ++ ID_MODEL_FROM_DATABASE=8 Series SMBus Controller + + pci:v00008086d00009C22sv000017AAsd00002214* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SMBus Controller (ThinkPad X240) ++ ID_MODEL_FROM_DATABASE=8 Series SMBus Controller (ThinkPad X240) + + pci:v00008086d00009C23* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP CHAP Counters ++ ID_MODEL_FROM_DATABASE=8 Series CHAP Counters + + pci:v00008086d00009C24* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP Thermal ++ ID_MODEL_FROM_DATABASE=8 Series Thermal + + pci:v00008086d00009C26* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB EHCI #1 ++ ID_MODEL_FROM_DATABASE=8 Series USB EHCI #1 + + pci:v00008086d00009C26sv000017AAsd00002214* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB EHCI #1 (ThinkPad X240) ++ ID_MODEL_FROM_DATABASE=8 Series USB EHCI #1 (ThinkPad X240) + + pci:v00008086d00009C2D* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB EHCI #2 ++ ID_MODEL_FROM_DATABASE=8 Series USB EHCI #2 + + pci:v00008086d00009C31* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB xHCI HC ++ ID_MODEL_FROM_DATABASE=8 Series USB xHCI HC + + pci:v00008086d00009C31sv000017AAsd00002214* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB xHCI HC (ThinkPad X240) ++ ID_MODEL_FROM_DATABASE=8 Series USB xHCI HC (ThinkPad X240) + + pci:v00008086d00009C35* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SDIO Controller ++ ID_MODEL_FROM_DATABASE=8 Series SDIO Controller + + pci:v00008086d00009C36* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP Audio DSP Controller ++ ID_MODEL_FROM_DATABASE=8 Series Audio DSP Controller + + pci:v00008086d00009C3A* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI #0 ++ ID_MODEL_FROM_DATABASE=8 Series HECI #0 + + pci:v00008086d00009C3Asv000017AAsd00002214* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI #0 (ThinkPad X240) ++ ID_MODEL_FROM_DATABASE=8 Series HECI #0 (ThinkPad X240) + + pci:v00008086d00009C3B* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI #1 ++ ID_MODEL_FROM_DATABASE=8 Series HECI #1 + + pci:v00008086d00009C3C* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI IDER ++ ID_MODEL_FROM_DATABASE=8 Series HECI IDER + + pci:v00008086d00009C3D* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI KT ++ ID_MODEL_FROM_DATABASE=8 Series HECI KT + + pci:v00008086d00009C40* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C41* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C42* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C43* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C43sv000017AAsd00002214* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller (ThinkPad X240) ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller (ThinkPad X240) + + pci:v00008086d00009C44* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C45* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C46* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C47* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller ++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller + + pci:v00008086d00009C60* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP Low Power Sub-System DMA ++ ID_MODEL_FROM_DATABASE=8 Series Low Power Sub-System DMA + + pci:v00008086d00009C61* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP I2C Controller #0 ++ ID_MODEL_FROM_DATABASE=8 Series I2C Controller #0 + + pci:v00008086d00009C62* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP I2C Controller #1 ++ ID_MODEL_FROM_DATABASE=8 Series I2C Controller #1 + + pci:v00008086d00009C63* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP UART Controller #0 ++ ID_MODEL_FROM_DATABASE=8 Series UART Controller #0 + + pci:v00008086d00009C64* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP UART Controller #1 ++ ID_MODEL_FROM_DATABASE=8 Series UART Controller #1 + + pci:v00008086d00009C65* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SPI Controller #0 ++ ID_MODEL_FROM_DATABASE=8 Series SPI Controller #0 + + pci:v00008086d00009C66* +- ID_MODEL_FROM_DATABASE=Lynx Point-LP SPI Controller #1 ++ ID_MODEL_FROM_DATABASE=8 Series SPI Controller #1 + + pci:v00008086d00009C83* + ID_MODEL_FROM_DATABASE=Wildcat Point-LP SATA Controller [AHCI Mode] +diff --git hwdb/20-usb-classes.hwdb hwdb/20-usb-classes.hwdb +index 3294d8a..418d39b 100644 +--- hwdb/20-usb-classes.hwdb ++++ hwdb/20-usb-classes.hwdb +@@ -311,6 +311,9 @@ usb:v*p*d*dcEFdsc02dp02* + usb:v*p*d*dcEFdsc03dp01* + ID_USB_PROTOCOL_FROM_DATABASE=Cable Based Association + ++usb:v*p*d*dcEFdsc05* ++ ID_USB_SUBCLASS_FROM_DATABASE=USB3 Vision ++ + usb:v*p*d*dcFE* + ID_USB_CLASS_FROM_DATABASE=Application Specific Interface + +diff --git hwdb/20-usb-vendor-model.hwdb hwdb/20-usb-vendor-model.hwdb +index 05f267d..89cd5b1 100644 +--- hwdb/20-usb-vendor-model.hwdb ++++ hwdb/20-usb-vendor-model.hwdb +@@ -284,9 +284,18 @@ usb:v03EBp2310* + usb:v03EBp2FE4* + ID_MODEL_FROM_DATABASE=ATxmega32A4U DFU bootloader + ++usb:v03EBp2FE6* ++ ID_MODEL_FROM_DATABASE=Cactus V6 (DFU) ++ ++usb:v03EBp2FEA* ++ ID_MODEL_FROM_DATABASE=Cactus RF60 (DFU) ++ + usb:v03EBp2FF0* + ID_MODEL_FROM_DATABASE=atmega32u2 DFU bootloader + ++usb:v03EBp2FF4* ++ ID_MODEL_FROM_DATABASE=atmega32u4 DFU bootloader ++ + usb:v03EBp2FFA* + ID_MODEL_FROM_DATABASE=at90usb162 DFU bootloader + +@@ -4409,6 +4418,9 @@ usb:v0424p2602* + usb:v0424p2640* + ID_MODEL_FROM_DATABASE=USB 2.0 Hub + ++usb:v0424p2660* ++ ID_MODEL_FROM_DATABASE=Hub ++ + usb:v0424p4060* + ID_MODEL_FROM_DATABASE=Ultra Fast Media Reader + +@@ -5373,7 +5385,7 @@ usb:v0457p0162* + ID_MODEL_FROM_DATABASE=SiS162 usb Wireless LAN Adapter + + usb:v0457p0163* +- ID_MODEL_FROM_DATABASE=802.11 Wireless LAN Adapter ++ ID_MODEL_FROM_DATABASE=SiS163U 802.11 Wireless LAN Adapter + + usb:v0457p0817* + ID_MODEL_FROM_DATABASE=SiS-184-ASUS-4352.17 touch panel +@@ -6947,6 +6959,9 @@ usb:v046Dp082D* + usb:v046Dp0830* + ID_MODEL_FROM_DATABASE=QuickClip + ++usb:v046Dp0837* ++ ID_MODEL_FROM_DATABASE=BCC950 ConferenceCam ++ + usb:v046Dp0840* + ID_MODEL_FROM_DATABASE=QuickCam Express + +@@ -7856,6 +7871,9 @@ usb:v046DpC52F* + usb:v046DpC532* + ID_MODEL_FROM_DATABASE=Unifying Receiver + ++usb:v046DpC534* ++ ID_MODEL_FROM_DATABASE=Unifying Receiver ++ + usb:v046DpC603* + ID_MODEL_FROM_DATABASE=3Dconnexion Spacemouse Plus XT + +@@ -8738,6 +8756,9 @@ usb:v0480pA007* + usb:v0480pA009* + ID_MODEL_FROM_DATABASE=Stor.E Basics + ++usb:v0480pA00D* ++ ID_MODEL_FROM_DATABASE=STOR.E BASICS 500GB ++ + usb:v0480pD010* + ID_MODEL_FROM_DATABASE=External Disk 3TB + +@@ -10943,6 +10964,9 @@ usb:v04A9p3196* + usb:v04A9p319A* + ID_MODEL_FROM_DATABASE=EOS 7D + ++usb:v04A9p319B* ++ ID_MODEL_FROM_DATABASE=EOS 50D ++ + usb:v04A9p31AA* + ID_MODEL_FROM_DATABASE=SELPHY CP770 + +@@ -11219,6 +11243,15 @@ usb:v04A9p3277* + usb:v04A9p327D* + ID_MODEL_FROM_DATABASE=Powershot ELPH 115 IS / IXUS 132 + ++usb:v04A9p327F* ++ ID_MODEL_FROM_DATABASE=EOS Rebel T5 / EOS 1200D / EOS Kiss X70 ++ ++usb:v04A9p3284* ++ ID_MODEL_FROM_DATABASE=PowerShot D30 ++ ++usb:v04A9p3286* ++ ID_MODEL_FROM_DATABASE=PowerShot SX600 HS ++ + usb:v04A9p3288* + ID_MODEL_FROM_DATABASE=Powershot ELPH 135 / IXUS 145 + +@@ -13040,6 +13073,9 @@ usb:v04D8p0036* + usb:v04D8p00E0* + ID_MODEL_FROM_DATABASE=PIC32 Starter Board + ++usb:v04D8p04CD* ++ ID_MODEL_FROM_DATABASE=28Cxxx EEPROM Programmer ++ + usb:v04D8p0A04* + ID_MODEL_FROM_DATABASE=AGP LIN Serial Analyzer + +@@ -14093,6 +14129,9 @@ usb:v04E8p5F05* + usb:v04E8p6032* + ID_MODEL_FROM_DATABASE=G2 Portable hard drive + ++usb:v04E8p6033* ++ ID_MODEL_FROM_DATABASE=G2 Portable device ++ + usb:v04E8p6034* + ID_MODEL_FROM_DATABASE=G2 Portable hard drive + +@@ -14102,6 +14141,9 @@ usb:v04E8p60B3* + usb:v04E8p60C4* + ID_MODEL_FROM_DATABASE=M2 Portable Hard Drive USB 3.0 + ++usb:v04E8p6124* ++ ID_MODEL_FROM_DATABASE=D3 Station External Hard Drive ++ + usb:v04E8p61B6* + ID_MODEL_FROM_DATABASE=M3 Portable Hard Drive 1TB + +@@ -15224,6 +15266,9 @@ usb:v04F9p0223* + usb:v04F9p0248* + ID_MODEL_FROM_DATABASE=DCP-7055 scanner/printer + ++usb:v04F9p02B3* ++ ID_MODEL_FROM_DATABASE=MFC J4510DW ++ + usb:v04F9p1000* + ID_MODEL_FROM_DATABASE=Printer + +@@ -15546,7 +15591,7 @@ usb:v050Dp0013* + ID_MODEL_FROM_DATABASE=F8T013 Bluetooth Adapter + + usb:v050Dp0017* +- ID_MODEL_FROM_DATABASE=B8T017 Bluetooth+EDR 2.1 ++ ID_MODEL_FROM_DATABASE=B8T017 Bluetooth+EDR 2.1 / F4U017 USB 2.0 7-port Hub + + usb:v050Dp003A* + ID_MODEL_FROM_DATABASE=Universal Media Reader +@@ -15683,6 +15728,9 @@ usb:v050Dp1106* + usb:v050Dp1109* + ID_MODEL_FROM_DATABASE=F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU] + ++usb:v050Dp110A* ++ ID_MODEL_FROM_DATABASE=F9L1101v2 802.11abgn Wireless Adapter [Realtek RTL8192DU] ++ + usb:v050Dp11F2* + ID_MODEL_FROM_DATABASE=ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS] + +@@ -15723,7 +15771,7 @@ usb:v050Dp6051* + ID_MODEL_FROM_DATABASE=F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201] + + usb:v050Dp615A* +- ID_MODEL_FROM_DATABASE=F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323] ++ ID_MODEL_FROM_DATABASE=F7D4101 / F9L1101v1 802.11abgn Wireless Adapter [Broadcom BCM4323] + + usb:v050Dp7050* + ID_MODEL_FROM_DATABASE=F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887] +@@ -16358,6 +16406,9 @@ usb:v0547p2810* + usb:v0547p4D90* + ID_MODEL_FROM_DATABASE=AmScope MD1900 camera + ++usb:v0547p7000* ++ ID_MODEL_FROM_DATABASE=PowerSpec MCE460 Front Panel LED Display ++ + usb:v0547p7777* + ID_MODEL_FROM_DATABASE=Bluetooth Device + +@@ -21677,6 +21728,9 @@ usb:v05F9p2601* + usb:v05F9p2602* + ID_MODEL_FROM_DATABASE=Datalogic Magellan 1100i Barcode Scanner + ++usb:v05F9p4204* ++ ID_MODEL_FROM_DATABASE=Datalogic Gryphon GFS4470 Fixed Scanner ++ + usb:v05F9p5204* + ID_MODEL_FROM_DATABASE=Datalogic Gryphon GFS4170 (config mode) + +@@ -23234,6 +23288,9 @@ usb:v068Ep00D3* + usb:v068Ep00E2* + ID_MODEL_FROM_DATABASE=HFX OEM Joystick + ++usb:v068Ep00F0* ++ ID_MODEL_FROM_DATABASE=Multi-Function Panel ++ + usb:v068Ep00F1* + ID_MODEL_FROM_DATABASE=Pro Throttle + +@@ -25838,6 +25895,9 @@ usb:v0781p74D0* + usb:v0781p74D1* + ID_MODEL_FROM_DATABASE=Sansa Clip+ (msc) + ++usb:v0781p74E5* ++ ID_MODEL_FROM_DATABASE=Sansa Clip Zip ++ + usb:v0781p8181* + ID_MODEL_FROM_DATABASE=Pen Flash + +@@ -26219,6 +26279,9 @@ usb:v07AAp001A* + usb:v07AAp001C* + ID_MODEL_FROM_DATABASE=CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880] + ++usb:v07AAp0020* ++ ID_MODEL_FROM_DATABASE=CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] ++ + usb:v07AAp002E* + ID_MODEL_FROM_DATABASE=CG-WLUSB2GPX [Ralink RT2571W] + +@@ -26939,6 +27002,9 @@ usb:v07CApA827* + usb:v07CApA867* + ID_MODEL_FROM_DATABASE=AVerTV DVB-T (A867) + ++usb:v07CApB300* ++ ID_MODEL_FROM_DATABASE=A300 DVB-T TV receiver ++ + usb:v07CApB800* + ID_MODEL_FROM_DATABASE=MR800 FM Radio + +@@ -27941,6 +28007,9 @@ usb:v083Ap4507* + usb:v083Ap4521* + ID_MODEL_FROM_DATABASE=Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887] + ++usb:v083Ap4531* ++ ID_MODEL_FROM_DATABASE=T-Com Sinus 154 data II [Intersil ISL3887] ++ + usb:v083Ap5046* + ID_MODEL_FROM_DATABASE=SpeedStream 10/100 Ethernet [pegasus] + +@@ -30476,6 +30545,9 @@ usb:v0957p0518* + usb:v0957p0A07* + ID_MODEL_FROM_DATABASE=34411A Multimeter + ++usb:v0957p1507* ++ ID_MODEL_FROM_DATABASE=33210A Waveform Generator ++ + usb:v0957p1745* + ID_MODEL_FROM_DATABASE=Test and Measurement Device (IVI) + +@@ -30876,13 +30948,13 @@ usb:v09D9* + ID_VENDOR_FROM_DATABASE=KRF Tech, Ltd + + usb:v09DA* +- ID_VENDOR_FROM_DATABASE=A4 Tech Co., Ltd ++ ID_VENDOR_FROM_DATABASE=A4Tech Co., Ltd. + + usb:v09DAp0006* + ID_MODEL_FROM_DATABASE=Optical Mouse WOP-35 / Trust 450L Optical Mouse + + usb:v09DAp000A* +- ID_MODEL_FROM_DATABASE=Optical Mouse Opto 510D ++ ID_MODEL_FROM_DATABASE=Optical Mouse Opto 510D / OP-620D + + usb:v09DAp000E* + ID_MODEL_FROM_DATABASE=X-F710F Optical Mouse 3xFire Gaming Mouse +@@ -32174,6 +32246,9 @@ usb:v0AB1* + usb:v0AB1p0002* + ID_MODEL_FROM_DATABASE=OBID RFID-Reader + ++usb:v0AB1p0004* ++ ID_MODEL_FROM_DATABASE=OBID classic-pro ++ + usb:v0ABA* + ID_VENDOR_FROM_DATABASE=Ellisys + +@@ -32571,7 +32646,7 @@ usb:v0B05p1708* + ID_MODEL_FROM_DATABASE=Mass Storage Device + + usb:v0B05p170B* +- ID_MODEL_FROM_DATABASE=Mass Storage Device ++ ID_MODEL_FROM_DATABASE=Multi card reader + + usb:v0B05p170C* + ID_MODEL_FROM_DATABASE=WL-159g 802.11bg +@@ -32687,6 +32762,9 @@ usb:v0B05p17A1* + usb:v0B05p17AB* + ID_MODEL_FROM_DATABASE=USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU] + ++usb:v0B05p17C7* ++ ID_MODEL_FROM_DATABASE=WL-330NUL ++ + usb:v0B05p17C9* + ID_MODEL_FROM_DATABASE=USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526] + +@@ -32714,6 +32792,9 @@ usb:v0B05p5410* + usb:v0B05p5412* + ID_MODEL_FROM_DATABASE=MeMO Pad HD 7 (PTP mode) + ++usb:v0B05p550F* ++ ID_MODEL_FROM_DATABASE=ASUS fonepad 7 ++ + usb:v0B05p6101* + ID_MODEL_FROM_DATABASE=Cable Modem + +@@ -32756,6 +32837,9 @@ usb:v0B0Dp0000* + usb:v0B0E* + ID_VENDOR_FROM_DATABASE=GN Netcom + ++usb:v0B0Ep034C* ++ ID_MODEL_FROM_DATABASE=Jabra UC Voice 750 MS ++ + usb:v0B0Ep0420* + ID_MODEL_FROM_DATABASE=Jabra SPEAK 510 + +@@ -49610,6 +49694,12 @@ usb:v2659p1212* + usb:v2659p1213* + ID_MODEL_FROM_DATABASE=MediaTV Pro III MiniPCIe (US) + ++usb:v2676* ++ ID_VENDOR_FROM_DATABASE=Basler AG ++ ++usb:v2676pBA02* ++ ID_MODEL_FROM_DATABASE=ace ++ + usb:v2730* + ID_VENDOR_FROM_DATABASE=Citizen + +-- +1.7.9.2 + diff --git a/0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch new file mode 100644 index 00000000..7b77e2ab --- /dev/null +++ b/0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -0,0 +1,49 @@ +From 063e36db8aed7b54100b33089deb6d2e86d516b9 Mon Sep 17 00:00:00 2001 +From: Marcel Holtmann +Date: Thu, 3 Jul 2014 16:13:48 +0200 +Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers + +--- + hwdb/20-bluetooth-vendor-product.hwdb | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git hwdb/20-bluetooth-vendor-product.hwdb hwdb/20-bluetooth-vendor-product.hwdb +index 377748a..9f3136a 100644 +--- hwdb/20-bluetooth-vendor-product.hwdb ++++ hwdb/20-bluetooth-vendor-product.hwdb +@@ -1045,7 +1045,31 @@ bluetooth:v0159* + ID_VENDOR_FROM_DATABASE=ChefSteps, Inc. + + bluetooth:v015A* +- ID_VENDOR_FROM_DATABASE=micus AG ++ ID_VENDOR_FROM_DATABASE=micas AG + + bluetooth:v015B* + ID_VENDOR_FROM_DATABASE=Biomedical Research Ltd. ++ ++bluetooth:v015C* ++ ID_VENDOR_FROM_DATABASE=Pitius Tec S.L. ++ ++bluetooth:v015D* ++ ID_VENDOR_FROM_DATABASE=Estimote, Inc. ++ ++bluetooth:v015E* ++ ID_VENDOR_FROM_DATABASE=Unikey Technologies, Inc. ++ ++bluetooth:v015F* ++ ID_VENDOR_FROM_DATABASE=Timer Cap Co. ++ ++bluetooth:v0160* ++ ID_VENDOR_FROM_DATABASE=AwoX ++ ++bluetooth:v0161* ++ ID_VENDOR_FROM_DATABASE=yikes ++ ++bluetooth:v0162* ++ ID_VENDOR_FROM_DATABASE=MADSGlobal NZ Ltd. ++ ++bluetooth:v0163* ++ ID_VENDOR_FROM_DATABASE=PCH International +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 90e46fec..84da0d1b 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Jul 4 10:01:07 UTC 2014 - werner@suse.de + +- Port and add upstream patches + 0001-udev-net_setup_link-add-a-bit-more-logging.patch + 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch + 0002-namespace-fix-uninitialized-memory-access.patch + +------------------------------------------------------------------- +Fri Jul 4 09:43:12 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-architecture-Add-tilegx.patch + 0002-architecture-Add-cris.patch + 0003-arch-add-crisv32-to-uname-check.patch + 0004-architecture-remove-cris-from-uname-list.patch + +------------------------------------------------------------------- +Fri Jul 4 09:32:47 UTC 2014 - werner@suse.de + +- Add upstream patches + 0006-hwdb-update.patch + 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch + ------------------------------------------------------------------- Thu Jul 3 12:48:27 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index fe5fc917..c7666d28 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -633,6 +633,24 @@ Patch309: 0003-localed-consider-an-unset-model-as-a-wildcard.patch Patch310: 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch # PATCH-FIX-UPSTREAM added at 2014/07/03 Patch311: 0005-bus-close-a-bus-that-failed-to-connect.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch312: 0006-hwdb-update.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch313: 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch314: 0001-architecture-Add-tilegx.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch315: 0002-architecture-Add-cris.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch316: 0003-arch-add-crisv32-to-uname-check.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch317: 0004-architecture-remove-cris-from-uname-list.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch320: 0002-namespace-fix-uninitialized-memory-access.patch # UDEV PATCHES # ============ @@ -1203,6 +1221,15 @@ cp %{SOURCE7} m4/ %patch309 -p0 %patch310 -p0 %patch311 -p0 +%patch312 -p0 +%patch313 -p0 +%patch314 -p0 +%patch315 -p0 +%patch316 -p0 +%patch317 -p0 +%patch318 -p0 +%patch319 -p0 +%patch320 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.changes b/systemd.changes index 90e46fec..84da0d1b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Jul 4 10:01:07 UTC 2014 - werner@suse.de + +- Port and add upstream patches + 0001-udev-net_setup_link-add-a-bit-more-logging.patch + 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch + 0002-namespace-fix-uninitialized-memory-access.patch + +------------------------------------------------------------------- +Fri Jul 4 09:43:12 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-architecture-Add-tilegx.patch + 0002-architecture-Add-cris.patch + 0003-arch-add-crisv32-to-uname-check.patch + 0004-architecture-remove-cris-from-uname-list.patch + +------------------------------------------------------------------- +Fri Jul 4 09:32:47 UTC 2014 - werner@suse.de + +- Add upstream patches + 0006-hwdb-update.patch + 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch + ------------------------------------------------------------------- Thu Jul 3 12:48:27 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 1927cd59..c3f179bd 100644 --- a/systemd.spec +++ b/systemd.spec @@ -628,6 +628,24 @@ Patch309: 0003-localed-consider-an-unset-model-as-a-wildcard.patch Patch310: 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch # PATCH-FIX-UPSTREAM added at 2014/07/03 Patch311: 0005-bus-close-a-bus-that-failed-to-connect.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch312: 0006-hwdb-update.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch313: 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch314: 0001-architecture-Add-tilegx.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch315: 0002-architecture-Add-cris.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch316: 0003-arch-add-crisv32-to-uname-check.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch317: 0004-architecture-remove-cris-from-uname-list.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch +# PATCH-FIX-UPSTREAM added at 2014/07/04 +Patch320: 0002-namespace-fix-uninitialized-memory-access.patch # UDEV PATCHES # ============ @@ -1198,6 +1216,15 @@ cp %{SOURCE7} m4/ %patch309 -p0 %patch310 -p0 %patch311 -p0 +%patch312 -p0 +%patch313 -p0 +%patch314 -p0 +%patch315 -p0 +%patch316 -p0 +%patch317 -p0 +%patch318 -p0 +%patch319 -p0 +%patch320 -p0 # udev patches %patch1001 -p1 From 554edd819970696d6ab47fc1859936f48b68ef63318db5c8d66e64e01187e2d8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 7 Jul 2014 12:54:09 +0000 Subject: [PATCH 12/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=705 --- ...-don-t-return-uninitialized-variable.patch | 26 +++ ...le-setup-run-setfont-before-loadkeys.patch | 166 ++++++++++++++++++ systemd-mini.spec | 6 + systemd.spec | 6 + 4 files changed, 204 insertions(+) create mode 100644 0001-machine-don-t-return-uninitialized-variable.patch create mode 100644 0002-vconsole-setup-run-setfont-before-loadkeys.patch diff --git a/0001-machine-don-t-return-uninitialized-variable.patch b/0001-machine-don-t-return-uninitialized-variable.patch new file mode 100644 index 00000000..5c1bfd05 --- /dev/null +++ b/0001-machine-don-t-return-uninitialized-variable.patch @@ -0,0 +1,26 @@ +From f14aa1f1b2e4e99ee20393871b5f64f1378ed6c3 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Sun, 6 Jul 2014 14:12:28 +0200 +Subject: [PATCH] machine: don't return uninitialized variable + +Repotred by Ronny Chevalier +--- + src/machine/machine.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/machine/machine.c src/machine/machine.c +index c0fa1b2..cf38e3f 100644 +--- src/machine/machine.c ++++ src/machine/machine.c +@@ -371,7 +371,7 @@ static int machine_stop_scope(Machine *m) { + free(m->scope_job); + m->scope_job = job; + +- return r; ++ return 0; + } + + int machine_stop(Machine *m) { +-- +1.7.9.2 + diff --git a/0002-vconsole-setup-run-setfont-before-loadkeys.patch b/0002-vconsole-setup-run-setfont-before-loadkeys.patch new file mode 100644 index 00000000..dab9f876 --- /dev/null +++ b/0002-vconsole-setup-run-setfont-before-loadkeys.patch @@ -0,0 +1,166 @@ +Based on abee28c56d523e55751b0c007d0bf812cc285c00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 1 Jul 2014 22:20:11 -0400 +Subject: [PATCH] vconsole-setup: run setfont before loadkeys + +https://bugs.freedesktop.org/show_bug.cgi?id=80685 + +For SUSE please note that this had been ported on top of the patches + * handle-disable_caplock-and-compose_table-and-kbd_rate.patch + * handle-numlock-value-in-etc-sysconfig-keyboard.patch +that is that now set_kbd_rate() will be called first before font_load(). +Then font_load() is followed by load_compose_table() and afterwards as +in the original commit the keymap_load() follows. + +--- + src/vconsole/vconsole-setup.c | 93 +++++++++++++++++++++--------------------- + 1 file changed, 47 insertions(+), 46 deletions(-) + +--- src/vconsole/vconsole-setup.c ++++ src/vconsole/vconsole-setup.c 2014-07-07 12:30:27.390235226 +0000 +@@ -340,23 +340,20 @@ static int set_kbd_rate(const char *vc, + + int main(int argc, char **argv) { + const char *vc; +- char *vc_keymap = NULL; +- char *vc_keymap_toggle = NULL; +- char *vc_font = NULL; +- char *vc_font_map = NULL; +- char *vc_font_unimap = NULL; ++ _cleanup_free_ char ++ *vc_keymap = NULL, *vc_keymap_toggle = NULL, ++ *vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL; ++ _cleanup_close_ int fd = -1; + #ifdef HAVE_SYSV_COMPAT +- char *vc_kbd_delay = NULL; +- char *vc_kbd_rate = NULL; +- char *vc_kbd_disable_caps_lock = NULL; +- char *vc_kbd_numlock = NULL; +- char *vc_compose_table = NULL; ++ _cleanup_free_ char ++ *vc_kbd_numlock = NULL, *vc_kbd_delay = NULL, ++ *vc_kbd_rate = NULL, * vc_kbd_disable_caps_lock = NULL, ++ *vc_compose_table = NULL; + pid_t kbd_rate_pid = 0, compose_table_pid = 0; ++ bool numlock = false; + #endif +- int fd = -1; + bool utf8; + bool disable_capslock = false; +- bool numlock = false; + pid_t font_pid = 0, keymap_pid = 0; + bool font_copy = false; + int r = EXIT_FAILURE; +@@ -377,12 +374,12 @@ int main(int argc, char **argv) { + fd = open_terminal(vc, O_RDWR|O_CLOEXEC); + if (fd < 0) { + log_error("Failed to open %s: %m", vc); +- goto finish; ++ return EXIT_FAILURE; + } + + if (!is_vconsole(fd)) { + log_error("Device %s is not a virtual console.", vc); +- goto finish; ++ return EXIT_FAILURE; + } + + utf8 = is_locale_utf8(); +@@ -464,61 +461,65 @@ int main(int argc, char **argv) { + } else + #endif + numlock = vc_kbd_numlock && strcaseeq(vc_kbd_numlock, "yes"); +- + #endif + } + ++#ifdef HAVE_SYSV_COMPAT ++finish: ++ r = set_kbd_rate(vc, vc_kbd_rate, vc_kbd_delay, &kbd_rate_pid); ++ if (r < 0) { ++ log_error("Failed to start /bin/kbdrate: %s", strerror(-r)); ++ return EXIT_FAILURE; ++ } ++#endif ++ + if (utf8) + enable_utf8(fd); + else + disable_utf8(fd); + +- r = EXIT_FAILURE; ++ r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid); ++ if (r < 0) { ++ log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r)); ++ return EXIT_FAILURE; ++ } ++ ++ if (font_pid > 0) ++ wait_for_terminate_and_warn(KBD_SETFONT, font_pid); + +- if (keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, disable_capslock, &keymap_pid) >= 0 && + #ifdef HAVE_SYSV_COMPAT +- load_compose_table(vc, vc_compose_table, &compose_table_pid) >= 0 && +- set_kbd_rate(vc, vc_kbd_rate, vc_kbd_delay, &kbd_rate_pid) >= 0 && ++ r = load_compose_table(vc, vc_compose_table, &compose_table_pid); ++ if (r < 0) { ++ log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r)); ++ return EXIT_FAILURE; ++ } ++ ++ if (compose_table_pid > 0) ++ wait_for_terminate_and_warn(KBD_LOADKEYS, compose_table_pid); + #endif +- font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) +- r = EXIT_SUCCESS; + +-finish: ++ r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, disable_capslock, &keymap_pid); ++ if (r < 0) { ++ log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r)); ++ return EXIT_FAILURE; ++ } ++ + if (keymap_pid > 0) + wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid); ++ ++#ifdef HAVE_SYSV_COMPAT + if (numlock) + touch("/run/numlock-on"); + else + unlink("/run/numlock-on"); + +-#ifdef HAVE_SYSV_COMPAT +- if (compose_table_pid > 0) +- wait_for_terminate_and_warn(KBD_LOADKEYS, compose_table_pid); +- + if (kbd_rate_pid > 0) + wait_for_terminate_and_warn("/bin/kbdrate", kbd_rate_pid); + #endif + +- if (font_pid > 0) { +- wait_for_terminate_and_warn(KBD_SETFONT, font_pid); +- if (font_copy) +- font_copy_to_all_vcs(fd); +- } +- +- free(vc_keymap); +- free(vc_font); +- free(vc_font_map); +- free(vc_font_unimap); +- free(vc_kbd_numlock); +-#ifdef HAVE_SYSV_COMPAT +- free(vc_kbd_delay); +- free(vc_kbd_rate); +- free(vc_kbd_disable_caps_lock); +- free(vc_compose_table); +-#endif +- +- if (fd >= 0) +- close_nointr_nofail(fd); ++ /* Only copy the font when we started setfont successfully */ ++ if (font_copy && font_pid > 0) ++ font_copy_to_all_vcs(fd); + + return r; + } diff --git a/systemd-mini.spec b/systemd-mini.spec index c7666d28..c3fab973 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -651,6 +651,10 @@ Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 Patch320: 0002-namespace-fix-uninitialized-memory-access.patch +# PATCH-FIX-UPSTREAM added at 2014/07/07 +Patch321: 0001-machine-don-t-return-uninitialized-variable.patch +# PATCH-FIX-UPSTREAM added at 2014/07/07 +Patch322: 0002-vconsole-setup-run-setfont-before-loadkeys.patch # UDEV PATCHES # ============ @@ -1230,6 +1234,8 @@ cp %{SOURCE7} m4/ %patch318 -p0 %patch319 -p0 %patch320 -p0 +%patch321 -p0 +%patch322 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.spec b/systemd.spec index c3f179bd..f22a5834 100644 --- a/systemd.spec +++ b/systemd.spec @@ -646,6 +646,10 @@ Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 Patch320: 0002-namespace-fix-uninitialized-memory-access.patch +# PATCH-FIX-UPSTREAM added at 2014/07/07 +Patch321: 0001-machine-don-t-return-uninitialized-variable.patch +# PATCH-FIX-UPSTREAM added at 2014/07/07 +Patch322: 0002-vconsole-setup-run-setfont-before-loadkeys.patch # UDEV PATCHES # ============ @@ -1225,6 +1229,8 @@ cp %{SOURCE7} m4/ %patch318 -p0 %patch319 -p0 %patch320 -p0 +%patch321 -p0 +%patch322 -p0 # udev patches %patch1001 -p1 From 2f80b3823b84fee5787e89f35cbe64712cac9d539b6078e3cdd78c2192c38453 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Mon, 7 Jul 2014 13:05:01 +0000 Subject: [PATCH 13/14] Accepting request 239778 from home:rmilasan:branches:Base:System - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch OBS-URL: https://build.opensuse.org/request/show/239778 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=706 --- ...dev-net_setup_link-add-a-bit-more-logging.patch | 0 systemd-mini.changes | 8 ++++++++ systemd-mini.spec | 14 +++++++------- systemd.changes | 8 ++++++++ systemd.spec | 14 +++++++------- 5 files changed, 30 insertions(+), 14 deletions(-) rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch => 1048-udev-net_setup_link-add-a-bit-more-logging.patch (100%) diff --git a/0001-udev-net_setup_link-add-a-bit-more-logging.patch b/1048-udev-net_setup_link-add-a-bit-more-logging.patch similarity index 100% rename from 0001-udev-net_setup_link-add-a-bit-more-logging.patch rename to 1048-udev-net_setup_link-add-a-bit-more-logging.patch diff --git a/systemd-mini.changes b/systemd-mini.changes index 84da0d1b..25a7862c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 7 13:04:00 UTC 2014 - rmilasan@suse.com + +- Rename + 0001-udev-net_setup_link-add-a-bit-more-logging.patch + to + 1048-udev-net_setup_link-add-a-bit-more-logging.patch + ------------------------------------------------------------------- Fri Jul 4 10:01:07 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index c3fab973..ea36e8a2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -646,15 +646,13 @@ Patch316: 0003-arch-add-crisv32-to-uname-check.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 Patch317: 0004-architecture-remove-cris-from-uname-list.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 -Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch +Patch318: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 -Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch -# PATCH-FIX-UPSTREAM added at 2014/07/04 -Patch320: 0002-namespace-fix-uninitialized-memory-access.patch +Patch319: 0002-namespace-fix-uninitialized-memory-access.patch # PATCH-FIX-UPSTREAM added at 2014/07/07 -Patch321: 0001-machine-don-t-return-uninitialized-variable.patch +Patch320: 0001-machine-don-t-return-uninitialized-variable.patch # PATCH-FIX-UPSTREAM added at 2014/07/07 -Patch322: 0002-vconsole-setup-run-setfont-before-loadkeys.patch +Patch321: 0002-vconsole-setup-run-setfont-before-loadkeys.patch # UDEV PATCHES # ============ @@ -756,6 +754,8 @@ Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch # PATCH-FIX-UPSTREAM added at 2014/07/03 Patch1047: 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch +# PATCH-FIX-UPSTREAM 1048-udev-net_setup_link-add-a-bit-more-logging.patch +Patch1048: 1048-udev-net_setup_link-add-a-bit-more-logging.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1235,7 +1235,6 @@ cp %{SOURCE7} m4/ %patch319 -p0 %patch320 -p0 %patch321 -p0 -%patch322 -p0 # udev patches %patch1001 -p1 @@ -1292,6 +1291,7 @@ cp %{SOURCE7} m4/ %patch1045 -p0 %patch1046 -p1 %patch1047 -p0 +%patch1048 -p0 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 84da0d1b..25a7862c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 7 13:04:00 UTC 2014 - rmilasan@suse.com + +- Rename + 0001-udev-net_setup_link-add-a-bit-more-logging.patch + to + 1048-udev-net_setup_link-add-a-bit-more-logging.patch + ------------------------------------------------------------------- Fri Jul 4 10:01:07 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index f22a5834..6d3eac09 100644 --- a/systemd.spec +++ b/systemd.spec @@ -641,15 +641,13 @@ Patch316: 0003-arch-add-crisv32-to-uname-check.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 Patch317: 0004-architecture-remove-cris-from-uname-list.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 -Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch +Patch318: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch # PATCH-FIX-UPSTREAM added at 2014/07/04 -Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch -# PATCH-FIX-UPSTREAM added at 2014/07/04 -Patch320: 0002-namespace-fix-uninitialized-memory-access.patch +Patch319: 0002-namespace-fix-uninitialized-memory-access.patch # PATCH-FIX-UPSTREAM added at 2014/07/07 -Patch321: 0001-machine-don-t-return-uninitialized-variable.patch +Patch320: 0001-machine-don-t-return-uninitialized-variable.patch # PATCH-FIX-UPSTREAM added at 2014/07/07 -Patch322: 0002-vconsole-setup-run-setfont-before-loadkeys.patch +Patch321: 0002-vconsole-setup-run-setfont-before-loadkeys.patch # UDEV PATCHES # ============ @@ -751,6 +749,8 @@ Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch # PATCH-FIX-UPSTREAM added at 2014/07/03 Patch1047: 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch +# PATCH-FIX-UPSTREAM 1048-udev-net_setup_link-add-a-bit-more-logging.patch +Patch1048: 1048-udev-net_setup_link-add-a-bit-more-logging.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1230,7 +1230,6 @@ cp %{SOURCE7} m4/ %patch319 -p0 %patch320 -p0 %patch321 -p0 -%patch322 -p0 # udev patches %patch1001 -p1 @@ -1287,6 +1286,7 @@ cp %{SOURCE7} m4/ %patch1045 -p0 %patch1046 -p1 %patch1047 -p0 +%patch1048 -p0 # ensure generate files are removed rm -f units/emergency.service From 6930be22455374be904a421888e4397e99572a81eea562f379331385195b98b9 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 7 Jul 2014 13:07:47 +0000 Subject: [PATCH 14/14] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=707 --- systemd-mini.changes | 8 ++++++++ systemd.changes | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 25a7862c..8bec33f3 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 7 13:06:35 UTC 2014 - werner@suse.de + +- Add upstream patch + 0001-machine-don-t-return-uninitialized-variable.patch +- Port and add upstream patch + 0002-vconsole-setup-run-setfont-before-loadkeys.patch + ------------------------------------------------------------------- Mon Jul 7 13:04:00 UTC 2014 - rmilasan@suse.com diff --git a/systemd.changes b/systemd.changes index 25a7862c..8bec33f3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 7 13:06:35 UTC 2014 - werner@suse.de + +- Add upstream patch + 0001-machine-don-t-return-uninitialized-variable.patch +- Port and add upstream patch + 0002-vconsole-setup-run-setfont-before-loadkeys.patch + ------------------------------------------------------------------- Mon Jul 7 13:04:00 UTC 2014 - rmilasan@suse.com