Update CPE list.

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

2 files changed, 56 insertions, 38 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 12ae06a67e..8b94e5a16d 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -24,6 +24,7 @@ cpe:/a:eric_raymond:fetchmail
 
 cpe:/a:x:x.org
 cpe:/a:x:x11
+cpe:/a:x.org:xserver
 
 cpe:/a:anibal_monsalve_salaz:ssmtp
 cpe:/a:ssmtp:ssmtp
@@ -68,3 +69,9 @@ cpe:/a:artifex:gpl_ghostscript
 
 cpe:/a:gimp:gimp
 cpe:/a:gnu:gimp
+
+cpe:/a:hp:linux_imaging_and_printing_project
+cpe:/a:hp:hplip
+
+cpe:/a:mit:kerberos
+cpe:/a:mit:kerberos_5
diff --git a/data/CPE/list b/data/CPE/list
index 430b51be76..3278103c9c 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -21,10 +21,10 @@ apache2;cpe:/a:apache:http_server
 apache;cpe:/a:apache:http_server
 apertium;cpe:/a:apertium:apertium
 apport;cpe:/a:apport:apport
-apr;cpe:/a:apache:portable_runtime
 apr-util;cpe:/a:apache:apr-util
-apt;cpe:/a:debian:apt
+apr;cpe:/a:apache:portable_runtime
 apt-listchanges;cpe:/a:debian:apt-listchanges
+apt;cpe:/a:debian:apt
 aptlinex;cpe:/a:debian:aptlinex
 aptoncd;cpe:/a:aptoncd:aptoncd
 arb;cpe:/a:lehrstuhl_fur_mikrobiologie:arb
@@ -48,8 +48,8 @@ automake;cpe:/a:gnu:automake
 avahi;cpe:/a:avahi:avahi
 aview;cpe:/a:amiga:aview
 awstats;cpe:/a:awstats:awstats
-axis;cpe:/a:apache:axis2
 axis2c;cpe:/a:apache:axis2
+axis;cpe:/a:apache:axis2
 axyl;cpe:/a:axyl:axyl
 ayttm
 babel
@@ -144,8 +144,8 @@ cuteflow;cpe:/a:cuteflow-bin:cuteflow_bin
 cvs;cpe:/a:nongnu:cvs
 cvsnt;cpe:/a:march-hare:cvsnt
 cyrus-imapd-2.2;cpe:/a:cmu:cyrus_imap_server
-cyrus-sasl2;cpe:/a:carnegie_mellon_university:cyrus-sasl
 cyrus-sasl2-heimdal
+cyrus-sasl2;cpe:/a:carnegie_mellon_university:cyrus-sasl
 dash;cpe:/a:dash:dash
 dbus-glib;cpe:/a:freedesktop:dbus-glib
 dbus;cpe:/a:freedesktop:dbus
@@ -154,8 +154,8 @@ deluge-torrent
 destar;cpe:/a:holger_schurig:destar
 devil;cpe:/a:denton_woods:devil
 devscripts;cpe:/a:devscripts_devel_team:devscripts
-dhcp;cpe:/a:isc:dhcp
 dhcp3;cpe:/a:isc:dhcp
+dhcp;cpe:/a:isc:dhcp
 dhis-server;cpe:/a:guus_sliepen:dhis-server
 dia;cpe:/a:dia:dia
 digitaldj;cpe:/a:nostatic:digitaldj
@@ -177,12 +177,12 @@ dpkg-cross;cpe:/a:debian:dpkg-cross
 dpkg;cpe:/a:debian:dpkg
 dracut;cpe:/a:fedoraproject:dracut
 dropbox;cpe:/a:dropbox:dropbox
-drupal;cpe:/a:drupal:drupal
 drupal-4.7;cpe:/a:drupal:drupal
 drupal5;cpe:/a:drupal:drupal
-drupal6;cpe:/a:drupal:drupal
 drupal6-mod-cck;cpe:/a:yves_chedemois:cck
 drupal6-mod-views;cpe:/a:earl_miles:views
+drupal6;cpe:/a:drupal:drupal
+drupal;cpe:/a:drupal:drupal
 dstat;cpe:/a:dag.wieers:dstat
 dtc;cpe:/a:gplhost:dtc-common
 dvipng;cpe:/a:jan-ake_larsson:dvipng
@@ -215,8 +215,8 @@ eterm;cpe:/a:eterm:eterm
 ethereal;cpe:/a:wireshark:wireshark
 eucalyptus;cpe:/a:eucalyptus:eucalyptus
 evince;cpe:/a:redhat:evince
