Update list of CPE entries and aliases based on CVE ids for 2011 and 2012.

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

1 files changed, 98 insertions, 8 deletions

diff --git a/data/CPE/list b/data/CPE/list
index dad65ccfcf..86162d24df 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -9,6 +9,7 @@ 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
+activemq;cpe:/a:apache:activemq
 adns;cpe:/a:gnu:adns
 adplug;cpe:/a:audacious_media_player_team:adplug
 adzapper;cpe:/a:cameron_simpson:adzapper
@@ -42,6 +43,7 @@ apt-cacher;cpe:/a:debian:apt-cacher
 apt-listchanges;cpe:/a:debian:apt-listchanges
 apt-setup;cpe:/a:debian:apt-setup
 apt;cpe:/a:debian:apt
+aptdaemon;cpe:/a:sebastian_heinlein:aptdaemon
 aptlinex;cpe:/a:debian:aptlinex
 aptoncd;cpe:/a:aptoncd:aptoncd
 aqualung;cpe:/a:aqualung:aqualung
@@ -52,6 +54,7 @@ argyll;cpe:/a:argyllcms:argyllcms
 aria2;cpe:/a:tatsuhiro_tsujikawa:aria2
 arora;cpe:/a:arora-browser:arora
 arts;cpe:/a:kde:arts
+as31;cpe:/a:bdale_garbee:as31
 asn1c;cpe:/a:asn.1_compiler:asn.1_compiler
 aspell;cpe:/a:gnu:aspell
 astats;cpe:/a:astats:astats
@@ -88,6 +91,7 @@ barnowl;cpe:/a:barnowl:barnowl
 base-config;cpe:/a:debian:base-config
 bash;cpe:/a:bash:bash
 bbclone;cpe:/a:bbclone:bbclone
+bcfg2;cpe:/a:bcfg2:bcfg2
 beagle;cpe:/a:beagle:beagle
 beanstalkd;cpe:/a:wildbit:beanstalkd
 bind9;cpe:/a:isc:bind
@@ -135,6 +139,8 @@ cdcontrol;cpe:/a:gleydson_mazioli_da_silva:cdcontrol
 cdrtools;cpe:/a:cdrtools:cdrecord
 cdrw-taper;cpe:/a:tivano:cdrw-taper
 cecilia;cpe:/a:cecilia:cecilia
+cedet;cpe:/a:eric_m_ludlam:cedet
+celery;cpe:/a:celeryproject:celery
 centericq;cpe:/a:centericq:centericq
 centerim;cpe:/a:centerim:centerim
 cfengine2;cpe:/a:gnu:cfengine
@@ -143,6 +149,7 @@ cfs;cpe:/a:matt_blaze:cryptographic_file_system
 cgiirc;cpe:/a:cgiirc:cgiirc
 cgiwrap;cpe:/a:nathan_neulinger:cgiwrap
 changetrack;cpe:/a:cameron_morland:changetrack
+chasen;cpe:/a:nara_institute_of_science_and_technology:chasen
 chbg;cpe:/a:chbg:chbg
 checkinstall;cpe:/a:checkinstall:checkinstall
 cheesetracker;cpe:/a:cheese_tracker:cheese_tracker
@@ -159,6 +166,7 @@ citadel;cpe:/a:debian:citadel_server
 clamav;cpe:/a:clamav:clamav
 classpath;cpe:/a:gnu:classpath
 claws-mail;cpe:/a:claws_mail:claws_mail_tools
+clearsilver;cpe:/a:brandon_long:clearsilver
 cluster-agents;cpe:/a:linux-ha:ocf_resource_agents
 cmake;cpe:/a:kitware:cmake
 cmus;cpe:/a:cmus:cmus
@@ -166,9 +174,12 @@ cobbler;cpe:/a:michael_dehaan:cobbler
 coccinelle;cpe:/a:emn:coccinelle
 collectd;cpe:/a:collectd:collectd
 colloquy;cpe:/a:colloquy:colloquy
+colord;cpe:/a:freedesktop:colord
 comix;cpe:/a:comix:comix
 common-lisp-controller;cpe:/a:common-lisp-controller:common-lisp-controller
+commons-daemon;cpe:/a:apache:apache_commons_daemon
 condor;cpe:/a:condor_project:condor
+conky;cpe:/a:conky:conky
 conquest;cpe:/a:radscan:conquest
 convirt;cpe:/a:convirture:convirt
 coolkey;cpe:/a:fedoraproject:coolkey
@@ -196,6 +207,7 @@ cvs;cpe:/a:nongnu:cvs
 cvsnt;cpe:/a:march-hare:cvsnt
 cvstrac;cpe:/a:cvstrac:cvstrac
 cyrus-imapd-2.2;cpe:/a:cmu:cyrus_imap_server
+cyrus-imapd-2.4;cpe:/a:cmu:cyrus_imap_server
 cyrus-imapd;cpe:/a:carnegie_mellon_university:cyrus_imap_server
 cyrus-sasl2;cpe:/a:carnegie_mellon_university:cyrus-sasl
 cyrus-sasl;cpe:/a:cyrus:sasl
