More mappings after comparing with NVE.

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

1 files changed, 104 insertions, 104 deletions

diff --git a/data/CPE/list b/data/CPE/list
index 1e8b6a48ec..3d3203dcbb 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -14,7 +14,7 @@ am-utils
 amarok
 amaya
 ampache
-amsn
+amsn;cpe:/a:alvaro:alvaros_messenger
 amule
 aolserver4
 apache2;cpe:/a:apache:http_server
@@ -30,7 +30,7 @@ aptoncd
 arb
 ardour
 argyll
-aria2
+aria2;cpe:/a:tatsuhiro_tsujikawa:aria2
 arora
 arts
 asterisk-addons
@@ -45,11 +45,11 @@ automake1.10;cpe:/a:gnu:automake
 automake1.7;cpe:/a:gnu:automake
 automake1.9;cpe:/a:gnu:automake
 automake;cpe:/a:gnu:automake
-avahi
+avahi;cpe:/a:avahi:avahi
 aview
 awstats
 axis
-axis2c
+axis2c;cpe:/a:apache:axis2
 axyl
 ayttm
 babel
@@ -58,10 +58,10 @@ backuppc
 bacula
 banshee
 bareftp
-barnowl
+barnowl;cpe:/a:barnowl:barnowl
 base-files
 bash;cpe:/a:bash:bash
-beanstalkd
+beanstalkd;cpe:/a:wildbit:beanstalkd
 belpic
 bind9;cpe:/a:isc:bind
 bind;cpe:/a:isc:bind
@@ -78,7 +78,7 @@ bochs
 bogofilter
 boinc
 boost
-bozohttpd
+bozohttpd;cpe:/a:eterna:bozohttpd
 bristol
 brltty
 bugzilla;cpe:/a:mozilla:bugzilla
@@ -86,7 +86,7 @@ buildbot
 bulmages
 busybox
 byacc
-bzip2
+bzip2;cpe:/a:bzip:bzip2
 cabextract
 cableswig
 cacti;cpe:/a:cacti:cacti
@@ -110,14 +110,14 @@ cherrypy3
 chm2pdf
 chora2
 chromium-browser;cpe:/a:google:chrome
-chrony
+chrony;cpe:/a:tuxfamily:chrony
 citadel
 clamav;cpe:/a:clamav:clamav
 classpath
 cluster-agents
 cmake
 cmus
-cobbler
+cobbler;cpe:/a:michael_dehaan:cobbler
 coccinelle
 coin3
 collectd
@@ -126,10 +126,10 @@ compiz-fusion-plugins-main
 condor
 convirt
 coreutils
-couchdb
+couchdb;cpe:/a:apache:couchdb
 courier-authlib
 cowbell
-cpio
+cpio;cpe:/a:gnu:cpio
 crip
 cron
 crossfire-maps
@@ -139,17 +139,17 @@ ctn
 ctorrent
 cups;cpe:/a:cups:cups
 cupsys;cpe:/a:cups:cups
-curl
+curl;cpe:/a:curl:libcurl
 cuteflow
 cvs
-cvsnt
+cvsnt;cpe:/a:march-hare:cvsnt
 cyrus-imapd-2.2
 cyrus-sasl2
 cyrus-sasl2-heimdal
 dash
 dbus-glib;cpe:/a:freedesktop:dbus-glib
 dbus;cpe:/a:freedesktop:dbus
-deliver
+deliver;cpe:/a:chip_salzenberg:deliver
 deluge-torrent
 destar
 devil
@@ -169,7 +169,7 @@ dnspython
 dnssec-tools
 docvert
 dojo
-dokuwiki
+dokuwiki;cpe:/a:dokuwiki:dokuwiki
 dopewars
 dotlrn
 dovecot;cpe:/a:dovecot:dovecot
@@ -185,7 +185,7 @@ drupal6-mod-cck
 drupal6-mod-views
 dstat
 dtc
-dvipng
+dvipng;cpe:/a:jan-ake_larsson:dvipng
 eaccelerator-src
 ebug-http
 eclipse
@@ -194,7 +194,7 @@ ed
 eggdrop
 eglibc
 egroupware;cpe:/a:egroupware:egroupware
