More CPEs and aliases.

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

2 files changed, 63 insertions, 1 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 7f759333ec..e562c4f80d 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -229,6 +229,7 @@ cpe:/a:horde:application_framework
 cpe:/a:debian:turba
 cpe:/a:horde:turba_contact_manager
 cpe:/a:horde:turba_contact_manager_h3
+cpe:/a:horde:turba_h3
 
 cpe:/a:john_horne:rkhunter
 cpe:/a:gentoo:rootkit_hunter
@@ -449,12 +450,14 @@ cpe:/a:will_estes_and_john_millaway:flex
 
 cpe:/a:elog:elog
 cpe:/a:stefan_ritt:elog_web_logbook
+cpe:/a:elog:elogd
 
 cpe:/a:carnegie_mellon_university:cyrus-sasl
 cpe:/a:cyrus:sasl
 
 cpe:/a:cherokee-project:cherokee
 cpe:/a:cherokee:cherokee_httpd
+cpe:/a:cherokee:cherokee
 
 cpe:/a:gnu:gzip
 cpe:/a:gzip:gzip
@@ -622,9 +625,13 @@ cpe:/a:pam_mysql:pam_mysql
 
 cpe:/a:base:basic_analysis_and_security_engine
 cpe:/a:kevin_johnson:basic_analysis_and_security_engine
+cpe:/a:basic_analysis_and_security_engine:base
+cpe:/a:secureideas:basic_analysis_and_security_engine
+cpe:/a:secureideas:base
 
 cpe:/a:webdav:neon
 cpe:/a:neon:neon
+cpe:/a:neon:neon_client_library
 
 cpe:/a:opera:opera_browser
 cpe:/a:opera:opera
@@ -674,6 +681,51 @@ cpe:/a:debian:qpopper
 cpe:/a:gnu:lsh
 cpe:/a:lysator:lsh
 
+cpe:/a:nginx:nginx
+cpe:/a:igor_sysoev:nginx
+
+cpe:/a:overkill:overkill
+cpe:/a:0verkill:0verkill
+
+cpe:/a:university_of_minnesota:gopher
+cpe:/a:university_of_minnesota:gopherd
+
+cpe:/a:mplayer:mplayer
+cpe:/a:mplayer:unix_mplayer
+
+cpe:/a:dest-unreach:socat
+cpe:/a:socat:socat
+
+cpe:/a:reportbug-ng:reportbug
+cpe:/a:debian:reportbug
+
+cpe:/a:yaws:yaws
+cpe:/a:yaws:webserver
+
+cpe:/a:ben_webb:dopewars
+cpe:/a:dopewars:dopewars
+
+cpe:/a:linley_henzell:crawl
+cpe:/a:linley_henzell:dungeon_crawl
+
+cpe:/a:nufw:nufw
+cpe:/a:nufw:nufw_firewall
+
+cpe:/a:rob_landley:busybox
+cpe:/a:busybox:busybox
+
+cpe:/a:joey_hess:bsdgames
+cpe:/a:bsd-games:tetris-bsd
+
+cpe:/a:fbi:fbi
+cpe:/a:fbida:fbida
+
+cpe:/a:francis_james_franklin:libwmf
+cpe:/a:wvware:libwmf
+
+cpe:/a:beagle:beagle
+cpe:/a:beagle-project:beagle
+
 cpe:/a:webkit:webkit
 cpe:/a:apple:webkit
 
diff --git a/data/CPE/list b/data/CPE/list
index 511f719ac6..b9777a8fbf 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -5,6 +5,7 @@ abcmidi;cpe:/a:abcmidi:abcmidi
 abiword;cpe:/a:abisource:community_abiword
 abuse;cpe:/a:abuse:abuse-sdl
 acidbase;cpe:/a:base:basic_analysis_and_security_engine
+acidlab;cpe:/a:acid:analysis_console_for_intrusion_databases
 acl;cpe:/a:xfs:acl
 acon;cpe:/a:ahmed_abdel-hamid_mohamed:acon
 acpid;cpe:/a:tim_hockin:acpid
@@ -87,7 +88,7 @@ barnowl;cpe:/a:barnowl:barnowl
 base-config;cpe:/a:debian:base-config
 bash;cpe:/a:bash:bash
 bbclone;cpe:/a:bbclone:bbclone
-beagle;cpe:/o:beagle:beagle
+beagle;cpe:/a:beagle:beagle
 beanstalkd;cpe:/a:wildbit:beanstalkd
 bind9;cpe:/a:isc:bind
 bind;cpe:/a:isc:bind