@@ -237,9 +249,11 @@ dkim-milter;cpe:/a:dkim:dkim-milter
 dns2tcp;cpe:/a:hsc:dns2tcp
 dnsmasq;cpe:/a:thekelleys:dnsmasq
 dnssec-tools;cpe:/a:dnssec-tools:dnssec-tools
+doctrine;cpe:/a:doctrine-project:doctrine
 docvert;cpe:/a:holloway:docvert
 dojo;cpe:/a:dojotoolkit:dojo
 dokuwiki;cpe:/a:dokuwiki:dokuwiki
+dolibarr;cpe:/a:dolibarr:dolibarr
 dopewars;cpe:/a:ben_webb:dopewars
 dosbox;cpe:/a:dosbox:dosbox
 dovecot;cpe:/a:dovecot:dovecot
@@ -253,6 +267,7 @@ drupal5;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
+drupal7;cpe:/a:drupal:drupal
 drupal;cpe:/a:drupal:drupal
 dstat;cpe:/a:dag.wieers:dstat
 dtc;cpe:/a:gplhost:dtc-common
@@ -265,6 +280,7 @@ eclipse;cpe:/a:eclipse:eclipse_ide
 ecryptfs-utils;cpe:/a:ecryptfs:ecryptfs_utils
 ed;cpe:/a:gnu:ed
 eggdrop;cpe:/a:eggheads:eggdrop
+eglibc;cpe:/a:gnu:eglibc
 egroupware;cpe:/a:egroupware:egroupware
 ejabberd;cpe:/a:process-one:ejabberd
 ekg;cpe:/a:ekg:ekg
@@ -283,6 +299,7 @@ emacspeak;cpe:/a:emacspeak_inc:emacspeak
 ember;cpe:/a:erik_hjortsberg:ember
 emesene;cpe:/a:emesene:emesene
 emil;cpe:/a:emil:emil
+empathy;cpe:/a:gnome:empathy
 encfs;cpe:/a:arg0:encfs
 enemies-of-carlotta;cpe:/a:enemies_of_carlotta:enemies_of_carlotta
 enigmail;cpe:/a:enigmail:enigmail
@@ -292,6 +309,7 @@ epiphany-browser;cpe:/a:gnome:epiphany
 eric;cpe:/a:eric_integrated_development_environment:eric_integrated_development_environment
 erlang;cpe:/a:erlang:erlang
 eterm;cpe:/a:eterm:eterm
+etherape;cpe:/a:juan_toledo:etherape
 ethereal;cpe:/a:wireshark:wireshark
 ettercap;cpe:/a:ettercap:ettercap
 eucalyptus;cpe:/a:eucalyptus:eucalyptus
@@ -308,6 +326,7 @@ expat;cpe:/a:james_clark:expat
 ez-ipupdate;cpe:/a:angus_mackay:ez-ipupdate
 ezpublish;cpe:/a:ez:ez_publish
 faad2;cpe:/a:audiocoding:faad2
+fabric;cpe:/a:fabfile:fabric
 fai;cpe:/a:thomas_lange:fully_automated_installation
 fail2ban;cpe:/a:fail2ban:fail2ban
 faqomatic;cpe:/a:faq-o-matic:faq-o-matic
@@ -315,10 +334,13 @@ fastjar;cpe:/a:matthias_klose:fastjar
 fbi;cpe:/a:fbi:fbi
 fckeditor;cpe:/a:fckeditor:fckeditor
 fcron;cpe:/a:thibault_godouet:fcron
+feedparser;cpe:/a:mark_pilgrim:feedparser
+feh;cpe:/a:daniel_friesel:feh
 festalon;cpe:/a:festalon:festalon
 festival;cpe:/a:cstr:festival
 feta;cpe:/a:debian:feta
 fetchmail;cpe:/a:eric_raymond:fetchmail
+fex;cpe:/a:ulli_horlacher:fex
 ffmpeg-debian;cpe:/a:ffmpeg:ffmpeg
 ffmpeg;cpe:/a:ffmpeg:ffmpeg
 file;cpe:/a:christos_zoulas:file
@@ -379,6 +401,7 @@ gconf2;cpe:/a:gnome:gconf
 gdal;cpe:/a:gdal:gdal
 gdb;cpe:/a:gnu:gdb
 gdk-pixbuf;cpe:/a:gnome:gdkpixbuf
+gdm3;cpe:/a:gnome:gdm
 gdm;cpe:/a:gnome:gdm
 gdrae;cpe:/a:alejandro_garrido_mota:gdrae
 geda-gnetlist;cpe:/a:geda:gnetlist
@@ -396,9 +419,11 @@ giflib;cpe:/a:libungif:libungif
 gimp;cpe:/a:gimp:gimp
 git-core;cpe:/a:git:git
 git;cpe:/a:git:git
+gitolite;cpe:/a:sitaram_chamarty:gitolite
 glassfish;cpe:/a:oracle:sun_glassfish_enterprise_server
 glib2.0;cpe:/a:gnome:glib
 glibc;cpe:/a:gnu:glibc
