Updated CPE mapping and alias list.

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

1 files changed, 179 insertions, 2 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 0b1e655804..69b0f2d237 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -72,6 +72,7 @@ cpe:/a:citrix:xen
 cpe:/a:xen:xen
 cpe:/a:xen:qemu
 cpe:/a:xensource_inc:xen
+cpe:/o:xen:xen
 
 cpe:/a:videolan:vlc
 cpe:/a:videolan:vlc_media_player
@@ -205,6 +206,7 @@ cpe:/a:subversion:subversion
 
 cpe:/a:nokia:qt
 cpe:/a:trolltech:qt
+cpe:/a:digia:qt
 
 cpe:/a:ruby-lang:ruby
 cpe:/a:yukihiro_matsumoto:ruby
@@ -261,6 +263,7 @@ cpe:/a:university_of_washington:uw-imap
 
 cpe:/a:gnu:wget
 cpe:/a:wget:wget
+cpe:/a:gnu_wget_project:gnu_wget
 
 cpe:/a:kernel:linux-pam
 cpe:/a:pam:pam
@@ -276,15 +279,18 @@ cpe:/a:adobe:flash_player
 cpe:/a:macromedia:flash_player
 cpe:/a:macromedia:shockwave
 
-cpe:/a:curl:libcurl
-cpe:/a:daniel_stenberg:curl
 cpe:/a:curl:curl
+cpe:/a:daniel_stenberg:curl
+cpe:/a:haxx:curl
+cpe:/a:curl:libcurl
+cpe:/a:haxx:libcurl
 cpe:/a:libcurl:libcurl
 
 cpe:/a:mortbay:jetty
 cpe:/a:mortbay_jetty:jetty
 cpe:/a:jetty:jetty
 cpe:/a:jetty:jetty_http_server
+cpe:/a:eclipse:jetty
 
 cpe:/a:ez:ez_publish
 cpe:/a:ez_publish:ez_publish
@@ -310,6 +316,7 @@ cpe:/a:phpldapadmin:phpldapadmin
 
 cpe:/a:bestpractical:rt
 cpe:/a:best_practical_solutions:request_tracker
+cpe:/a:bestpractical:request_tracker
 
 cpe:/a:cmu:cyrus_imap_server
 cpe:/a:cyrus:imapd
@@ -345,6 +352,7 @@ cpe:/a:xiao_gang:www_interactive_mathematics_server
 
 cpe:/a:freedesktop:dbus
 cpe:/a:d-bus:d-bus
+cpe:/a:d-bus_project:d-bus
 cpe:/o:d-bus:inter-process_communication_system
 
 cpe:/a:littlecms:lcms
@@ -491,12 +499,14 @@ cpe:/a:drupal:project
 
 cpe:/a:roundcube:roundcube_webmail
 cpe:/a:roundcube_webmail_project:roundcube_webmail
+cpe:/a:roundcube:webmail
 
 cpe:/a:openssl:openssl
 cpe:/a:openssl_project:openssl
 
 cpe:/a:graphicsmagick:graphicsmagick
 cpe:/a:imagemagick:graphicsmagick
+cpe:/a:imagemagick:imagemagick
 
 cpe:/a:argyllcms:argyllcms
 cpe:/a:argyllcms:cms
@@ -640,6 +650,7 @@ cpe:/a:vnc:realvnc
 
 cpe:/a:nvidia:binary_graphics_driver
 cpe:/a:nvidia:video_driver
+cpe:/a:nvidia:gpu_driver
 
 cpe:/a:usermin:usermin
 cpe:/a:webmin:usermin
@@ -777,6 +788,165 @@ cpe:/a:puppetlabs:puppet
 cpe:/a:quassel:quassel_core
 cpe:/a:quassel-irc:quassel
 