-evolution;cpe:/a:gnome:evolution
 evolution-data-server;cpe:/a:gnome:evolution-data-server
+evolution;cpe:/a:gnome:evolution
 ewiki;cpe:/a:erfurtwiki:erfurtwiki
 exaile
 exim4;cpe:/a:exim:exim
@@ -234,10 +234,11 @@ fetchmail;cpe:/a:eric_raymond:fetchmail
 ffmpeg-debian;cpe:/a:ffmpeg:ffmpeg
 ffmpeg;cpe:/a:ffmpeg:ffmpeg
 file;cpe:/a:christos_zoulas:file
-firebird2;cpe:/a:firebird:firebird
 firebird2.0;cpe:/a:firebird:firebird
 firebird2.1;cpe:/a:firebird:firebird
+firebird2;cpe:/a:firebird:firebird
 firefox-sage;cpe:/a:sage.mozdev:sage
+firefox;cpe:/a:mozilla:firefox
 firehol;cpe:/a:firehol:firehol
 flamethrower;cpe:/a:dann_frazier:flamethrower
 flashplugin-nonfree;cpe:/a:adobe:flash_player
@@ -256,9 +257,9 @@ freevo;cpe:/a:duncan_webb:freevo
 fuse;cpe:/a:fuse:fuse
 fwbuilder;cpe:/a:fwbuilder:firewall_builder
 gaim;cpe:/a:rob_flynn:gaim
-gallery;cpe:/a:menalto:gallery
 gallery2;cpe:/a:menalto:gallery
 gallery3;cpe:/a:menalto:gallery
+gallery;cpe:/a:menalto:gallery
 ganeti;cpe:/a:roman_marxer:ganeti
 ganglia-monitor-core;cpe:/a:ganglia:ganglia
 gcc-4.3;cpe:/a:gnu:gcc
@@ -274,14 +275,14 @@ geda-gnetlist;cpe:/a:geda:gnetlist
 gedit;cpe:/a:gnome:gedit
 geronimo;cpe:/a:apache:geronimo
 geshi;cpe:/a:geshi:geshi
-gforge;cpe:/a:gforge:gforge
 gforge-plugin-scmcvs
+gforge;cpe:/a:gforge:gforge
 ggobi
 ghostscript;cpe:/a:artifex:gpl_ghostscript
 gif2png;cpe:/a:catb:gif2png
 gimp;cpe:/a:gimp:gimp
-git;cpe:/a:git:git
 git-core;cpe:/a:git:git
+git;cpe:/a:git:git
 gitolite
 glassfish
 glib2.0;cpe:/a:gnome:glib
@@ -302,8 +303,8 @@ gnu-smalltalk
 gnucash;cpe:/a:gnucash:gnucash
 gnudip;cpe:/a:gnudip:gnudip
 gnumeric;cpe:/a:gnome:gnumeric
-gnupg;cpe:/a:gnupg:gnupg
 gnupg2;cpe:/a:gnupg:gnupg
+gnupg;cpe:/a:gnupg:gnupg
 gnustep-base;cpe:/a:gnustep:gnustep_base
 gnutls13;cpe:/a:gnu:gnutls
 gnutls26;cpe:/a:gnu:gnutls
@@ -393,6 +394,7 @@ kdebase;cpe:/o:kde:kde
 kdegraphics;cpe:/a:kde:kdegraphics
 kdelibs;cpe:/o:kde:kdelibs
 kdenetwork
+kernel-source-2.6.8;cpe:/o:linux:kernel
 kfreebsd-5;cpe:/o:freebsd:freebsd
 kfreebsd-6;cpe:/o:freebsd:freebsd
 kfreebsd-7;cpe:/o:freebsd:freebsd
@@ -406,8 +408,8 @@ kompozer
 konwert;cpe:/a:krzysztof_kozlowski:konwert
 krb5;cpe:/a:mit:kerberos
 kronolith2;cpe:/a:horde:kronolith
-ktorrent;cpe:/a:ktorrent:ktorrent
 ktorrent2.2;cpe:/a:ktorrent:ktorrent
+ktorrent;cpe:/a:ktorrent:ktorrent
 kvirc;cpe:/a:kvirc:kvirc
 kvm;cpe:/a:kvm_qumranet:kvm
 lam
@@ -495,8 +497,8 @@ libwww-perl;cpe:/a:search.cpan:libwww-perl
 libxcrypt;cpe:/a:opensuse:libxcrypt
 libxerces2-java
 libxfont
-libxml;cpe:/a:xmlsoft:libxml
 libxml2;cpe:/a:xmlsoft:libxml2