@@ -108,6 +109,7 @@ bogofilter;cpe:/a:bogofilter:bogofilter
 boinc;cpe:/a:berkeley:boinc_client
 bomberclone;cpe:/a:bomberclone:bomberclone
 boost;cpe:/a:boost:boost
+bouncycastle;cpe:/a:bouncycastle:bouncy-castle-crypto-package
 bozohttpd;cpe:/a:eterna:bozohttpd
 bristol;cpe:/a:nick_copeland:bristol
 brltty;cpe:/a:mielke:brltty
@@ -117,6 +119,7 @@ bugzilla;cpe:/a:mozilla:bugzilla
 buildbot;cpe:/a:buildbot:buildbot
 bulmages;cpe:/a:iglues:bulmages-servers
 busybox;cpe:/a:rob_landley:busybox
+byacc;cpe:/a:yacc:yacc
 bzflag;cpe:/a:bzflag:bzflag_server
 bzip2;cpe:/a:bzip:bzip2
 cabextract;cpe:/a:cabextract:cabextract
@@ -272,6 +275,7 @@ elinks;cpe:/a:elinks:elinks
 elmo;cpe:/a:elmo:elmo
 elog;cpe:/a:elog:elog
 emacs-jabber;cpe:/a:emacs:emacs-jabber
+emacs-snapshot;cpe:/a:gnu:emacs
 emacs21;cpe:/a:gnu:emacs
 emacs22;cpe:/a:gnu:emacs
 emacs23;cpe:/a:gnu:emacs
@@ -388,6 +392,7 @@ gfax;cpe:/a:debian:gfax
 gforge;cpe:/a:gforge:gforge
 ghostscript;cpe:/a:artifex:gpl_ghostscript
 gif2png;cpe:/a:catb:gif2png
+giflib;cpe:/a:libungif:libungif
 gimp;cpe:/a:gimp:gimp
 git-core;cpe:/a:git:git
 git;cpe:/a:git:git
@@ -523,6 +528,7 @@ isc-dhcp;cpe:/a:isc:dhcp
 iscsitarget;cpe:/a:iscsitarget:iscsitarget
 isoqlog;cpe:/a:enderunix:isoqlog
 jabber;cpe:/a:jabber_software_foundation:jabber_server
+jabberd2;cpe:/a:jabberstudio:jabberd
 jailer;cpe:/a:javier_fernandez:jailer
 jasper;cpe:/a:jasper_project:jasper
 jbossas4;cpe:/a:redhat:jboss_enterprise_application_platform
@@ -589,6 +595,7 @@ lcdproc;cpe:/a:lcdproc:lcdproc
 lcms;cpe:/a:littlecms:lcms
 ldap-account-manager;cpe:/a:ldap_account_manager:ldap_account_manager
 ldapdiff;cpe:/a:ldapdiff:ldapdiff
+kernel-patch-vserver;cpe:/a:debian:kernel-patch-vserver
 ldapscripts;cpe:/a:ldapscripts:ldapscripts
 ldm;cpe:/a:ltsp:linux_terminal_server_project
 ldns;cpe:/a:nlnetlabs:ldns
@@ -1080,6 +1087,7 @@ python3.1;cpe:/a:python:python
 python3.2;cpe:/a:python:python
 qdbm;cpe:/a:qdbm:qdbm
 qemu;cpe:/a:qemu:qemu
+qemu-kvm;cpe:/a:kvm_qumranet:kvm
 qgit;cpe:/a:qgit:qgit
 qmail;cpe:/a:dan_bernstein:qmail
 qmailadmin;cpe:/a:inter7:qmailadmin
@@ -1178,6 +1186,7 @@ slocate;cpe:/a:slocate:slocate
 slurm-llnl;cpe:/a:llnl:slurm
 smail;cpe:/a:smail:smail
 smartlist;cpe:/a:smartlist:smartlist
+smarty3;cpe:/a:smarty:smarty
 smarty;cpe:/a:smarty:smarty
 smb4k;cpe:/a:smb4k:smb4k
 smbind;cpe:/a:blentz:smbind
@@ -1282,6 +1291,7 @@ tomcat4;cpe:/a:apache:tomcat
 tomcat5.5;cpe:/a:apache:tomcat
 tomcat5;cpe:/a:apache:tomcat
 tomcat6;cpe:/a:apache:tomcat
+toolchain-source;cpe:/a:debian:toolchain-source
 tor;cpe:/a:tor:tor
 torcs;cpe:/a:bernhard_wymann:torcs
 tork;cpe:/a:anonymityanywhere:tork