+glpi;cpe:/a:glpi-project:glpi
 gmanedit;cpe:/a:gmanedit2:gmanedit
 gmime2.2;cpe:/a:gnome:gmime
 gmime2.4;cpe:/a:gnome:gmime
@@ -425,6 +450,7 @@ gnutls11;cpe:/a:gnu:gnutls
 gnutls12;cpe:/a:gnu:gnutls
 gnutls13;cpe:/a:gnu:gnutls
 gnutls26;cpe:/a:gnu:gnutls
+gnutls28;cpe:/a:gnu:gnutls
 gocr;cpe:/a:gocr:optical_character_recognition_utility
 gopher;cpe:/a:university_of_minnesota:gopher
 gosa;cpe:/a:gonicus:gonicus_system_administration
@@ -453,8 +479,10 @@ gv;cpe:/a:gnu:gv
 gwt;cpe:/a:google:web_toolkit
 gxine;cpe:/a:xine:gxine
 gzip;cpe:/a:gnu:gzip
+hammerhead;cpe:/a:geoff_wong:hammerhead
 hashcach;cpe:/a:hashcash:hashcash
 hashcash;cpe:/a:hashcash:hashcash
+hastymail;cpe:/a:hastymail:hastymail2
 havp;cpe:/a:havp:havp
 heartbeat-2;cpe:/a:high_availability_linux_project:heartbeat
 heartbeat;cpe:/a:linux-ha:heartbeat
@@ -478,6 +506,7 @@ htget;cpe:/a:htget:htget
 htmldoc;cpe:/a:htmldoc:htmldoc
 htmlheadline;cpe:/a:toshiaki_kanosue:htmlheadline
 htop;cpe:/a:htop:htop
+httpcomponents-client;cpe:/a:apache:httpclient
 httrack;cpe:/a:httrack:httrack
 hybserv;cpe:/a:dinko_korunic:hybserv2
 hylafax;cpe:/a:hylafax:hylafax
@@ -490,6 +519,7 @@ icecast-server;cpe:/a:icecast:icecast
 icecast2;cpe:/a:icecast:icecast
 icedove;cpe:/a:mozilla:thunderbird
 iceweasel;cpe:/a:mozilla:firefox
+icinga;cpe:/a:icinga:icinga
 icu;cpe:/a:icu_project:international_components_for_unicode
 id3lib3.8.3;cpe:/a:id3lib:id3lib
 ident2;cpe:/a:michael_bacarella:ident2
@@ -513,6 +543,7 @@ inn2;cpe:/a:isc:inn
 inotify-tools;cpe:/a:inotify:inotify-tools
 inspircd;cpe:/a:inspire_ircd:inspircd
 interchange;cpe:/a:interchange_development_group:interchange
+ioquake3;cpe:/a:ioquake3:ioquake3_engine
 ipcalc;cpe:/a:krischan_jodies:ip_calculator
 ipmenu;cpe:/a:david_stes:ipmenu
 ipplan;cpe:/a:richard_ellerbrock:ipplan
@@ -528,17 +559,20 @@ isc-dhcp;cpe:/a:isc:dhcp
 iscsitarget;cpe:/a:iscsitarget:iscsitarget
 isoqlog;cpe:/a:enderunix:isoqlog
 jabber;cpe:/a:jabber_software_foundation:jabber_server
+jabberd14;cpe:/a:jabberd:jabberd14
 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
 jbosseam;cpe:/a:jboss:seam
+jenkins;cpe:/a:cloudbees:jenkins
 jetty;cpe:/a:mortbay:jetty
 jffnms;cpe:/a:jffnms:just_for_fun_network_management_system
 jftpgw;cpe:/a:jftpgw:jftpgw
 jhead;cpe:/a:sentex:jhead
 jitterbug;cpe:/a:samba:jitterbug
 jquery;cpe:/a:jquery:jquery
+jruby;cpe:/a:jruby:jruby
 jsboard;cpe:/a:jsboard:jsboard
 jspwiki;cpe:/a:jspwiki:jspwiki
 junkbuster;cpe:/a:junkbuster:internet_junkbuster
@@ -548,10 +582,12 @@ kde4libs;cpe:/o:kde:kdelibs
 kdebase;cpe:/o:kde:kde
 kdegraphics;cpe:/a:kde:kdegraphics
 kdelibs;cpe:/o:kde:kdelibs
+keepalived;cpe:/a:keepalived:keepalived
 kernel-image-2.6.8-9-amd64-generic;cpe:/o:linux:kernel
 kernel-patch-2.4-grsecurity;cpe:/a:grsecurity:grsecurity_kernel_patch
 kernel-patch-adamantix;cpe:/a:the_pax_team:pax_linux
 kernel-patch-grsecurity2;cpe:/a:grsecurity:grsecurity_kernel_patch
+kernel-patch-vserver;cpe:/a:debian:kernel-patch-vserver
 kernel-source-2.2.20;cpe:/o:linux:kernel
 kernel-source-2.4.24;cpe:/o:linux:kernel
 kernel-source-2.4.27;cpe:/o:linux:kernel