+cpe:/a:e2fsprogs_project:e2fsprogs
+cpe:/a:ext2_filesystems_utilities:e2fsprogs
+
+cpe:/a:marco_d%27itri:ppp
+cpe:/a:samba:ppp
+
+cpe:/a:gnome:networkmanager
+cpe:/a:networkmanager_project:networkmanager
+
+cpe:/a:dracut_project:dracut
+cpe:/a:fedoraproject:dracut
+
+cpe:/a:network_block_device:nbd
+cpe:/a:wouter_verhelst:nbd
+
+cpe:/a:internet2:xmltooling
+cpe:/a:xmltooling_project:xmltooling
+
+cpe:/a:w3m:w3m
+cpe:/a:w3m_project:w3m
+
+cpe:/a:libgd:gd_graphics_library
+cpe:/a:libgd:libgd
+
+cpe:/a:freebsd:libarchive
+cpe:/a:libarchive:libarchive
+
+cpe:/a:bluez_project:bluez
+cpe:/a:bluez:bluez
+
+cpe:/a:openstack:nova
+cpe:/a:openstack:compute_%28nova%29
+cpe:/a:openstack:compute
+
+cpe:/a:will_estes:flex
+cpe:/a:flex_project:flex
+
+cpe:/a:gnome:gdkpixbuf
+cpe:/a:gnome:gdk-pixbuf
+
+cpe:/a:ruby_on_rails:ruby_on_rails
+cpe:/a:rubyonrails:ruby_on_rails
+
+cpe:/a:powerdns:powerdns
+cpe:/a:powerdns:authoritative_server
+cpe:/a:powerdns:authoritative
+
+cpe:/a:ecryptfs:ecryptfs_utils
+cpe:/a:ecryptfs:ecryptfs-utils
+
+cpe:/a:openstack:glance
+cpe:/a:openstack:image_registry_and_delivery_service_%28glance%29
+
+cpe:/a:james_clark:expat
+cpe:/a:libexpat:expat
+
+cpe:/a:cloudbees:jenkins
+cpe:/a:jenkins:jenkins
+
+cpe:/a:e-merge:unace
+cpe:/a:winace:unace
+
+cpe:/a:libgsf:libgsf
+cpe:/a:gnome:libgsf
+
+cpe:/a:oracle:sun_glassfish_enterprise_server
+cpe:/a:oracle:glassfish_server
+
+cpe:/a:libksba_library:libksba_library
+cpe:/a:libksba_project:libskba
+
+cpe:/a:symphony-cms:symphony_cms
+cpe:/a:sensiolabs:symfony
+
+cpe:/a:john_lim:adodb
+cpe:/a:adodb_project:adodb
+
+cpe:/a:gnome:eog
+cpe:/a:gnome:eye_of_gnome
+
+cpe:/a:rasterbar_software:libtorrent
+cpe:/a:arvidn:libtorrent
+
+cpe:/a:libtiff:libtiff
+cpe:/a:libtiff_project:libtiff
+
+cpe:/a:cosmin_truta:optipng
+cpe:/a:optipng_project:optipng
+
+cpe:/a:libungif:libungif
+cpe:/a:giflib_project:giflib
+
+cpe:/a:matt_johnston:dropbear_ssh_server
+cpe:/a:dropbear_ssh_project:dropbear_ssh
+
+cpe:/a:putty:putty
+cpe:/a:simon_tatham:putty
+
+cpe:/a:7-zip:7-zip
+cpe:/a:7-zip:7zip
+
+cpe:/a:git:git
+cpe:/a:git-scm:git
+cpe:/a:git_project:git
+
+cpe:/a:mozilla:nss
+cpe:/a:mozilla:network_security_services
+
+cpe:/a:pcre:pcre
+cpe:/a:pcre:perl_compatible_regular_expression_library
+
+cpe:/a:tryton:trytond
+cpe:/a:tryton:tryton
+
+cpe:/a:poppler:poppler
+cpe:/a:freedesktop:poppler
+
+cpe:/a:varnish.projects.linpro:varnish
+cpe:/a:varnish-cache:varnish
+
+cpe:/a:claws_mail:claws_mail_tools
+cpe:/a:claws-mail:claws-mail
+
+cpe:/a:phpmailer:phpmailer
+cpe:/a:phpmailer_project:phpmailer
+
+cpe:/a:cakefoundation:cakephp
+cpe:/a:cakephp:cakephp
+
+cpe:/a:gnu:grub_2
+cpe:/a:gnu:grub2
+
+cpe:/a:hostapd:hostapd
+cpe:/a:w1.fi:hostapd
+
+cpe:/a:xscreensaver:xscreensaver
+cpe:/a:xscreensaver_project:xscreensaver
+
+cpe:/a:bouncycastle:bouncy-castle-crypto-package
+cpe:/a:bouncycastle:bouncy_castle_crypto_package
+
+cpe:/a:gnome:gnome_display_manager
+cpe:/a:gnome:gdm
+
+cpe:/a:gnu:screen
+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
+
 # Dummy entries to hide noise
 #cpe:/a:webkit:webkit
 #cpe:/a:google:chrome
@@ -791,6 +961,13 @@ cpe:/a:quassel-irc:quassel
 # Dummy entries to hide noise
 #cpe:/a:mozilla:libxul
 #cpe:/a:mozilla:firefox
+#cpe:/a:mozilla:firefox_esr
 #cpe:/a:mozilla:thunderbird
 #cpe:/a:mozilla:seamonkey
 #cpe:/a:mozilla:mozilla
+
+# Dummy entries to hide noise
+#cpe:/a:kvm_qumranet:kvm
+#cpe:/a:qemu:qemu
+#cpe:/a:xensource:xen
+#cpe:/o:xen:xen