+libxml;cpe:/a:xmlsoft:libxml
 libxslt;cpe:/a:xmlsoft:libxslt
 licq;cpe:/a:licq:licq
 lighttpd;cpe:/a:lighttpd:lighttpd
@@ -519,8 +521,8 @@ ltsp;cpe:/a:ltsp:linux_terminal_server_project
 lucene2
 lustre;cpe:/a:lustre:lustre-tests
 lvm2;cpe:/a:heinz_mauelshagen:lvm2
-lxr;cpe:/a:malcom_box:lxr_cross_referencer
 lxr-cvs;cpe:/a:malcom_box:lxr_cross_referencer
+lxr;cpe:/a:malcom_box:lxr_cross_referencer
 lxsession
 lynx-cur;cpe:/a:lynx:lynx
 lynx;cpe:/a:lynx:lynx
@@ -579,6 +581,8 @@ moodle;cpe:/a:moodle:moodle
 moon;cpe:/a:novell:moonlight
 motion;cpe:/a:lavrsen:motion
 movabletype-opensource;cpe:/a:sixapart:movabletype
+mozilla-thunderbird;cpe:/a:mozilla:thunderbird
+mozilla;cpe:/a:mozilla:firefox
 mp4h
 mpfr;cpe:/a:mpfr:gnu_mpfr
 mpg123;cpe:/a:mpg123:mpg123
@@ -598,7 +602,9 @@ mysql-5.1;cpe:/a:mysql:mysql
 mysql-dfsg-4.1;cpe:/a:mysql:mysql
 mysql-dfsg-5.0;cpe:/a:mysql:mysql
 mysql-dfsg-5.1;cpe:/a:mysql:mysql
+mysql-dfsg;cpe:/a:mysql:mysql
 mysql-ocaml;cpe:/a:mysql-ocaml:mysql-ocaml
+mysql;cpe:/a:mysql:mysql
 nag2
 nagios2;cpe:/a:nagios:nagios
 nagios3;cpe:/a:nagios:nagios
@@ -619,8 +625,8 @@ netatalk;cpe:/a:netatalk:netatalk
 netdisco-mibs-installer;cpe:/a:oliver_gorwits:netdisco_mibs_installer
 netmrg;cpe:/a:netmrg:netmrg
 netpbm-free
-network-manager;cpe:/a:gnome:networkmanager
 network-manager-applet;cpe:/a:gnome:networkmanager
+network-manager;cpe:/a:gnome:networkmanager
 newsbeuter;cpe:/a:newsbeuter:newsbeuter
 newsgate;cpe:/a:debian:newsgate
 newsx;cpe:/a:fedora:newsx
@@ -631,11 +637,11 @@ ngircd;cpe:/a:ngircd:ngircd
 nilfs2-tools
 no-ip;cpe:/a:no-ip:no-ip2
 nordugrid-arc-nox;cpe:/a:nordugrid:nordugrid-arc
-nsd;cpe:/a:nlnetlabs:nsd
 nsd3;cpe:/a:nlnetlabs:nsd
+nsd;cpe:/a:nlnetlabs:nsd
 nspr
-nss;cpe:/a:mozilla:nss
 nss-ldapd
+nss;cpe:/a:mozilla:nss
 ntop;cpe:/a:ntop:ntop
 ntp;cpe:/a:ntp:ntp
 nusoap;cpe:/a:dietrich_ayala:nusoap
@@ -646,8 +652,8 @@ ocsinventory-server;cpe:/a:ocsinventory-ng:ocs_inventory_ng
 oftc-hybrid;cpe:/a:oftc:oftc-hybrid
 ogle;cpe:/a:alan_woodland:ogle
 okular
-op;cpe:/a:swapoff:op
 op-panel
+op;cpe:/a:swapoff:op
 open-iscsi
 openacs
 openafs;cpe:/a:openafs:openafs
@@ -662,11 +668,12 @@ openldap2;cpe:/a:openldap:openldap
 openldap;cpe:/a:openldap:openldap
 openmpi
 openoffice.org;cpe:/a:sun:openoffice.org
-opensaml;cpe:/a:internet2:opensaml
 opensaml2;cpe:/a:internet2:opensaml
+opensaml;cpe:/a:internet2:opensaml
 opensc;cpe:/a:opensc-project:opensc
 openscenegraph
 openssh;cpe:/a:openssh:openssh
+openssl096;cpe:/a:openssl:openssl
 openssl097;cpe:/a:openssl:openssl
 openssl;cpe:/a:openssl:openssl
 openswan;cpe:/a:openswan:openswan
