Updated CPE mapping and alias list.

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

2 files changed, 87 insertions, 3 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 0bf46dfbe0..b97b92d82a 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -86,6 +86,7 @@ cpe:/a:lehrstuhl_fur_mikrobiologie:arb
 cpe:/a:ghostscript:ghostscript
 cpe:/a:artifex:gpl_ghostscript
 cpe:/a:aladdin_enterprises:ghostscript
+cpe:/a:artifex:afpl_ghostscript
 
 cpe:/a:gimp:gimp
 cpe:/a:gnu:gimp
@@ -404,6 +405,7 @@ cpe:/a:tug:texlive_2007
 cpe:/a:mysql:mysql
 cpe:/a:mysql:mysql_server
 cpe:/a:mysql:mysql_community_server
+cpe:/a:oracle:mysql
 
 cpe:/o:balabit:syslog-ng
 cpe:/a:balabit:syslog-ng_open_source_edition
@@ -427,6 +429,8 @@ cpe:/a:arne_redlich_%26_ross_walker:iscsitarget
 
 cpe:/a:springsource:spring_framework
 cpe:/a:apache:struts
+cpe:/a:pivotal_software:spring_framework
+cpe:/a:pivotal:spring_framework
 
 cpe:/a:bogofilter:bogofilter
 cpe:/o:bogofilter:email_filter
@@ -835,6 +839,9 @@ cpe:/a:powerdns:powerdns
 cpe:/a:powerdns:authoritative_server
 cpe:/a:powerdns:authoritative
 
+cpe:/a:powerdns:recursor
+cpe:/a:powerdns:powerdns_recursor).
+
 cpe:/a:ecryptfs:ecryptfs_utils
 cpe:/a:ecryptfs:ecryptfs-utils
 
@@ -965,16 +972,93 @@ cpe:/a:puppetlabs:marionette-collective
 cpe:/a:miniupnp_project:miniupnp
 cpe:/a:miniupnp_project:miniupnpd
 
+cpe:/a:email-address_project:email-address
+cpe:/a:email%3a%3aaddress_module_project:email%3a%3aaddress
+
+cpe:/a:phusionpassenger:phusion_passenger
+cpe:/a:phusion:passenger
+
+cpe:/a:python_imaging_project:python_imaging
+cpe:/a:pythonware:python_imaging_library
+
+cpe:/a:gtk:gtk%2B
+cpe:/a:gtk:gtk%2b
+
+cpe:/a:phpmyid:phpmyid
+cpe:/a:siege:phpmyid
+
+cpe:/a:gnustep:gnustep_base
+cpe:/a:gnustep:base
+
+cpe:/a:michael_dehaan:cobbler
+cpe:/a:cobblerd:cobbler
+
+cpe:/a:ipython:notebook
+cpe:/a:ipython:ipython_notebook
+
+cpe:/a:light_speed_gaming:mumble
+cpe:/a:mumble:mumble
+
+cpe:/a:debian:dpkg
+cpe:/a:debian:dpkg-dev
+
+cpe:/a:wojtek_kaniewsk:libgadu
+cpe:/a:libgadu:libgadu
+
+cpe:/a:fckeditor:fckeditor
+cpe:/a:ckeditor:fckeditor
+
+cpe:/a:ocsinventory-ng:ocs_inventory_ng
+cpe:/a:ocsinventory-ng:ocsinventory_ng
+
+cpe:/a:tor:tor
+cpe:/a:torproject:tor
+
+cpe:/a:nodejs:node.js
+cpe:/a:nodejs:nodejs
+
+cpe:/a:roman_marxer:ganeti
+cpe:/a:ganeti_project:ganeti
+
+cpe:/a:roundup:roundup
+cpe:/a:roundup-tracker:roundup
+
+cpe:/a:bash:bash
+cpe:/a:gnu:bash
+
+cpe:/a:ettercap:ettercap
+cpe:/a:ettercap_project:ettercap
+
+cpe:/a:antiword:antiword
+cpe:/a:antiword_project:antiword
+
+cpe:/a:zenoss:zenoss
+cpe:/a:zenoss:zenoss_core
+
+cpe:/a:redhat:tcpdump
+cpe:/a:tcpdump:tcpdump
+
+cpe:/a:ettercap:ettercap
+cpe:/a:ettercap_project:ettercap
+
+cpe:/a:apport:apport
+cpe:/a:apport_project:apport
+
+cpe:/a:rubyforge:rubygems
+cpe:/a:rubygems:rubygems
+
 # Dummy entries to hide noise
 #cpe:/a:webkit:webkit
 #cpe:/a:google:chrome
 #cpe:/a:apple:safari
 
 # Dummy entries to hide noise
-#cpe:/a:sun:jre
+#cpe:/a:oracle:jre
+#cpe:/a:oracle:openjdk
+#cpe:/a:redhat:icedtea
 #cpe:/a:sun:jdk
+#cpe:/a:sun:jre
 #cpe:/a:sun:openjdk
-#cpe:/a:redhat:icedtea
 
 # Dummy entries to hide noise
 #cpe:/a:mozilla:libxul
diff --git a/data/CPE/list b/data/CPE/list
index da7f236201..5586083e22 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -860,7 +860,7 @@ libspf;cpe:/a:libspf:libspf
 libspring-2.5-java;cpe:/a:springsource:spring_framework
 libspring-java;cpe:/a:pivotal_software:spring_framework
 libssh2;cpe:/a:libssh2:libssh2
-libssh; cpe:/a:libssh:libssh
+libssh;cpe:/a:libssh:libssh
 libstruts1.2-java;cpe:/a:apache:struts
 libtasn1-2;cpe:/a:free_software_foundation_inc.:libtasn1
 libtasn1-3;cpe:/a:free_software_foundation_inc.:libtasn1