@@ -571,10 +607,12 @@ kile;cpe:/a:kile:kile
 kismet;cpe:/a:kismet:kismet
 knowledgetree;cpe:/a:jam_warehouse:knowledgetree_open_source
 koffice;cpe:/a:kde:koffice
+koha;cpe:/a:koha:koha
 konversation;cpe:/a:konversation:konversation
 konwert;cpe:/a:krzysztof_kozlowski:konwert
 kphone;cpe:/a:kphone:kphone
 krb4;cpe:/a:mit:kerberos
+krb5-appl;cpe:/a:mit:krb5-appl
 krb5;cpe:/a:mit:kerberos
 kronolith2;cpe:/a:horde:kronolith
 kronolith;cpe:/a:horde:kronolith
@@ -595,7 +633,6 @@ 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
@@ -615,6 +652,7 @@ libapache-mod-python;cpe:/a:apache:mod_python
 libapache-mod-security;cpe:/a:modsecurity:modsecurity
 libapache-mod-ssl;cpe:/a:mod_ssl:mod_ssl
 libapache2-mod-auth-pgsql;cpe:/a:guiseppe_tanzilli_and_matthias_eckermann:mod_auth_pgsql
+libapache2-mod-authnz-external;cpe:/a:jan_wolter:mod_authnz_external
 libapache2-mod-fcgid;cpe:/a:apache:mod_fcgid
 libapache2-mod-jk2;cpe:/a:apache_software_foundation:mod_jk
 libapache2-mod-perl2;cpe:/a:apache:mod_perl
@@ -623,22 +661,28 @@ libapreq2;cpe:/a:libapreq2:libapreq2
 libarchive-tar-perl;cpe:/a:cpan:archive_tar_perl_module
 libarchive;cpe:/a:freebsd:libarchive
 libast;cpe:/a:libast:libast
+libav;cpe:/a:libav:libav
 libcairo;cpe:/a:redhat:cairo
 libcdio;cpe:/a:gnu:libcdio
 libcgi-pm-perl;cpe:/a:andy_armstrong:cgi.pm
 libcgi-session-perl;cpe:/a:sherzod_ruzmetov:cgi_session
 libcgi-simple-perl;cpe:/a:andy_armstrong:cgi-simple
+libcgroup;cpe:/a:balbir_singh:libcgroup
 libcompface;cpe:/a:james_ashton:compface
 libcompress-raw-bzip2-perl;cpe:/a:bzip:compress-raw-bzip2
 libcompress-raw-zlib-perl;cpe:/a:paul_marquess:compress-raw-zlib_perl_module
 libconvert-uulib-perl;cpe:/a:perl:convert_uulib
 libcrypt-cbc-perl;cpe:/a:lincoln_d._stein:crypt_cbc
+libcrypt-dsa-perl;cpe:/a:adam_kennedy:crypt-dsa
 libcrypt-openssl-dsa-perl;cpe:/a:perl-openssl:libcrypt-openssl-dsa-perl
+libdigest-perl;cpe:/a:gisle_aas:digest
 libdumb;cpe:/a:dynamic_universal_music_bibliotheque:dumb
+libencode-perl;cpe:/a:dan_kogai:encode_module
 libesmtp;cpe:/a:stafford.uklinux:libesmtp
 libevent;cpe:/a:niels_provos:libevent
 libexif;cpe:/a:curtis_galloway:libexif
 libextractor;cpe:/a:libextractor:libextractor
+libfcgi-perl;cpe:/a:sven_verdoolaege:fcgi
 libfishsound;cpe:/a:xiph:libfishsound
 libfwbuilder;cpe:/a:fwbuilder:firewall_builder
 libgadu;cpe:/a:wojtek_kaniewsk:libgadu
@@ -651,6 +695,7 @@ libglpng;cpe:/a:glpng:glpng
 libgsf;cpe:/a:libgsf:libgsf
 libgtop2;cpe:/a:libgtop:libgtop
 libhtml-parser-perl;cpe:/a:derrick_oswald:html-parser
+libhtml-template-pro-perl;cpe:/a:igor_vlasenko:html-template-pro
 libhx;cpe:/a:jan_engelhardt:libhx
 libid3tag;cpe:/a:media-libs:libid3tag
 libimager-perl;cpe:/a:imager:imager
@@ -659,6 +704,7 @@ libjfreechart-java;cpe:/o:jfree:jfreechart
 libksba;cpe:/a:libksba_library:libksba_library
 libmikmod;cpe:/a:raphael_assenat:libmikmod
 libmodplug;cpe:/a:konstanty_bialkowski:libmodplug
+libmojolicious-perl;cpe:/a:mojolicious:mojolicious
 libmusicbrainz-2.0;cpe:/a:musicbrainz:libmusicbrainz
 libmusicbrainz-2.1;cpe:/a:musicbrainz:libmusicbrainz
 libnasl;cpe:/a:finkproject:libnasl
@@ -674,6 +720,8 @@ libpam-mount;cpe:/a:pam_mount:pam_mount
 libpam-radius-auth;cpe:/a:apache:mod_auth_radius
 libpam-radius-auth;cpe:/a:apache:mod_auth_radius
 libpam-ssh;cpe:/a:andrew_j.korty:pam_ssh