@@ -676,14 +683,14 @@ openx;cpe:/a:openx:openx
 opie;cpe:/a:nrl:opie
 optipng;cpe:/a:cosmin_truta:optipng
 os-prober;cpe:/a:debian:os-prober
-otrs;cpe:/a:otrs:otrs
 otrs2;cpe:/a:otrs:otrs
-owl;cpe:/a:ktools:owl
+otrs;cpe:/a:otrs:otrs
 owl-dms;cpe:/a:owl:intranet_knowledgebase
+owl;cpe:/a:ktools:owl
 p3nfs;cpe:/a:koeniglich:p3nfs
 p7zip;cpe:/a:7-zip:7-zip
-pam;cpe:/a:kernel:linux-pam
 pam-pgsql;cpe:/a:libpam-pgsql:libpam-pgsql
+pam;cpe:/a:kernel:linux-pam
 pan;cpe:/a:pan:pan
 pango1.0;cpe:/a:pango:pango
 paramiko;cpe:/a:python_software_foundation:paramiko
@@ -697,8 +704,8 @@ pcre3;cpe:/a:pcre:pcre
 pcsc-lite;cpe:/a:muscle:pcsc-lite
 pdfjam;cpe:/a:pdfjam:pdfjam
 pdkim
-pdns;cpe:/a:powerdns:powerdns
 pdns-recursor;cpe:/a:powerdns:recursor
+pdns;cpe:/a:powerdns:powerdns
 pdnsd;cpe:/a:pdnsd:pdnsd
 pdsh
 peercast;cpe:/a:peercast:peercast
@@ -731,8 +738,8 @@ piwigo;cpe:/a:piwigo:piwigo
 piwik;cpe:/a:piwik:piwik
 pixelpost;cpe:/a:pixelpost:pixelpost
 plait;cpe:/a:stephenjungels:plait
-planet;cpe:/a:intertwingly:planet
 planet-venus;cpe:/a:intertwingly:planet_venus
+planet;cpe:/a:intertwingly:planet
 plone3;cpe:/a:plone:plone
 plt-scheme
 pmount;cpe:/a:vincent_fourmond:pmount
@@ -751,6 +758,7 @@ postgresql-8.3;cpe:/a:postgresql:postgresql
 postgresql-8.4;cpe:/a:postgresql:postgresql
 postgresql-9.0;cpe:/a:postgresql:postgresql
 postgresql-ocaml;cpe:/a:ocaml:postgresql-ocaml
+postgresql;cpe:/a:postgresql:postgresql
 ppp;cpe:/a:marco_d%27itri:ppp
 prewikka;cpe:/a:prelude-technologies:prewikka
 printfilters-ppd;cpe:/a:a_mennucc1:printfilters-ppd
@@ -783,14 +791,15 @@ python3.1;cpe:/a:python:python
 python3.2;cpe:/a:python:python
 qemu-kvm
 qemu;cpe:/a:qemu:qemu
+qt-x11-free;cpe:/a:nokia:qt
 qt4-x11;cpe:/a:nokia:qt
 qtcreator;cpe:/a:nokia:qt_creator
 quagga;cpe:/a:quagga:quagga_routing_software_suite
 quassel;cpe:/a:quassel:quassel_core
 qutecom
 qwik
-r-base;cpe:/a:r_foundation:r
 r-base-core-ra
+r-base;cpe:/a:r_foundation:r
 radiance;cpe:/a:radiance:radiance
 rails;cpe:/a:ruby_on_rails:ruby_on_rails
 rancid;cpe:/a:shrubbery:rancid
@@ -802,8 +811,8 @@ redland
 redmine;cpe:/a:redmine:redmine
 refpolicy
 rekonq;cpe:/a:adjam:rekonq
-reportbug;cpe:/a:reportbug-ng:reportbug
 reportbug-ng;cpe:/a:reportbug-ng:reportbug-ng
+reportbug;cpe:/a:reportbug-ng:reportbug
 request-tracker3.4;cpe:/a:bestpractical:rt
 request-tracker3.6;cpe:/a:bestpractical:rt
 request-tracker3.8;cpe:/a:bestpractical:rt
@@ -846,8 +855,8 @@ sendmail;cpe:/a:sendmail:sendmail
 serendipity;cpe:/a:s9y:serendipity
 sgml2x;cpe:/a:alcovebook:sgml2x
 shadow;cpe:/a:debian:shadow
-shibboleth-sp;cpe:/a:internet2:shibboleth-sp
 shibboleth-sp2;cpe:/a:internet2:shibboleth-sp
+shibboleth-sp;cpe:/a:internet2:shibboleth-sp
 silc-client;cpe:/a:silc:silc_client
 silc-server;cpe:/a:silc:silc-server
 silc-toolkit;cpe:/a:silc:silc_toolkit
