Updated CPE mapping and alias list.

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@47165 e39458fd-73e7-0310-bf30-c45bca0a0e42

2 files changed, 33 insertions, 11 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 69b0f2d237..e3b8e9733d 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -228,12 +228,16 @@ cpe:/a:gnome:display_manager
 
 cpe:/a:horde:horde
 cpe:/a:horde:application_framework
+cpe:/a:horde:horde_application_framework
 
 cpe:/a:debian:turba
 cpe:/a:horde:turba_contact_manager
 cpe:/a:horde:turba_contact_manager_h3
 cpe:/a:horde:turba_h3
 
+cpe:/a:horde:nag_h3
+cpe:/a:horde:nag_task_list_manager_h3
+
 cpe:/a:john_horne:rkhunter
 cpe:/a:gentoo:rootkit_hunter
 
@@ -321,6 +325,7 @@ cpe:/a:bestpractical:request_tracker
 cpe:/a:cmu:cyrus_imap_server
 cpe:/a:cyrus:imapd
 cpe:/a:carnegie_mellon_university:cyrus_imap_server
+cpe:/a:cyrus:imap
 
 cpe:/a:tikiwiki:tikiwiki_cms_groupware
 cpe:/a:tikiwiki_project:tikiwiki
@@ -406,12 +411,6 @@ cpe:/a:balabit:syslog-ng_open_source_edition
 cpe:/a:raphael_assenat:libmikmod
 cpe:/a:igno_saitz:libmikmod
 
-cpe:/a:horde:horde
-cpe:/a:horde:horde_application_framework
-
-cpe:/a:horde:nag_h3
-cpe:/a:horde:nag_task_list_manager_h3
-
 cpe:/a:ja-sig:phpcas_client_library
 cpe:/a:jasig:phpcas
 cpe:/a:joachim_fritschi:phpcas
@@ -447,6 +446,7 @@ cpe:/o:bacula:bacula
 
 cpe:/a:fuse:fuse
 cpe:/a:miklos_szeredi:fuse
+cpe:/a:debian:fuse
 
 cpe:/a:exiv2:exiv2
 cpe:/a:andreas_huggel:exiv2
@@ -938,15 +938,27 @@ cpe:/a:gnu:gnu_screen
 cpe:/a:niels_provos:libevent
 cpe:/a:libevent_project:libevent
 
-cpe:/a:extplorer:extplorer
-cpe:/a:extplorer:extplorer
-
 cpe:/a:todd_miller:sudo
 cpe:/a:sudo_project:sudo
 
 cpe:/a:freedesktop:policykit
 cpe:/a:polkit_project:polkit
 
+cpe:/a:inria:ocaml
+cpe:/a:ocaml:ocaml
+
+cpe:/a:linuxprinting.org:foomatic-filters
+cpe:/a:linuxfoundation:foomatic-filters
+
+cpe:/a:latex2rtf:latex2rtf
+cpe:/a:latex2rtf_project:latex2rtf
+
+cpe:/a:wpa_supplicant:wpa_supplicant
+cpe:/a:w1.fi:wpa_supplicant
+
+cpe:/a:horde:horde_groupware
+cpe:/a:horde:groupware
+
 # Dummy entries to hide noise
 #cpe:/a:webkit:webkit
 #cpe:/a:google:chrome
diff --git a/data/CPE/list b/data/CPE/list
index 8f205fac41..63a7ca9445 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -231,6 +231,7 @@ cuteflow;cpe:/a:cuteflow-bin:cuteflow_bin
 cvs;cpe:/a:nongnu:cvs
 cvsnt;cpe:/a:march-hare:cvsnt
 cvstrac;cpe:/a:cvstrac:cvstrac
+cyassl;cpe:/a:yassl:cyassl
 cyrus-imapd-2.2;cpe:/a:cmu:cyrus_imap_server
 cyrus-imapd-2.4;cpe:/a:cmu:cyrus_imap_server
 cyrus-imapd;cpe:/a:carnegie_mellon_university:cyrus_imap_server
@@ -357,7 +358,7 @@ exim4;cpe:/a:exim:exim
 exim;cpe:/a:exim:exim
 exiv2;cpe:/a:exiv2:exiv2
 expat;cpe:/a:james_clark:expat
-extplorer;cpe:/a:extplorer:extplorer).
+extplorer;cpe:/a:extplorer:extplorer
 ez-ipupdate;cpe:/a:angus_mackay:ez-ipupdate
 ezpublish;cpe:/a:ez:ez_publish
 faad2;cpe:/a:audiocoding:faad2
@@ -429,6 +430,7 @@ fuseiso;cpe:/a:fuseiso_project:fuseiso
 fusionforge;cpe:/a:fusionforge:fusionforge
 fvwm;cpe:/a:fvwm:fvwm
 fwbuilder;cpe:/a:fwbuilder:firewall_builder