-ejabberd
+ejabberd;cpe:/a:process-one:ejabberd
 ekg
 elgg
 elinks
@@ -205,8 +205,8 @@ emacs22;cpe:/a:gnu:emacs
 emacs23;cpe:/a:gnu:emacs
 emacspeak
 ember
-emesene
-encfs
+emesene;cpe:/a:emesene:emesene
+encfs;cpe:/a:arg0:encfs
 enscript
 eog
 epiphany-browser
@@ -222,15 +222,15 @@ exaile
 exim4;cpe:/a:exim:exim
 exiv2
 expat
-ezpublish
+ezpublish;cpe:/a:ez:ez_publish
 faad2
 fail2ban
 fastjar;cpe:/a:matthias_klose:fastjar
 fckeditor
-fcron
+fcron;cpe:/a:thibault_godouet:fcron
 festival
 feta
-fetchmail
+fetchmail;cpe:/a:eric_raymond:fetchmail
 ffmpeg-debian;cpe:/a:ffmpeg:ffmpeg
 ffmpeg;cpe:/a:ffmpeg:ffmpeg
 file
@@ -242,7 +242,7 @@ firehol
 flamethrower
 flashplugin-nonfree
 flatpress
-flex
+flex;cpe:/a:will_estes:flex
 flyspray
 fml
 fontforge
@@ -253,7 +253,7 @@ freepbx
 freeradius;cpe:/a:freeradius:freeradius
 freetype;cpe:/a:freetype:freetype
 freevo;cpe:/a:duncan_webb:freevo
-fuse
+fuse;cpe:/a:fuse:fuse
 fwbuilder
 gaim;cpe:/a:rob_flynn:gaim
 gallery
@@ -288,12 +288,12 @@ glib2.0;cpe:/a:gnome:glib
 glibc;cpe:/a:gnu:glibc
 glpi
 gmanedit
-gmime2.2
-gmime2.4
+gmime2.2;cpe:/a:gnome:gmime
+gmime2.4;cpe:/a:gnome:gmime
 gnash;cpe:/a:gnu:gnash
 gnome-peercast
 gnome-power-manager
-gnome-screensaver
+gnome-screensaver;cpe:/a:gnome:screensaver
 gnome-shell
 gnome-subtitles;cpe:/a:pedro_castro:gnome-subtitles
 gnome-vfs2
@@ -304,7 +304,7 @@ gnudip
 gnumeric;cpe:/a:gnome:gnumeric
 gnupg;cpe:/a:gnupg:gnupg
 gnupg2;cpe:/a:gnupg:gnupg
-gnustep-base
+gnustep-base;cpe:/a:gnustep:gnustep_base
 gnutls13;cpe:/a:gnu:gnutls
 gnutls26;cpe:/a:gnu:gnutls
 gollem
@@ -321,7 +321,7 @@ gst-plugins-bad0.10
 gst-plugins-base0.10
 gst-plugins-good0.10;cpe:/a:gstreamer:good_plug-ins
 gstreamer0.10-ffmpeg
-gtk+2.0
+gtk+2.0;cpe:/a:gtk:gtk%2B
 guile-1.6
 gupnp
 gv;cpe:/a:gnu:gv
@@ -338,11 +338,11 @@ hobix
 honeyd
 horde3;cpe:/a:horde:horde
 hplip
-hsolink
+hsolink;cpe:/a:pharscape:hsolink
 htmldoc
 htop
 httrack
-hybserv
+hybserv;cpe:/a:dinko_korunic:hybserv2
 hypermail
 hypre
 ibackup
@@ -355,7 +355,7 @@ ikiwiki;cpe:/a:ikiwiki:ikiwiki
 imagemagick;cpe:/a:imagemagick:imagemagick
 imlib
 imlib2
-imp4
+imp4;cpe:/a:horde:imp
 impose+
 incron
 ingo1
@@ -370,9 +370,9 @@ ircd-hybrid
 ircd-ircu
 ircd-ratbox
 irrlicht
-irssi
-isc-dhcp
-iscsitarget
+irssi;cpe:/a:irssi:irssi
+isc-dhcp;cpe:/a:isc:dhcp
+iscsitarget;cpe:/a:iscsitarget:iscsitarget
 jags
 jailer
 jasper