@@ -873,8 +882,8 @@ spice;cpe:/a:redhat:qspice
 spip;cpe:/a:spip:spip
 splitvt;cpe:/a:sam_lantinga:splitvt
 sql-ledger;cpe:/a:sql-ledger:sql-ledger
-squid;cpe:/a:squid-cache:squid
 squid3;cpe:/a:squid-cache:squid
+squid;cpe:/a:squid-cache:squid
 squidguard;cpe:/a:squidguard:squidguard
 squirrelmail;cpe:/a:squirrelmail:squirrelmail
 ssmtp;cpe:/a:ssmtp:ssmtp
@@ -914,6 +923,7 @@ textpattern;cpe:/a:textpattern:textpattern
 tgt;cpe:/a:zaal:tgt
 thin;cpe:/a:macournoyer:thin
 thttpd;cpe:/a:acme:thttpd
+thunderbird;cpe:/a:mozilla:thunderbird
 tiff;cpe:/a:libtiff:libtiff
 tiger;cpe:/a:tiger:tiger
 tightvnc;cpe:/a:tightvnc:tightvnc
@@ -928,28 +938,28 @@ tla
 tmsnc;cpe:/a:tmsnc:tmsnc
 tomboy;cpe:/a:gnome:tomboy
 tomcat-native
-tomcat5;cpe:/a:apache:tomcat
 tomcat5.5;cpe:/a:apache:tomcat
+tomcat5;cpe:/a:apache:tomcat
 tomcat6;cpe:/a:apache:tomcat
 tor;cpe:/a:tor:tor
 torcs;cpe:/a:bernhard_wymann:torcs
 torrentflux;cpe:/a:torrentflux:torrentflux
 tqsllib;cpe:/a:arrl:tqsllib
-trac;cpe:/a:edgewall:trac
 trac-git;cpe:/a:nanosleep:trac-git
+trac;cpe:/a:edgewall:trac
 transmission;cpe:/a:transmissionbt:transmission
 trickle;cpe:/a:monkey:trickle
 tss;cpe:/a:debian:tss
 tunapie;cpe:/a:james_stone:tunapie
 turba2;cpe:/a:debian:turba
 turbogears2;cpe:/a:turbogears:turbogears2
-tutos;cpe:/a:tutos:tutos
 tutos2;cpe:/a:tutos:tutos
+tutos;cpe:/a:tutos:tutos
 tuxguitar;cpe:/a:herac:tuxguitar
 tuxonice-userui
 twiki;cpe:/a:twiki:twiki
-typo;cpe:/a:typosphere:typo
 typo3-src;cpe:/a:typo3:typo3
+typo;cpe:/a:typosphere:typo
 udev;cpe:/a:kernel:udev
 udisks;cpe:/a:freedesktop:udisks
 udns
@@ -1002,8 +1012,8 @@ wims;cpe:/a:georges_khaznadar:wims
 wireshark;cpe:/a:wireshark:wireshark
 wml;cpe:/a:website_meta_language:website_meta_language
 wordnet;cpe:/a:wordnet:wordnet
-wordpress;cpe:/a:wordpress:wordpress
 wordpress-mu;cpe:/a:wordpress:wordpress_mu
+wordpress;cpe:/a:wordpress:wordpress
 wxwidgets2.6;cpe:/a:wxwidgets:wxwidgets
 wxwidgets2.8;cpe:/a:wxwidgets:wxwidgets
 wxwindows2.4;cpe:/a:wxwidgets:wxwidgets
@@ -1015,16 +1025,17 @@ xcal;cpe:/a:lars_bahner:xcal
 xcftools;cpe:/a:henning_makholm:xcftools
 xchat;cpe:/a:xchat:xchat
 xdg-utils;cpe:/a:freedesktop:xdg-utils
-xemacs21;cpe:/a:gnu:xemacs
 xemacs21-packages;cpe:/a:gnu:xemacs
-xen;cpe:/a:xensource:xen
-xen-3;cpe:/a:xensource:xen
+xemacs21;cpe:/a:gnu:xemacs
 xen-3.0;cpe:/a:xensource:xen
+xen-3;cpe:/a:xensource:xen
 xen-unstable;cpe:/a:xensource:xen
+xen;cpe:/a:xensource:xen
 xerces-c
 xerces-c2
 xerces27
 xfig;cpe:/a:xfig:xfig
+xfree86;cpe:/a:x:x11
 xine-lib;cpe:/a:xine:xine-lib
 xmacs21
 xmcd;cpe:/a:ti_kan:xmcd