+fwsnort;cpe:/a:cipherdyne:fwsnort
 gaim-encryption;cpe:/a:gaim-encryption:gaim-encryption
 gaim;cpe:/a:rob_flynn:gaim
 gajim;cpe:/a:gajim:gajim
@@ -802,6 +804,7 @@ libmatroska;cpe:/a:matroska:libmatroska
 libmikmod;cpe:/a:raphael_assenat:libmikmod
 libmodplug;cpe:/a:konstanty_bialkowski:libmodplug
 libmojolicious-perl;cpe:/a:mojolicious:mojolicious
+libmspack;cpe:/a:libmspack_project:libmspack
 libmusicbrainz-2.0;cpe:/a:musicbrainz:libmusicbrainz
 libmusicbrainz-2.1;cpe:/a:musicbrainz:libmusicbrainz
 libnasl;cpe:/a:finkproject:libnasl
@@ -950,6 +953,7 @@ mantis;cpe:/a:mantisbt:mantisbt
 mapserver;cpe:/a:umn:mapserver
 maradns;cpe:/a:maradns:maradns
 mariadb-10.0;cpe:/a:mariadb:mariadb
+mariadb-5.5;cpe:/a:mariadb:mariadb
 mason;cpe:/a:william_stearns:mason
 masqmail;cpe:/a:masqmail:masqmail
 mathopd;cpe:/a:mathopd:mathopd
@@ -1024,6 +1028,7 @@ mtink;cpe:/a:jean-jacques_sarton:mtink
 mtr;cpe:/a:matt_kimball_and_roger_wolff:mtr
 multi-gnome-terminal;cpe:/a:mohammed_sameer:multi-gnome-terminal
 multipath-tools;cpe:/a:christophe.varoqui:multipath-tools
+mumble;cpe:/a:light_speed_gaming:mumble
 mupdf;cpe:/a:artifex:mupdf
 murano-dashboard;cpe:/a:openstack:murano-dashboard
 murano;cpe:/a:openstack:murano
@@ -1130,6 +1135,7 @@ oops;cpe:/a:igor_khasilev:oops_proxy_server
 op;cpe:/a:swapoff:op
 open-iscsi;cpe:/a:redhat:open_iscsi
 open-vm-tools;cpe:/a:vmware:open-vm-tools
+open-xchange;cpe:/a:open-xchange:open-xchange_appsuite
 openafs;cpe:/a:openafs:openafs
 openarena;cpe:/a:openarena:openarena
 openconnect;cpe:/a:infradead:openconnect
@@ -1193,7 +1199,7 @@ patch;cpe:/a:gnu:patch
 pavuk;cpe:/a:pavuk:pavuk
 pax;cpe:/a:pax_project:pax
 pcal;cpe:/a:pcal:pcal
-pcre2;cpe:/a:pcre:pcre2
+pcre2;cpe:/a:pcre:pcre
 pcre3;cpe:/a:pcre:pcre
 pcsc-lite;cpe:/a:muscle:pcsc-lite
 pdfjam;cpe:/a:pdfjam:pdfjam
@@ -1280,6 +1286,8 @@ postgresql-8.3;cpe:/a:postgresql:postgresql
 postgresql-8.4;cpe:/a:postgresql:postgresql
 postgresql-9.0;cpe:/a:postgresql:postgresql
 postgresql-9.1;cpe:/a:postgresql:postgresql
+postgresql-9.2;cpe:/a:postgresql:postgresql
+postgresql-9.3;cpe:/a:postgresql:postgresql
 postgresql-9.4;cpe:/a:postgresql:postgresql
 postgresql-9.5;cpe:/a:postgresql:postgresql
 postgresql-ocaml;cpe:/a:ocaml:postgresql-ocaml
@@ -1476,6 +1484,7 @@ sork-forwards;cpe:/a:horde:forwards
 sork-passwd-h3;cpe:/a:horde:passwd
 sork-passwd;cpe:/a:horde:passwd
 sork-vacation;cpe:/a:horde:vaction
+sosreport;cpe:/a:sosreport_project:sosreport
 sox;cpe:/a:sox:sox
 spamass-milter;cpe:/a:georg_greve:spamassassin_milter_plugin
 spamassassin;cpe:/a:spamassassin:spamassassin
@@ -1617,6 +1626,7 @@ typo3-src;cpe:/a:typo3:typo3
 typo;cpe:/a:typosphere:typo
 ucd-snmp;cpe:/a:net-snmp:net-snmp
 udev;cpe:/a:kernel:udev
+udisks2;cpe:/a:freedesktop:udisks
 udisks;cpe:/a:freedesktop:udisks
 ufraw;cpe:/a:dcraw_project:dcraw
 uim;cpe:/a:uim:uim