+libpar-packer-perl;cpe:/a:roderich_schupp:par-packer_module
+libpar-perl;cpe:/a:roderich_schupp:par-packer_module
 libphp-adodb;cpe:/a:john_lim:adodb
 libphp-cas;cpe:/a:ja-sig:phpcas_client_library
 libphp-jpgraph;cpe:/a:aditus:jpgraph
@@ -681,10 +729,12 @@ libphp-phpmailer;cpe:/a:phpmailer:phpmailer
 libphp-snoopy;cpe:/a:andrei_zmievski:snoopy
 libpng3;cpe:/a:libpng:libpng
 libpng;cpe:/a:libpng:libpng
+libreoffice;cpe:/a:libreoffice:libreoffice
 libsafe;cpe:/a:avaya:libsafe
 libsdp;cpe:/a:openfabrics:libsdp
 libsmi;cpe:/a:tu-braunschweig:libsmi
 libsndfile;cpe:/a:mega-nerd:libsndfile
+libsoup2.4;cpe:/a:joe_shaw:libsoup
 libsoup;cpe:/a:joe_shaw:libsoup
 libspf2;cpe:/a:libspf:libspf2
 libspf;cpe:/a:libspf:libspf
@@ -704,6 +754,7 @@ libvc;cpe:/a:andrew_hsu:libvc
 libvirt;cpe:/a:libvirt:libvirt
 libvncserver;cpe:/a:libvncserver:libvncserver
 libvorbis;cpe:/a:xiph.org:libvorbis
+libvpx;cpe:/a:john_koleszar:libvpx
 libwmf;cpe:/a:francis_james_franklin:libwmf
 libwpd;cpe:/a:libwpd:libwpd_library
 libwww-perl;cpe:/a:search.cpan:libwww-perl
@@ -714,7 +765,9 @@ libxml2;cpe:/a:xmlsoft:libxml2
 libxml;cpe:/a:xmlsoft:libxml
 libxslt;cpe:/a:xmlsoft:libxslt
 licq;cpe:/a:licq:licq
+liferay-portal;cpe:/a:liferay:portal
 liferea;cpe:/a:liferea:liferea
+lightdm;cpe:/a:robert_ancell:lightdm
 lighttpd;cpe:/a:lighttpd:lighttpd
 lilo;cpe:/a:lilo:lilo
 link-grammar;cpe:/a:link_grammar:link_grammar
@@ -734,6 +787,8 @@ lm-sensors;cpe:/a:lm_sensors:lm_sensors
 lmbench;cpe:/a:bitmover:lmbench
 log2mail;cpe:/a:log2mail:log2mail
 logcheck;cpe:/a:psionic:logcheck
+loggerhead;cpe:/a:michael_hudson-doyle:loggerhead
+logrotate;cpe:/a:gentoo:logrotate
 logwatch;cpe:/a:logwatch:logwatch
 lookup-el;cpe:/a:lookup:lookup
 loop-aes-utils;cpe:/a:debian_loop-aes_team:loop-aes-utils
@@ -742,6 +797,7 @@ ltp;cpe:/a:alastair_mckinstry:ltp-network-test
 ltrace;cpe:/a:juan_cespedes:ltrace
 ltris;cpe:/a:lgames:ltris
 ltsp;cpe:/a:ltsp:linux_terminal_server_project
+lua-expat;cpe:/a:matthewwild:luaexpat
 lurker;cpe:/a:lurker:lurker
 lustre;cpe:/a:lustre:lustre-tests
 lvm10;cpe:/a:lvm:logical_volume_management_utilities
@@ -767,6 +823,7 @@ mailscanner;cpe:/a:mailscanner:mailscanner
 mailutils;cpe:/a:gnu:mailutils
 mako;cpe:/a:makotemplates:mako
 mambo;cpe:/a:mambo:mambo
+man2html;cpe:/a:robert_luberda:man2html
 mantis;cpe:/a:mantisbt:mantisbt
 mapserver;cpe:/a:umn:mapserver
 maradns;cpe:/a:maradns:maradns
@@ -899,6 +956,7 @@ nikto;cpe:/a:nikto:nikto
 nilfs2-tools;cpe:/a:nilf:nilfs
 no-ip;cpe:/a:no-ip:no-ip2
 nordugrid-arc-nox;cpe:/a:nordugrid:nordugrid-arc
+nova;cpe:/a:openstack:nova
 noweb;cpe:/a:norman_ramsey:noweb
 nsd3;cpe:/a:nlnetlabs:nsd
 nsd;cpe:/a:nlnetlabs:nsd
@@ -914,33 +972,40 @@ nvclock;cpe:/a:gentoo:nvclock
 nvidia-cg-toolkit;cpe:/a:federico_di_gregorio:nvidia-cg-toolkit
 nvidia-graphics-drivers;cpe:/a:nvidia:binary_graphics_driver
 nvidia-kernel-common;cpe:/a:nvidia:video_driver