@@ -393,10 +393,10 @@ kdebase;cpe:/o:kde:kde
 kdegraphics;cpe:/a:kde:kdegraphics
 kdelibs;cpe:/o:kde:kdelibs
 kdenetwork
-kfreebsd-5
-kfreebsd-6
-kfreebsd-7
-kfreebsd-8
+kfreebsd-5;cpe:/o:freebsd:freebsd
+kfreebsd-6;cpe:/o:freebsd:freebsd
+kfreebsd-7;cpe:/o:freebsd:freebsd
+kfreebsd-8;cpe:/o:freebsd:freebsd
 kino
 klibc
 knowledgeroot
@@ -408,8 +408,8 @@ krb5;cpe:/a:mit:kerberos
 kronolith2
 ktorrent
 ktorrent2.2
-kvirc
-kvm
+kvirc;cpe:/a:kvirc:kvirc
+kvm;cpe:/a:kvm_qumranet:kvm
 lam
 lasso
 lastfm
@@ -418,7 +418,7 @@ lcms;cpe:/a:littlecms:lcms
 ldm
 ldns
 lftp
-lib3ds
+lib3ds;cpe:/a:jan_eric_krprianidis:lib3ds
 libannodex
 libapache-mod-jk
 libapache-mod-security
@@ -435,30 +435,30 @@ libcompress-raw-zlib-perl
 libconvert-uulib-perl
 libcrypt-openssl-dsa-perl
 libdbd-pg-perl
-libesmtp
+libesmtp;cpe:/a:stafford.uklinux:libesmtp
 libexif
 libextractor
 libfishsound
 libfwbuilder
 libgadu
 libgd2;cpe:/a:libgd:gd_graphics_library
-libgdiplus
-libglpng
+libgdiplus;cpe:/a:mono-project:libgdiplus
+libglpng;cpe:/a:glpng:glpng
 libgnucrypto-java
 libhtml-parser-perl
 libhtml-prototype-perl
-libhx
+libhx;cpe:/a:jan_engelhardt:libhx
 libid3tag
 libimager-perl
 libio-socket-ssl-perl;cpe:/a:io-socket-ssl:io-socket-ssl
 libjson-ruby
 libmcrypt
-libmikmod
+libmikmod;cpe:/a:raphael_assenat:libmikmod
 libmodplug
 libnasl
 libnet-dns-perl
-libnids
-libnss-db
+libnids;cpe:/a:rafal_wojtczuk:libnids
+libnss-db;cpe:/a:piotr_roszatycki:libnss-db
 liboggplay
 liboggz
 libpam-heimdal
@@ -476,7 +476,7 @@ libsmi
 libsndfile
 libsoup
 libspf2
-libspring-2.5-java
+libspring-2.5-java;cpe:/a:springsource:spring_framework
 libstruts1.2-java
 libthai
 libtheora
@@ -486,7 +486,7 @@ libtorrent-rasterbar
 libtunepimp
 libuser;cpe:/a:miloslav_trmac:libuser
 libv8
-libvirt
+libvirt;cpe:/a:libvirt:libvirt
 libvorbis
 libvpx
 libwmf
@@ -499,7 +499,7 @@ libxml
 libxml2
 libxslt
 licq
-lighttpd
+lighttpd;cpe:/a:lighttpd:lighttpd
 lilo
 links2
 lintian
@@ -519,8 +519,8 @@ ltsp
 lucene2
 lustre
 lvm2;cpe:/a:heinz_mauelshagen:lvm2
-lxr
-lxr-cvs
+lxr;cpe:/a:malcom_box:lxr_cross_referencer
+lxr-cvs;cpe:/a:malcom_box:lxr_cross_referencer
 lxsession
 lynx-cur;cpe:/a:lynx:lynx
 lynx;cpe:/a:lynx:lynx
@@ -531,13 +531,13 @@ magics++
 magpierss
 mahara;cpe:/a:mahara:mahara
 maildirsync
-maildrop
-mailman
+maildrop;cpe:/a:maildrop:maildrop
+mailman;cpe:/a:gnu:mailman
 mailscanner
 mako
 mantis;cpe:/a:mantisbt:mantisbt
 mapserver;cpe:/a:umn:mapserver
