More aliases and a new CPE mapping.

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

2 files changed, 34 insertions, 0 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index bbdbd532bf..9c2dd3f87c 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -1068,6 +1068,12 @@ cpe:/a:apache:xerces-c%5c%2b%5c%2b
 cpe:/a:mozilla:firefox
 cpe:/a:mozilla:firefox_esr
 
+cpe:/a:redhat:spice-gtk
+cpe:/a:freedesktop:spice-gtk
+
+cpe:/a:vmware:vmware_player
+cpe:/a:vmware:vmware_player_2
+
 # Dummy entries to hide noise
 #cpe:/a:webkit:webkit
 #cpe:/a:google:chrome
@@ -1093,3 +1099,13 @@ cpe:/a:mozilla:firefox_esr
 #cpe:/a:qemu:qemu
 #cpe:/a:xensource:xen
 #cpe:/o:xen:xen
+
+# Dummy entries to hide noise
+#cpe:/a:vmware:ace
+#cpe:/a:vmware:esx
+#cpe:/a:vmware:esxi
+#cpe:/a:vmware:player
+#cpe:/a:vmware:server
+#cpe:/a:vmware:vmware_server
+#cpe:/a:vmware:vmware_workstation
+#cpe:/a:vmware:workstation
diff --git a/data/CPE/list b/data/CPE/list
index 7e875c1ad5..1bff9a191e 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -5,6 +5,7 @@ abcm2ps;cpe:/a:jef_moine:abcm2ps
 abcmidi;cpe:/a:abcmidi:abcmidi
 abiword;cpe:/a:abisource:community_abiword
 abuse;cpe:/a:abuse:abuse-sdl
+accountsservice;cpe:/a:ray_stode:accountsservice
 acidbase;cpe:/a:base:basic_analysis_and_security_engine
 acidlab;cpe:/a:acid:analysis_console_for_intrusion_databases
 acl;cpe:/a:xfs:acl
@@ -127,6 +128,7 @@ bochs;cpe:/a:bochs:bochs
 bogofilter;cpe:/a:bogofilter:bogofilter
 boinc;cpe:/a:berkeley:boinc_client
 bomberclone;cpe:/a:bomberclone:bomberclone
+bonsai;cpe:/a:mozilla:bonsai
 boost;cpe:/a:boost:boost
 botan1.10;cpe:/a:botan_project:botan
 bottle;cpe:/a:bottlepy:bottle
@@ -155,6 +157,7 @@ cairo;cpe:/a:cairographics:cairo
 cakephp;cpe:/a:cakefoundation:cakephp
 calife;cpe:/a:calife:calife
 camlimages;cpe:/a:jun_furuse:camlimages
+canna;cpe:/a:canna:canna
 capi4hylafax;cpe:/a:julian_pawlowski:capi4hylafax
 cassandra;cpe:/a:apache:cassandra
 catfish;cpe:/a:catfish_project:catfish
@@ -328,6 +331,7 @@ dulwich;cpe:/a:dulwich_project:dulwich
 duplicity;cpe:/a:duplicity:duplicity
 dvipng;cpe:/a:jan-ake_larsson:dvipng
 dwarfutils;cpe:/a:libdwarf_project:libdwarf
+dwr;cpe:/a:directwebremoting:direct_web_remoting
 e2fsprogs;cpe:/a:ext2_filesystems_utilities:e2fsprogs
 eaccelerator-src;cpe:/a:eaccelerator:eaccelerator
 ecartis;cpe:/a:ecartis:ecartis
@@ -507,6 +511,7 @@ glassfish;cpe:/a:oracle:sun_glassfish_enterprise_server
 glib2.0;cpe:/a:gnome:glib
 glibc;cpe:/a:gnu:glibc
 glpi;cpe:/a:glpi-project:glpi
+glusterfs;cpe:/a:gluster:glusterfs
 gmanedit;cpe:/a:gmanedit2:gmanedit
 gmime2.2;cpe:/a:gnome:gmime
 gmime2.4;cpe:/a:gnome:gmime
@@ -603,6 +608,7 @@ hsolink;cpe:/a:pharscape:hsolink
 ht;cpe:/a:ht_editor:ht_editor
 htdig;cpe:/a:htdig:htdig
 htget;cpe:/a:htget:htget
+html2ps;cpe:/a:html2ps_project:html2ps
 htmldoc;cpe:/a:htmldoc:htmldoc
 htmlheadline;cpe:/a:toshiaki_kanosue:htmlheadline
 htop;cpe:/a:htop:htop
@@ -649,6 +655,7 @@ iperf3;cpe:/a:iperf_project:iperf
 ipmenu;cpe:/a:david_stes:ipmenu
 ipplan;cpe:/a:richard_ellerbrock:ipplan
 ippusbxd;cpe:/a:ippusbxd_project:ippusbxd
+iproute;cpe:/a:iproute2_project:iproute2
 ipsec-tools;cpe:/a:ipsec-tools:ipsec-tools
 iputils;cpe:/a:skbuff:iputils
 ipython;cpe:/a:ipython:notebook
@@ -876,6 +883,7 @@ libphp-snoopy;cpe:/a:andrei_zmievski:snoopy
 libpng1.6;cpe:/a:libpng:libpng
 libpng3;cpe:/a:libpng:libpng
 libpng;cpe:/a:libpng:libpng