+ocaml;cpe:/a:inria:ocaml
 ocp;cpe:/a:open_cubic_player:open_cubic_player
 ocrodjvu;cpe:/a:jwilk:ocrodjvu
 ocsinventory-agent;cpe:/a:ocsinventory-ng:ocsinventory-agent
 ocsinventory-server;cpe:/a:ocsinventory-ng:ocs_inventory_ng
+ofa-kernel;cpe:/a:openfabrics:enterprise_distribution
 oftc-hybrid;cpe:/a:oftc:oftc-hybrid
 oftpd;cpe:/a:oftpd:oftpd
 ogle;cpe:/a:alan_woodland:ogle
 oops;cpe:/a:igor_khasilev:oops_proxy_server
 op;cpe:/a:swapoff:op
 open-iscsi;cpe:/a:redhat:open_iscsi
+open-vm-tools;cpe:/a:vmware:open-vm-tools
 openafs;cpe:/a:openafs:openafs
+openarena;cpe:/a:openarena:openarena
 openconnect;cpe:/a:infradead:openconnect
 opendchub;cpe:/a:roshan_singh:open_direct_connect_hub
 openexr;cpe:/a:openexr:openexr
 openjdk-6;cpe:/a:sun:openjdk
+openjdk-7;cpe:/a:sun:openjdk
 openldap2.2;cpe:/a:openldap:openldap
 openldap2.3;cpe:/a:openldap:openldap
 openldap2;cpe:/a:openldap:openldap
 openldap;cpe:/a:openldap:openldap
 openmosixview;cpe:/a:openmosixview:openmosixview
 openmotif;cpe:/a:integrated_computer_solutions:openmotif
+opennms;cpe:/a:opennms.org:opennms
 openoffice.org;cpe:/a:sun:openoffice.org
 opensaml2;cpe:/a:internet2:opensaml
 opensaml;cpe:/a:internet2:opensaml
 opensc;cpe:/a:opensc-project:opensc
 openser;cpe:/a:openser:openser
 openslp;cpe:/a:openslp:openslp
+openssh-server;cpe:/a:openssh:openssh
 openssh;cpe:/a:openssh:openssh
 openssl094;cpe:/a:openssl:openssl
 openssl095;cpe:/a:openssl:openssl
@@ -989,6 +1054,8 @@ perlbal;cpe:/a:perlbal:perlbal
 petris;cpe:/a:petris:petris
 php-apc;cpe:/a:pecl-php:alternative_php_cache
 php-htmlpurifier;cpe:/a:htmlpurifier:htmlpurifier
+php-ids;cpe:/a:phpids:phpids
+php-suhosin;cpe:/a:hardened-php:suhosin
 php-xajax;cpe:/a:xajax:xajax
 php3;cpe:/a:php:php
 php4;cpe:/a:php:php
@@ -1015,6 +1082,7 @@ pinball;cpe:/a:jochen_friedrich:pinball
 pine;cpe:/a:university_of_washington:pine
 pinentry;cpe:/a:gentoo:app-crypt_pinentry
 pioneers;cpe:/a:pioneers:pioneers
+pithos;cpe:/a:kevinmehall:pithos
 pivot;cpe:/a:pivot:pivot
 piwigo;cpe:/a:piwigo:piwigo
 piwik;cpe:/a:piwik:piwik
@@ -1023,10 +1091,14 @@ plait;cpe:/a:stephenjungels:plait
 planet-venus;cpe:/a:intertwingly:planet_venus
 planet;cpe:/a:intertwingly:planet
 playmidi;cpe:/a:playmidi:playmidi
+plib;cpe:/a:steve_j_baker:plib
 plone3;cpe:/a:plone:plone
+pmake;cpe:/a:ihji:pmake
 pmount;cpe:/a:vincent_fourmond:pmount
+pmwiki;cpe:/a:pmwiki:pmwiki
 po4a;cpe:/a:po4a:po4a
 policyd-weight;cpe:/a:policyd-weight:policyd-weight
+policykit-1;cpe:/a:freedesktop:policykit
 policykit;cpe:/a:freedesktop:policykit
 polipo;cpe:/a:pps.jussieu:polipo
 polygen;cpe:/a:polygen:polygen
@@ -1055,6 +1127,7 @@ printfilters-ppd;cpe:/a:a_mennucc1:printfilters-ppd
 proftpd-dfsg;cpe:/a:proftpd:proftpd
 proftpd;cpe:/a:proftpd:proftpd
 projectl;cpe:/a:debian:projectl
+prosody;cpe:/a:prosody:prosody
 prototypejs;cpe:/a:prototypejs:prototype_javascript_framework
 prozilla;cpe:/a:prozilla:prozilla_download_accelerator
 psi;cpe:/a:psi-im:psi
@@ -1075,6 +1148,7 @@ python-django;cpe:/a:djangoproject:django
 python-dns;cpe:/a:debian:python-dns
 python-formencode;cpe:/a:formencode:formencode
 python-pyftpdlib;cpe:/a:g.rodola:pyftpdlib