-maradns
+maradns;cpe:/a:maradns:maradns
 matanza
 mathtex
 matrixssl
@@ -568,7 +568,7 @@ mn-fit
 mnemo2
 mod-auth-mysql
 moin;cpe:/a:moinmo:moinmoin
-mojarra
+mojarra;cpe:/a:oracle:mojarra
 mon
 mondo
 monkeysphere
@@ -592,7 +592,7 @@ multi-gnome-terminal
 multipath-tools
 mutt;cpe:/a:mutt:mutt
 muttprint
-mydms
+mydms;cpe:/a:letodms:letodms
 myspell
 mysql-5.1;cpe:/a:mysql:mysql
 mysql-dfsg-4.1;cpe:/a:mysql:mysql
@@ -604,12 +604,12 @@ nagios2
 nagios3
 naim
 namazu2
-nano
+nano;cpe:/a:gnu:nano
 nasm
 nautilus-python
 ncbi-tools6
 ncompress
-ncpfs
+ncpfs;cpe:/a:ncpfs:ncpfs
 ndiswrapper
 neon26;cpe:/a:webdav:neon
 neon27;cpe:/a:webdav:neon
@@ -642,10 +642,10 @@ nusoap
 nvidia-cg-toolkit
 ocrodjvu
 ocsinventory-agent
-ocsinventory-server
+ocsinventory-server;cpe:/a:ocsinventory-ng:ocs_inventory_ng
 oftc-hybrid
 ogle
-okular
+okular;
 op
 op-panel
 open-iscsi
@@ -653,7 +653,7 @@ openacs
 openafs
 openconnect
 opendb
-opendchub
+opendchub;cpe:/a:roshan_singh:open_direct_connect_hub
 openexr
 openjdk-6;cpe:/a:sun:openjdk
 openldap2.2;cpe:/a:openldap:openldap
@@ -673,11 +673,11 @@ openswan
 openttd;cpe:/a:openttd:openttd
 openvpn
 openx
-opie
+opie;cpe:/a:nrl:opie
 optipng
 os-prober
-otrs
-otrs2
+otrs;cpe:/a:otrs:otrs
+otrs2;cpe:/a:otrs:otrs
 owl
 owl-dms
 p3nfs
@@ -691,7 +691,7 @@ paraview
 parser
 parser-mysql
 passenger
-paste
+paste;cpe:/a:pythonpaste:paste
 pax
 pcre3
 pcsc-lite;cpe:/a:muscle:pcsc-lite
@@ -712,10 +712,10 @@ php-mail
 php-net-ping
 php4;cpe:/a:php:php
 php5;cpe:/a:php:php
-phpbb2
-phpbb3
+phpbb2;cpe:/a:phpbb:phpbb
+phpbb3;cpe:/a:phpbb:phpbb
 phpgedview;cpe:/a:phpgedview:phpgedview
-phpgroupware
+phpgroupware;cpe:/a:phpgroupware:phpgroupware
 phpicalendar
 phpldapadmin
 phpmyadmin;cpe:/a:phpmyadmin:phpmyadmin
@@ -735,7 +735,7 @@ planet
 planet-venus
 plone3;cpe:/a:plone:plone
 plt-scheme
-pmount
+pmount;cpe:/a:vincent_fourmond:pmount
 poco
 poker-network
 polarssl
@@ -760,14 +760,14 @@ projectl
 prototypejs
 psi
 pulseaudio
-puppet
+puppet;cpe:/a:puppet:puppet
 pvpgn
 pyfribidi
 pyftpd
 pygresql
 python-4suite
 python-cherrypy
-python-cjson
+python-cjson;cpe:/a:dan_pascu:python-cjson
 python-crypto
 python-defaults
 python-django;cpe:/a:djangoproject:django
@@ -812,8 +812,8 @@ rkhunter
 roaraudio
 robocode
 root-system
-roundcube
-roundup
+roundcube;cpe:/a:roundcube:roundcube_webmail
+roundup;cpe:/a:roundup:roundup
 rpm;cpe:/a:rpm:rpm
 rsync;cpe:/a:rsync:rsync
 rsyslog
@@ -828,7 +828,7 @@ ruby1.9;cpe:/a:ruby-lang:ruby
 ruby;cpe:/a:ruby-lang:ruby
 rxvt
 sabre