+libraw;cpe:/a:libraw:libraw
 libreoffice;cpe:/a:libreoffice:libreoffice
 libreswan;cpe:/a:libreswan:libreswan
 librsvg;cpe:/a:gnome:librsvg
@@ -933,6 +941,8 @@ libxstream-java;cpe:/a:x-stream:xstream
 libxtst;cpe:/a:x.org:libxtst
 libxv;cpe:/a:x.org:libxv
 libxvmc;cpe:/a:x.org:libxvmc
+libyaml;cpe:/a:pyyaml:libyaml
+libzip;cpe:/a:nih:libzip
 licq;cpe:/a:licq:licq
 liferay-portal;cpe:/a:liferay:portal
 liferea;cpe:/a:liferea:liferea
@@ -1053,6 +1063,7 @@ mnogosearch;cpe:/a:mnogosearch:mnogosearch
 mod-auth-mysql;cpe:/a:joey_schulze:mod_auth_mysql
 mod-auth-shadow;cpe:/a:mod_auth_shadow:mod_auth_shadow
 mod-gnutls;cpe:/a:apache:mod-gnutls
+modsecurity-apache;cpe:/a:modsecurity:modsecurity
 module-assistant;cpe:/a:eduard_bloch:module-assistant
 moin;cpe:/a:moinmo:moinmoin
 mojarra;cpe:/a:oracle:mojarra
@@ -1144,6 +1155,7 @@ network-manager-applet;cpe:/a:gnome:networkmanager
 network-manager;cpe:/a:gnome:networkmanager
 neutron;cpe:/a:openstack:neutron
 newsbeuter;cpe:/a:newsbeuter:newsbeuter
+newscoop;cpe:/a:sourcefabric:newscoop
 newsgate;cpe:/a:debian:newsgate
 newspost;cpe:/a:newspost:newspost
 newsx;cpe:/a:fedora:newsx
@@ -1183,6 +1195,7 @@ nvidia-kernel-common;cpe:/a:nvidia:video_driver
 oar;cpe:/a:oar_project:oar
 ocaml;cpe:/a:inria:ocaml
 ocp;cpe:/a:open_cubic_player:open_cubic_player
+ocportal;cpe:/a:ocportal:ocportal
 ocrodjvu;cpe:/a:jwilk:ocrodjvu
 ocsinventory-agent;cpe:/a:ocsinventory-ng:ocsinventory-agent
 ocsinventory-server;cpe:/a:ocsinventory-ng:ocs_inventory_ng
@@ -1472,6 +1485,7 @@ rkhunter;cpe:/a:john_horne:rkhunter
 rlpr;cpe:/a:rlpr:rlpr
 roaraudio;cpe:/a:roaraudio:roaraudio
 robocode;cpe:/a:robocode:robocode
+rockmongo;cpe:/a:rockmongo:rockmongo
 root-system;cpe:/a:root:root
 roundcube;cpe:/a:roundcube:roundcube_webmail
 roundup;cpe:/a:roundup:roundup
@@ -1495,6 +1509,7 @@ ruby2.0;cpe:/a:ruby-lang:ruby
 ruby2.1;cpe:/a:ruby-lang:ruby
 ruby2.2;cpe:/a:ruby-lang:ruby
 ruby;cpe:/a:ruby-lang:ruby
+rubygems;cpe:/a:rubygems:rubygems
 runc;cpe:/a:opencontainers:runc
 runit;cpe:/a:runit:runit
 rxvt-unicode;cpe:/a:marc_lehmann:rxvt-unicode
@@ -1575,6 +1590,7 @@ spamass-milter;cpe:/a:georg_greve:spamassassin_milter_plugin
 spamassassin;cpe:/a:spamassassin:spamassassin
 spe;cpe:/a:stani:stanis_python_editor
 speedtouch;cpe:/a:speedtouch:speedtouch_usb_driver
+spice-gtk;cpe:/a:freedesktop:spice-gtk
 spice;cpe:/a:redhat:qspice
 spip;cpe:/a:spip:spip
 splitvt;cpe:/a:sam_lantinga:splitvt
@@ -1766,6 +1782,7 @@ virtualbox-guest-additions;cpe:/a:oracle:vm_virtualbox
 virtualbox-ose;cpe:/a:sun:virtualbox
 virtualbox;cpe:/a:oracle:vm_virtualbox
 vlc;cpe:/a:videolan:vlc_media_player
+vmware-package;cpe:/a:vmware:workstation
 vnc4;cpe:/a:realvnc:realvnc
 vobcopy;cpe:/a:vobcopy:vobcopy
 vorbis-tools;cpe:/a:xiph:vorbis-tools
@@ -1851,6 +1868,7 @@ xloadimage;cpe:/a:xloadimage:xloadimage
 xmail;cpe:/a:davide_libenzi:xmail
 xmame;cpe:/a:xmame:xmame
 xmcd;cpe:/a:ti_kan:xmcd
+xml-light;cpe:/a:nicolas_cannasse:ocaml_xml-light_library
 xmlsec1;cpe:/a:aleksey:xml_security_library
 xmlstarlet;cpe:/a:xmlstarlet:command_line_xml_toolkit
 xmltooling;cpe:/a:internet2:xmltooling