+python-virtualenv;cpe:/a:python:virtualenv
 python2.1;cpe:/a:python:python
 python2.2;cpe:/a:python:python
 python2.3;cpe:/a:python:python
@@ -1085,9 +1159,10 @@ python2.7;cpe:/a:python:python
 python2.8;cpe:/a:python:python
 python3.1;cpe:/a:python:python
 python3.2;cpe:/a:python:python
+pywebdav;cpe:/a:simon_pamies:pywebdav
 qdbm;cpe:/a:qdbm:qdbm
-qemu;cpe:/a:qemu:qemu
 qemu-kvm;cpe:/a:kvm_qumranet:kvm
+qemu;cpe:/a:qemu:qemu
 qgit;cpe:/a:qgit:qgit
 qmail;cpe:/a:dan_bernstein:qmail
 qmailadmin;cpe:/a:inter7:qmailadmin
@@ -1136,6 +1211,7 @@ rsync;cpe:/a:rsync:rsync
 rsyslog;cpe:/a:rsyslog:rsyslog
 rt73;cpe:/h:ralinktech:rt73
 ruby-gnome2;cpe:/a:ruby_gnome2:ruby_gnome2
+ruby-rack;cpe:/a:rubyforge:rack
 ruby1.6;cpe:/a:ruby-lang:ruby
 ruby1.8;cpe:/a:ruby-lang:ruby
 ruby1.9.1;cpe:/a:ruby-lang:ruby
@@ -1148,6 +1224,7 @@ sa-exim;cpe:/a:sa-exim:sa-exim
 sabre;cpe:/a:debian:xsabre
 sahana;cpe:/a:sahanafoundation:sahana
 salome;cpe:/a:salome-platform:salome
+samba4;cpe:/a:samba:samba
 samba;cpe:/a:samba:samba
 samhain;cpe:/a:samhain_labs:samhain
 samizdat;cpe:/a:nongnu:samizdat
@@ -1176,6 +1253,7 @@ silc-server;cpe:/a:silc:silc-server
 silc-toolkit;cpe:/a:silc:silc_toolkit
 silverstripe;cpe:/a:silverstripe:silverstripe
 simpleproxy;cpe:/a:simpleproxy:simpleproxy
+simplesamlphp;cpe:/a:simplesamlphp:simplesamlphp
 sing;cpe:/a:sing:sing
 sitebar;cpe:/a:sitebar:sitebar
 skktools;cpe:/a:skk_openlab:skk_tools
@@ -1190,6 +1268,7 @@ smarty3;cpe:/a:smarty:smarty
 smarty;cpe:/a:smarty:smarty
 smb4k;cpe:/a:smb4k:smb4k
 smbind;cpe:/a:blentz:smbind
+smokeping;cpe:/a:oetiker:smokeping
 sms-pl;cpe:/a:sms:sms
 smsclient;cpe:/a:smsclient:smsclient
 smstools;cpe:/a:stefan_frings:sms_server_tools
@@ -1237,11 +1316,13 @@ swftools;cpe:/a:swftools:swftools
 sword;cpe:/a:the_sword_project:sword
 sylpheed-claws;cpe:/a:sylpheed-claws:sylpheed-claws
 sylpheed;cpe:/a:sylpheed:sylpheed
+symfony;cpe:/a:symphony-cms:symphony_cms
 sympa;cpe:/a:sympa:sympa
 synaesthesia;cpe:/a:synaesthesia:synaesthesia
 synfig;cpe:/a:synfig:synfigstudio
 syslog-ng;cpe:/a:balabit:syslog-ng
 sysstat;cpe:/a:sysstat:sysstat
+system-config-printer;cpe:/a:redhat:system-config-printer
 systemimager;cpe:/a:dann_frazier:systemimager-server
 systemtap;cpe:/a:systemtap:systemtap
 t-prot;cpe:/a:jochen_striepe:t-prot
@@ -1255,11 +1336,14 @@ tcl8.4;cpe:/a:tcl_tk:tcl_tk
 tcpdump;cpe:/a:tcpdump:tcpdump
 tcpick;cpe:/a:francesco_stablum:tcpick
 tcpreen;cpe:/a:tcpreen:tcpreen
+tcptrack;cpe:/a:rhythm:tcptrack
 tdiary;cpe:/a:tdiary:tdiary
 teamspeak-client;cpe:/a:teamspeak:teamspeak
 teamspeak-server;cpe:/a:teamspeak:teamspeak
 teg;cpe:/a:teg:tenes_empanadas_graciela
+telepathy-gabble;cpe:/a:freedesktop:telepathy_gabble
 tetex-bin;cpe:/a:tetex:tetex
+tex-common;cpe:/a:debian:tex-common
 texinfo;cpe:/a:gnu:texinfo
 texlive-bin;cpe:/a:tug:tex_live
 texmacs;cpe:/a:texmacs:texmacs
@@ -1277,6 +1361,7 @@ tikiwiki;cpe:/a:tikiwiki:tikiwiki_cms_groupware
 tin;cpe:/a:tin:tin
 tintin++;cpe:/a:tintin:tintin%2B%2B
 tinymux;cpe:/a:tinymux:tinymux