-sahana
+sahana;cpe:/a:sahanafoundation:sahana
 salome
 samba;cpe:/a:samba:samba
 samhain
@@ -843,7 +843,7 @@ sdcc
 sdl-image1.2
 sdm
 sendmail
-serendipity
+serendipity;cpe:/a:s9y:serendipity
 sgml2x
 shadow
 shibboleth-sp
@@ -851,7 +851,7 @@ shibboleth-sp2
 silc-client
 silc-server
 silc-toolkit
-silverstripe
+silverstripe;cpe:/a:silverstripe:silverstripe
 simgear
 sip-tester
 siproxd
@@ -861,7 +861,7 @@ slim
 slurm-llnl
 smart
 smarty
-smbind
+smbind;cpe:/a:blentz:smbind
 smsclient
 sng
 snort
@@ -869,7 +869,7 @@ socat
 sork-passwd-h3
 spamass-milter
 speex
-spice
+spice;cpe:/a:redhat:qspice
 spip
 splitvt
 sql-ledger
@@ -898,20 +898,20 @@ synfig
 syslog-ng
 system-tools-backends
 systemimager
-systemtap
+systemtap;cpe:/a:systemtap:systemtap
 t-prot
 tangerine
-tar
+tar;cpe:/a:gnu:tar
 tau
-tdiary
+tdiary;cpe:/a:tdiary:tdiary
 tdom
 teamspeak-client
 teamspeak-server
 texlive-base
-texlive-bin
+texlive-bin;cpe:/a:tug:tex_live
 texmacs
 textpattern
-tgt
+tgt;cpe:/a:zaal:tgt
 thin
 thttpd
 tiff;cpe:/a:libtiff:libtiff
@@ -937,7 +937,7 @@ torrentflux
 tqsllib
 trac;cpe:/a:edgewall:trac
 trac-git
-transmission
+transmission;cpe:/a:transmissionbt:transmission
 trickle
 tss
 tunapie
@@ -951,24 +951,24 @@ twiki
 typo
 typo3-src;cpe:/a:typo3:typo3
 udev;cpe:/a:kernel:udev
-udisks
+udisks;cpe:/a:freedesktop:udisks
 udns
 udunits
-unbound
-unrealircd
+unbound;cpe:/a:nlnet_labs:unbound
+unrealircd;cpe:/a:unrealircd:unrealircd
 unzip;cpe:/a:info-zip:unzip
 ust
 util-linux
 uudeview
 uw-imap
-uzbl
+uzbl;cpe:/a:uzbl:uzbl
 valgrind
 varnish
 vdccm
 vdr
 verlihub
 videocache
-viewvc
+viewvc;cpe:/a:viewvc:viewvc
 vim;cpe:/a:vim:vim
 vinagre
 vips
@@ -981,17 +981,17 @@ vsftpd;cpe:/a:redhat:vsftpd
 vte
 vxl
 w3c-libwww
-w3m
-wafp
+w3m;cpe:/a:w3m:w3m
+wafp;cpe:/a:mytty:webapplication_finger_printer
 webauth
-webcalendar
+webcalendar;cpe:/a:k5n:webcalendar
 webcit
 webgui
 webhelpers
 webkit;cpe:/a:webkit:webkit
 webkitkde
 webmin
-weborf
+weborf;cpe:/a:salvo_tomaselli:weborf_http_server
 websvn
 weechat
 wesnoth
@@ -1049,17 +1049,17 @@ yelp
 yui
 zabbix;cpe:/a:zabbix:zabbix
 zaptel
-zenoss
-ziproxy
-znc
+zenoss;cpe:/a:zenoss:zenoss
+ziproxy;cpe:/a:daniel_mealha_cabrita:ziproxy
+znc;cpe:/a:znc:znc
 zodb
 zonecheck
 zoneminder
 zope-cmfplone
 zope-ldapuserfolder
-zope2.10
-zope2.11
-zope2.9
-zope3
+zope2.10;cpe:/a:zope:zope
+zope2.11;cpe:/a:zope:zope
+zope2.9;cpe:/a:zope:zope
+zope3;cpe:/a:zope:zope
 zoph
 zorp