More CPE info.

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

2 files changed, 17 insertions, 2 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 1ce07458d0..bad0cff507 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -634,6 +634,12 @@ cpe:/a:vnc:realvnc
 cpe:/a:nvidia:binary_graphics_driver
 cpe:/a:nvidia:video_driver
 
+cpe:/a:usermin:usermin
+cpe:/a:webmin:usermin
+
+cpe:/a:john_lim:adodb
+cpe:/a:john_lim:adodb_date_library
+
 # Dummy entries to hide noise
 #cpe:/a:google:chrome
 #cpe:/a:webkit:webkit
diff --git a/data/CPE/list b/data/CPE/list
index e9e901185e..21318500e7 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -139,6 +139,7 @@ convirt;cpe:/a:convirture:convirt
 coreutils;cpe:/a:gnu:coreutils
 couchdb;cpe:/a:apache:couchdb
 courier-authlib;cpe:/a:courier-mta:courtier-authlib
+courier;cpe:/a:double_precision_incorporated:courier_mta
 cowbell;cpe:/a:more-cowbell:cowbell
 cpio;cpe:/a:gnu:cpio
 crip;cpe:/a:crip:crip
@@ -159,6 +160,7 @@ cvstrac;cpe:/a:cvstrac:cvstrac
 cyrus-imapd-2.2;cpe:/a:cmu:cyrus_imap_server
 cyrus-sasl2-heimdal
 cyrus-sasl2;cpe:/a:carnegie_mellon_university:cyrus-sasl
+cyrus21-imapd;cpe:/a:cmu:cyrus_imap_server
 dash;cpe:/a:dash:dash
 dbus-glib;cpe:/a:freedesktop:dbus-glib
 dbus;cpe:/a:freedesktop:dbus
@@ -191,6 +193,7 @@ dovecot;cpe:/a:dovecot:dovecot
 dpkg-cross;cpe:/a:debian:dpkg-cross
 dpkg;cpe:/a:debian:dpkg
 dracut;cpe:/a:fedoraproject:dracut
+dropbear;cpe:/a:matt_johnston:dropbear_ssh_server
 dropbox;cpe:/a:dropbox:dropbox
 drupal-4.7;cpe:/a:drupal:drupal
 drupal5;cpe:/a:drupal:drupal
@@ -300,6 +303,7 @@ gcj-4.3
 gcj-4.4
 gdb;cpe:/a:gnu:gdb
 gdcm
+gdk-pixbuf;cpe:/a:gnome:gdkpixbuf
 gdm;cpe:/a:gnome:gdm
 gdrae;cpe:/a:alejandro_garrido_mota:gdrae
 geda-gnetlist;cpe:/a:geda:gnetlist
@@ -469,7 +473,7 @@ koffice;cpe:/a:kde:koffice
 kolab-cyrus-imapd
 kolab-webclient
 kompozer
-konversastion;cpe:/a:konversation:konversation
+konversation;cpe:/a:konversation:konversation
 konwert;cpe:/a:krzysztof_kozlowski:konwert
 krb5;cpe:/a:mit:kerberos
 kronolith2;cpe:/a:horde:kronolith
@@ -540,6 +544,7 @@ libpam-heimdal
 libpam-krb5;cpe:/a:eyrie:pam-krb5
 libpam-mount;cpe:/a:pam_mount:pam_mount
 libpam-ssh;cpe:/a:andrew_j.korty:pam_ssh
+libphp-adodb;cpe:/a:john_lim:adodb
 libphp-cas;cpe:/a:ja-sig:phpcas_client_library
 libphp-jpgraph;cpe:/a:aditus:jpgraph
 libphp-snoopy;cpe:/a:andrei_zmievski:snoopy
@@ -583,8 +588,8 @@ links2;cpe:/a:twibright:links
 lintian;cpe:/a:debian:lintian
 linux-2.6.24;cpe:/o:linux:kernel
 linux-2.6;cpe:/o:linux:kernel
-linux-ftpd;cpe:/a:ftpd:ftpd
 linux-ftpd-ssl;cpe:/a:linux-ftpd-ssl:linux-ftpd-ssl
+linux-ftpd;cpe:/a:ftpd:ftpd
 linux-patch-grsecurity2;cpe:/a:grsecurity:grsecurity_kernel_patch
 linux-patch-tuxonice
 linuxdcpp;cpe:/a:linux:direct_connect
@@ -654,11 +659,13 @@ mldonkey;cpe:/a:mldonkey:mldonkey
 mlmmj;cpe:/a:mlmmj:mlmmj
 mn-fit;cpe:/a:zeus.physik.uni-bonn:mn_fit
 mnemo2;cpe:/a:horde:mnemo_h3
+mnogosearch;cpe:/a:mnogosearch:mnogosearch
 mod-auth-mysql;cpe:/a:joey_schulze:mod_auth_mysql
 moin;cpe:/a:moinmo:moinmoin
 mojarra;cpe:/a:oracle:mojarra
 mon;cpe:/a:jim_trocki:mon
 mondo;cpe:/a:mondo:rescue
+mongrel;cpe:/a:mongrel:mongrel
 monkeysphere;cpe:/a:monkeysphere_project:monkeysphere
 mono-debugger;cpe:/a:debian:mono-debugger
 mono;cpe:/a:mono_project:mono
@@ -685,6 +692,7 @@ multipath-tools;cpe:/a:christophe.varoqui:multipath-tools
 mutt;cpe:/a:mutt:mutt
 muttprint;cpe:/a:lukas_ruf:muttprint
 mydms;cpe:/a:letodms:letodms
+mydns;cpe:/a:don_moore:mydns
 myspell;cpe:/a:debian:myspell
 mysql-5.1;cpe:/a:mysql:mysql
 mysql-dfsg-4.1;cpe:/a:mysql:mysql
@@ -1103,6 +1111,7 @@ unace;cpe:/a:e-merge:unace
 unbound;cpe:/a:nlnet_labs:unbound
 unrealircd;cpe:/a:unrealircd:unrealircd
 unzip;cpe:/a:info-zip:unzip
+usermin;cpe:/a:usermin:usermin
 ust;cpe:/a:lttng:ust
 util-linux;cpe:/a:linux:util-linux
 uudeview;cpe:/a:uudeview:uudeview