+tinyproxy;cpe:/a:banu:tinyproxy
 tk8.3;cpe:/a:tcl_tk:tcl_tk
 tk8.4;cpe:/a:tcl_tk:tcl_tk
 tk8.5;cpe:/a:tcl_tk:tcl_tk
@@ -1284,6 +1369,7 @@ tkdiff;cpe:/a:tkdiff:tkdiff
 tkman;cpe:/a:tkman:tkman
 tkusr;cpe:/a:ldrolez:tkusr
 tmsnc;cpe:/a:tmsnc:tmsnc
+tmux;cpe:/a:nicholas_marriott:tmux
 tn5250;cpe:/a:mochasoft:tn5250
 tnftp;cpe:/a:luke_mewburn:tnftp
 tomboy;cpe:/a:gnome:tomboy
@@ -1291,6 +1377,7 @@ tomcat4;cpe:/a:apache:tomcat
 tomcat5.5;cpe:/a:apache:tomcat
 tomcat5;cpe:/a:apache:tomcat
 tomcat6;cpe:/a:apache:tomcat
+tomcat7;cpe:/a:apache:tomcat
 toolchain-source;cpe:/a:debian:toolchain-source
 tor;cpe:/a:tor:tor
 torcs;cpe:/a:bernhard_wymann:torcs
@@ -1300,11 +1387,14 @@ torrentflux;cpe:/a:torrentflux:torrentflux
 tqsllib;cpe:/a:arrl:tqsllib
 trac-git;cpe:/a:nanosleep:trac-git
 trac;cpe:/a:edgewall:trac
+trafficserver;cpe:/a:apache:traffic_server
 tramp;cpe:/a:gnu:tramp
 transmission;cpe:/a:transmissionbt:transmission
+tremulous;cpe:/a:tremulous:tremulous
 trickle;cpe:/a:monkey:trickle
 tripwire;cpe:/a:tripwire:tripwire
 trr19;cpe:/a:yamamoto_hirotaka:trr19
+tsclient;cpe:/a:erick_woods:terminal_server_client
 tss;cpe:/a:debian:tss
 tunapie;cpe:/a:james_stone:tunapie
 turba2;cpe:/a:debian:turba
@@ -1353,8 +1443,11 @@ viewglob;cpe:/a:viewglob:viewglob
 viewvc;cpe:/a:viewvc:viewvc
 vim;cpe:/a:vim:vim
 vinagre;cpe:/a:gnome:vinagre
+vino;cpe:/a:david_king:vino
 vips;cpe:/a:vips:vips
+virtualbox-guest-additions;cpe:/a:oracle:vm_virtualbox
 virtualbox-ose;cpe:/a:sun:virtualbox
+virtualbox;cpe:/a:oracle:vm_virtualbox
 vlc;cpe:/a:videolan:vlc_media_player
 vnc4;cpe:/a:realvnc:realvnc
 vobcopy;cpe:/a:vobcopy:vobcopy
@@ -1380,6 +1473,7 @@ wesnoth;cpe:/a:wesnoth:wesnoth
 wget;cpe:/a:gnu:wget
 whitedune;cpe:/a:white_dune:white_dune
 wicd;cpe:/a:wicd:wicd
+widelands;cpe:/a:widelands:widelands
 wims;cpe:/a:georges_khaznadar:wims
 wine;cpe:/a:wine:wine
 wireshark;cpe:/a:wireshark:wireshark
@@ -1425,6 +1519,7 @@ xloadimage;cpe:/a:xloadimage:xloadimage
 xmail;cpe:/a:davide_libenzi:xmail
 xmame;cpe:/a:xmame:xmame
 xmcd;cpe:/a:ti_kan:xmcd
+xmlsec1;cpe:/a:aleksey:xml_security_library
 xmlstarlet;cpe:/a:xmlstarlet:command_line_xml_toolkit
 xmltooling;cpe:/a:internet2:xmltooling
 xmms;cpe:/a:x_multimedia_system:x_multimedia_system
@@ -1475,6 +1570,7 @@ zope-zms;cpe:/a:zms_publishing:zms
 zope-zwiki;cpe:/a:zwiki:zwiki
 zope2.10;cpe:/a:zope:zope
 zope2.11;cpe:/a:zope:zope
+zope2.12;cpe:/a:zope:zope
 zope2.7;cpe:/a:zope:zope
 zope2.8;cpe:/a:zope:zope
 zope2.9;cpe:/a:zope:zope
@@ -1483,9 +1579,3 @@ zoph;cpe:/a:zoph:zoph
 zsh;cpe:/a:zsh:zsh
 zvbi;cpe:/a:zapping:zapping_vbi_library
 zziplib;cpe:/a:zziplib:zziplib
-
-gitolite;cpe:/a:sitaram_chamarty:gitolite
-commons-daemon;cpe:/a:apache:apache_commons_daemon
-libav;cpe:/a:libav:libav
-virtualbox;cpe:/a:oracle:vm_virtualbox
-virtualbox-guest-additions;cpe:/a:oracle:vm_virtualbox