More CPE mappings.

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

1 files changed, 95 insertions, 1 deletions

diff --git a/data/CPE/list b/data/CPE/list
index e128daf2af..63c54410e6 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -636,6 +636,7 @@ iceape;cpe:/a:mozilla:seamonkey
 icecast-server;cpe:/a:icecast:icecast
 icecast2;cpe:/a:icecast:icecast
 icedove;cpe:/a:mozilla:thunderbird
+icedtea-web;cpe:/a:redhat:icedtea-web
 iceweasel;cpe:/a:mozilla:firefox
 icinga;cpe:/a:icinga:icinga
 icu;cpe:/a:icu_project:international_components_for_unicode
@@ -677,6 +678,7 @@ ircd-ratbox;cpe:/a:ircd-ratbox:ircd-ratbox
 irm;cpe:/a:stackworks_enterprises:information_resource_manager
 ironic-inspector;cpe:/a:openstack:ironic_inspector
 irrlicht;cpe:/a:irrlicht:irrlicht
+irssi-text;cpe:/a:irssi:irssi
 irssi;cpe:/a:irssi:irssi
 isc-dhcp;cpe:/a:isc:dhcp
 isc-kea;cpe:/a:isc:kea
@@ -699,25 +701,32 @@ 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
+jinja2;cpe:/a:pocoo:jinja2
 jitterbug;cpe:/a:samba:jitterbug
 joomla;cpe:/a:joomla:joomla%21
 jq;cpe:/a:jq_project:jq
 jquery-jplayer;cpe:/a:happyworm:jplayer
 jquery;cpe:/a:jquery:jquery
+jqueryui;cpe:/a:jquery:jquery_ui
 jruby;cpe:/a:jruby:jruby
 jsboard;cpe:/a:jsboard:jsboard
+json-c;cpe:/a:json-c_project:json-c
 jspwiki;cpe:/a:jspwiki:jspwiki
 junkbuster;cpe:/a:junkbuster:internet_junkbuster
+kadu;cpe:/a:kadu:kadu
 kaffeine;cpe:/a:kaffeine:kaffeine_player
 kallithea;cpe:/a:kallithea:kallithea
 kamailio;cpe:/a:kamailio:kamailio
 karchive;cpe:/a:kde:karchives
 kaya;cpe:/a:kayalang:kaya
+kde-runtime;cpe:/a:kde:kde-runtime
 kde-workspace;cpe:/a:kde:kde-workspace
 kde4libs;cpe:/o:kde:kdelibs
 kdebase;cpe:/o:kde:kde
 kdegraphics;cpe:/a:kde:kdegraphics
 kdelibs;cpe:/o:kde:kdelibs
+kdepim;cpe:/a:kde:kde_pim
+kdirstat;cpe:/a:kdirstat_project:kdirstat
 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
@@ -775,6 +784,7 @@ latex2rtf;cpe:/a:latex2rtf:latex2rtf
 lazarus;cpe:/a:lazarus:lazarus
 lbreakout2;cpe:/a:lgames:lbreakout2
 lcdproc;cpe:/a:lcdproc:lcdproc
+lcms2;cpe:/a:littlecms:little_cms_color_engine
 lcms;cpe:/a:littlecms:lcms
 ldap-account-manager;cpe:/a:ldap_account_manager:ldap_account_manager
 ldapdiff;cpe:/a:ldapdiff:ldapdiff
@@ -792,6 +802,7 @@ libapache-auth-ldap;cpe:/a:dave_carrigan:auth_ldap
 libapache-mod-auth-kerb;cpe:/a:mod_auth_kerb:mod_auth_kerb
 libapache-mod-auth-pgsql;cpe:/a:guiseppe_tanzilli_and_matthias_eckermann:mod_auth_pgsql
 libapache-mod-auth-radius;cpe:/a:apache:mod_auth_radius
+libapache-mod-gzip;cpe:/a:dag_apt_repository:mod_gzip
 libapache-mod-jk;cpe:/a:apache:mod_jk
 libapache-mod-python;cpe:/a:apache:mod_python
 libapache-mod-security;cpe:/a:modsecurity:modsecurity
@@ -800,6 +811,7 @@ libapache-poi-java;cpe:/a:apache:poi
 libapache2-mod-auth-mellon;cpe:/a:uninett:mod_auth_mellon
 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-cluster;cpe:/a:redhat:mod_cluster
 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
@@ -810,11 +822,13 @@ libarchive;cpe:/a:freebsd:libarchive
 libast;cpe:/a:libast:libast
 libav;cpe:/a:libav:libav
 libcairo;cpe:/a:redhat:cairo
+libcdaudio;cpe:/a:libcaudio:libcaudio
 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
+libcloud;cpe:/a:apache:libcloud
 libcommons-fileupload-java;cpe:/a:apache:commons_fileupload
 libcompface;cpe:/a:james_ashton:compface
 libcompress-raw-bzip2-perl;cpe:/a:bzip:compress-raw-bzip2
@@ -862,9 +876,11 @@ libimobiledevice;cpe:/a:libimobiledevice:libimobiledevice
 libio-socket-ssl-perl;cpe:/a:io-socket-ssl:io-socket-ssl
 libjbcrypt-java;cpe:/a:mindrot:jbcrypt
 libjfreechart-java;cpe:/o:jfree:jfreechart
+libjpeg-turbo;cpe:/a:d.r.commander:libjpeg-turbo
 libksba;cpe:/a:libksba_library:libksba_library
 libmatroska;cpe:/a:matroska:libmatroska
 libmcrypt;cpe:/a:mcrypt:libmcrypt
+libmicrohttpd;cpe:/a:gnu:libmicrohttpd
 libmikmod;cpe:/a:raphael_assenat:libmikmod
 libmodplug;cpe:/a:konstanty_bialkowski:libmodplug
 libmodule-signature-perl;cpe:/a:module-signature_project:module-signature
@@ -884,6 +900,7 @@ libotr;cpe:/a:cypherpunks:libotr
 libpam-krb5;cpe:/a:eyrie:pam-krb5
 libpam-ldap;cpe:/a:padl_software:pam_ldap
 libpam-mount;cpe:/a:pam_mount:pam_mount
+libpam-opie;cpe:/a:nrl:opie
 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
@@ -920,6 +937,7 @@ libspring-java;cpe:/a:pivotal_software:spring_framework
 libssh2;cpe:/a:libssh2:libssh2
 libssh;cpe:/a:libssh:libssh
 libstruts1.2-java;cpe:/a:apache:struts
+libtar;cpe:/a:feep:libtar
 libtasn1-2;cpe:/a:free_software_foundation_inc.:libtasn1
 libtasn1-3;cpe:/a:free_software_foundation_inc.:libtasn1
 libtasn1-6;cpe:/a:free_software_foundation_inc.:libtasn1
@@ -950,15 +968,19 @@ libxcrypt;cpe:/a:opensuse:libxcrypt
 libxfixes;cpe:/a:x.org:libxfixes
 libxfont;cpe:/a:x.org:libxfont
 libxi;cpe:/a:x.org:libxi
+libxml-security-java;cpe:/a:apache:xml_security_for_java
 libxml2;cpe:/a:xmlsoft:libxml2
 libxml;cpe:/a:xmlsoft:libxml
 libxrandr;cpe:/a:x.org:libxrandr
 libxrender;cpe:/a:x.org:libxrender
 libxslt;cpe:/a:xmlsoft:libxslt
 libxstream-java;cpe:/a:x-stream:xstream
+libxt;cpe:/a:x:libxt
 libxtst;cpe:/a:x.org:libxtst
 libxv;cpe:/a:x.org:libxv
 libxvmc;cpe:/a:x.org:libxvmc
+libxxf86dga;cpe:/a:x:libxxf86dga
+libyaml-libyaml-perl;cpe:/a:pyyaml:libyaml
 libyaml;cpe:/a:pyyaml:libyaml
 libzip;cpe:/a:nih:libzip
 libzrtpcpp;cpe:/a:wernerd:zrtpcpp
@@ -990,12 +1012,14 @@ lmbench;cpe:/a:bitmover:lmbench
 log2mail;cpe:/a:log2mail:log2mail
 logcheck;cpe:/a:psionic:logcheck
 loggerhead;cpe:/a:michael_hudson-doyle:loggerhead
+logilab-common;cpe:/a:logilab:logilab-common
 logrotate;cpe:/a:gentoo:logrotate
 logstash;cpe:/a:elasticsearch:logstash
 logwatch;cpe:/a:logwatch:logwatch
 lookup-el;cpe:/a:lookup:lookup
 loop-aes-utils;cpe:/a:debian_loop-aes_team:loop-aes-utils
 lpr;cpe:/o:bsd:lpr
+lprng;cpe:/o:astart_technologies:lprng
 lsh-utils;cpe:/a:gnu:lsh
 ltp;cpe:/a:alastair_mckinstry:ltp-network-test
 ltrace;cpe:/a:juan_cespedes:ltrace
@@ -1003,14 +1027,18 @@ ltris;cpe:/a:lgames:ltris
 ltsp;cpe:/a:ltsp:linux_terminal_server_project
 lua-expat;cpe:/a:matthewwild:luaexpat
 lucene-solr;cpe:/a:apache:solr
+lukemftpd;cpe:/a:luke_mewburn:tnftpd
 lurker;cpe:/a:lurker:lurker
 lustre;cpe:/a:lustre:lustre-tests
+luxman;cpe:/a:frank_mcingvale:luxman
 lvm10;cpe:/a:lvm:logical_volume_management_utilities
 lvm2;cpe:/a:heinz_mauelshagen:lvm2
 lxc;cpe:/a:linuxcontainers:lxc
+lxcfs;cpe:/a:canonical:lxcfs
 lxd;cpe:/a:canonical:lxd
 lxr-cvs;cpe:/a:malcom_box:lxr_cross_referencer
 lxr;cpe:/a:malcom_box:lxr_cross_referencer
+lynis;cpe:/a:cisofy:lynis
 lynx-cur;cpe:/a:lynx:lynx
 lynx-ssl;cpe:/a:university_of_kansas:lynx
 lynx;cpe:/a:lynx:lynx
@@ -1019,6 +1047,7 @@ m2crypto;cpe:/a:heikkitoivonen:m2crypto
 m4;cpe:/a:gnu:m4
 mactelnet;cpe:/a:mac-telnet_project:mac-telnet
 madwifi;cpe:/a:madwifi:madwifi
+maelstrom;cpe:/a:ambrosia_software:maelstrom
 mafft;cpe:/a:align.bmr.kyushu-u.ac:mafft
 magics++;cpe:/a:ecmwf:magics%2B%2B
 magpierss;cpe:/a:kellan_elliott-mccrea:magpierss
@@ -1028,6 +1057,7 @@ mail-notification;cpe:/a:nongnu:mail_notification
 maildirsync;cpe:/a:jose_carlos_medeiros:maildirsync
 maildrop;cpe:/a:maildrop:maildrop
 mailman;cpe:/a:gnu:mailman
+mailreader;cpe:/a:mailreader.com:mailreader.com
 mailscanner;cpe:/a:mailscanner:mailscanner
 mailutils;cpe:/a:gnu:mailutils
 mako;cpe:/a:makotemplates:mako
@@ -1067,11 +1097,13 @@ mh-book;cpe:/a:peter_s_galbraith:mh-book
 mhonarc;cpe:/a:mhonarc:mhonarc
 midori;cpe:/a:christian_dywan:midori
 migrationtools;cpe:/a:padl_software:migrationtools
+mime-support;cpe:/a:debian:mime-support
 mimedefang;cpe:/a:roaring_penguin:mimedefang
 mimetex;cpe:/a:forkosh:mimetex
 mimms;cpe:/a:mimms:mimms
 mini-httpd;cpe:/a:acme:mini_httpd
 miniupnpc;cpe:/a:miniupnp_project:miniupnp
+miniupnpd;cpe:/a:miniupnp_project:miniupnpd
 miredo;cpe:/a:miredo:miredo
 mistelix;cpe:/a:mistelix:mistelix
 mldonkey;cpe:/a:mldonkey:mldonkey
@@ -1084,6 +1116,8 @@ mnogosearch;cpe:/a:mnogosearch:mnogosearch
 mod-auth-mysql;cpe:/a:joey_schulze:mod_auth_mysql
 mod-auth-shadow;cpe:/a:mod_auth_shadow:mod_auth_shadow
 mod-gnutls;cpe:/a:apache:mod-gnutls
+mod-wsgi;cpe:/a:modwsgi:mod_wsgi
+modlogan;cpe:/a:modlogan:modlogan
 modsecurity-apache;cpe:/a:modsecurity:modsecurity
 module-assistant;cpe:/a:eduard_bloch:module-assistant
 moin;cpe:/a:moinmo:moinmoin
@@ -1108,6 +1142,7 @@ mozilla-firefox;cpe:/a:mozilla:firefox
 mozilla-thunderbird;cpe:/a:mozilla:thunderbird
 mozilla;cpe:/a:mozilla:firefox
 mp3info;cpe:/a:mp3info:mp3info
+mpack;cpe:/a:john_g._myers:mpack
 mpfr;cpe:/a:mpfr:gnu_mpfr
 mpg123;cpe:/a:mpg123:mpg123
 mplayer2;cpe:/a:mplayer2:mplayer2
@@ -1163,15 +1198,18 @@ neon;cpe:/a:webdav:neon
 nessus-core;cpe:/a:nessus:nessus
 net-acct;cpe:/a:ulrich_callmeier:net-acct
 net-snmp;cpe:/a:net-snmp:net-snmp
+net6;cpe:/a:armin_burgmeier:net6
 netatalk;cpe:/a:netatalk:netatalk
 netdisco-mibs-installer;cpe:/a:oliver_gorwits:netdisco_mibs_installer
 netkit-ftp;cpe:/a:netkit-ftp:netkit_ftp
 netkit-telnet-ssl;cpe:/a:telnetd:telnetd-ssl
+netkit-telnet;cpe:/a:ncsa:telnet
 netmrg;cpe:/a:netmrg:netmrg
 netpanzer;cpe:/a:pyrosoft_inc:netpanzer
 netpbm-free;cpe:/a:netpbm:netpbm
 netperf;cpe:/a:netperf:netperf
 netrik;cpe:/a:netrik:netrik
+netris;cpe:/a:netris:netris
 nettle;cpe:/a:nettle_project:nettle
 netty;cpe:/a:netty_project:netty
 network-manager-applet;cpe:/a:gnome:networkmanager
@@ -1192,14 +1230,17 @@ ngircd;cpe:/a:ngircd:ngircd
 nikto;cpe:/a:nikto:nikto
 nilfs2-tools;cpe:/a:nilf:nilfs
 no-ip;cpe:/a:no-ip:no-ip2
+node-marked;cpe:/a:marked_project:marked
 nodejs;cpe:/a:nodejs:node.js
 nordugrid-arc-nox;cpe:/a:nordugrid:nordugrid-arc
 nova;cpe:/a:openstack:nova
 noweb;cpe:/a:norman_ramsey:noweb
 npm;cpe:/a:npm:npm
+nrpe;cpe:/a:nagios:remote_plugin_executor
 nsd3;cpe:/a:nlnetlabs:nsd
 nsd;cpe:/a:nlnetlabs:nsd
 nspr;cpe:/a:mozilla:netscape_portable_runtime
+nss-pam-ldapd;cpe:/a:arthurdejong:nss-pam-ldapd
 nss;cpe:/a:mozilla:nss
 nstx;cpe:/a:nstx:ip_over_dns_utility
 ntfs-3g;cpe:/a:ntfs-3g:ntfs-3g
@@ -1208,9 +1249,12 @@ ntop;cpe:/a:ntop:ntop
 ntopng;cpe:/a:ntop:ntopng
 ntp;cpe:/a:ntp:ntp
 nufw;cpe:/a:nufw:nufw
+nullmailer;cpe:/a:nullmailer:nullmailer
 nusoap;cpe:/a:dietrich_ayala:nusoap
 nvclock;cpe:/a:gentoo:nvclock
+nvi;cpe:/o:bsd:nvi
 nvidia-cg-toolkit;cpe:/a:federico_di_gregorio:nvidia-cg-toolkit
+nvidia-graphics-drivers-legacy-173xx;cpe:/a:nvidia:gpu_driver
 nvidia-graphics-drivers-legacy-304xx;cpe:/a:nvidia:gpu_driver
 nvidia-graphics-drivers-legacy-340xx;cpe:/a:nvidia:gpu_driver
 nvidia-graphics-drivers;cpe:/a:nvidia:binary_graphics_driver
@@ -1226,6 +1270,7 @@ 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
+ojs;cpe:/a:pkp:open_journal_systems
 oops;cpe:/a:igor_khasilev:oops_proxy_server
 op;cpe:/a:swapoff:op
 open-iscsi;cpe:/a:redhat:open_iscsi
@@ -1234,6 +1279,7 @@ open-xchange;cpe:/a:open-xchange:open-xchange_appsuite
 openafs;cpe:/a:openafs:openafs
 openarena;cpe:/a:openarena:openarena
 openconnect;cpe:/a:infradead:openconnect
+opencryptoki;cpe:/a:opencryptoki_project:opencryptoki
 opendchub;cpe:/a:roshan_singh:open_direct_connect_hub
 openexr;cpe:/a:openexr:openexr
 openjdk-6;cpe:/a:sun:openjdk
@@ -1273,6 +1319,7 @@ oprofile;cpe:/a:oprofile:oprofile
 optipng;cpe:/a:cosmin_truta:optipng
 opus-tools;cpe:/a:xiph:vorbis-tools
 os-prober;cpe:/a:debian:os-prober
+oscommerce;cpe:/a:oscommerce:oscommerce
 osh;cpe:/a:osh:osh
 osiris;cpe:/a:brian_wotring:osiris
 otrs2;cpe:/a:otrs:otrs
@@ -1290,6 +1337,7 @@ 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
+parallel;cpe:/a:gnu:parallel
 paramiko;cpe:/a:python_software_foundation:paramiko
 passenger;cpe:/a:phusionpassenger:phusion_passenger
 paste;cpe:/a:pythonpaste:paste
@@ -1318,10 +1366,13 @@ php-apc;cpe:/a:pecl-php:alternative_php_cache
 php-doctrine-bundle;cpe:/a:doctrine-project:doctrinemongodbbundle
 php-doctrine-cache;cpe:/a:doctrine-project:cache
 php-doctrine-common;cpe:/a:doctrine-project:common
+php-dompdf;cpe:/a:dompdf:dompdf
+php-horde-imp;cpe:/a:horde:imp
 php-horde;cpe:/a:horde:horde_groupware
 php-htmlpurifier;cpe:/a:htmlpurifier:htmlpurifier
 php-ids;cpe:/a:phpids:phpids
 php-openid;cpe:/a:janrain:php-openid
+php-sabredav;cpe:/a:fruux:sabredav
 php-suhosin;cpe:/a:hardened-php:suhosin
 php-xajax;cpe:/a:xajax:xajax
 php3;cpe:/a:php:php
@@ -1361,6 +1412,7 @@ pivot;cpe:/a:pivot:pivot
 piwigo;cpe:/a:piwigo:piwigo
 piwik;cpe:/a:piwik:piwik
 pixelpost;cpe:/a:pixelpost:pixelpost
+pixman;cpe:/a:pixman:pixman
 plait;cpe:/a:stephenjungels:plait
 planet-venus;cpe:/a:intertwingly:planet_venus
 planet;cpe:/a:intertwingly:planet
@@ -1370,6 +1422,7 @@ plone3;cpe:/a:plone:plone
 pmake;cpe:/a:ihji:pmake
 pmount;cpe:/a:vincent_fourmond:pmount
 pmwiki;cpe:/a:pmwiki:pmwiki
+pnp4nagios;cpe:/a:pnp4nagios:pnp4nagios
 po4a;cpe:/a:po4a:po4a
 poco;cpe:/a:pocoproject:poco_c%2b%2b_libraries
 polarssl;cpe:/a:polarssl:polarssl
@@ -1383,6 +1436,7 @@ poppler;cpe:/a:poppler:poppler
 postfix-gld;cpe:/a:salim_gasmi:gld
 postfix-policyd;cpe:/a:policyd:policyd
 postfix;cpe:/a:postfix:postfix
+postfixadmin;cpe:/a:postfix_admin_project:postfix_admin
 postgresql-7.4;cpe:/a:postgresql:postgresql
 postgresql-8.0;cpe:/a:postgresql:postgresql
 postgresql-8.1;cpe:/a:postgresql:postgresql
@@ -1422,14 +1476,17 @@ puppet;cpe:/a:puppet:puppet
 pure-ftpd;cpe:/a:pureftpd:pureftpd
 putty;cpe:/a:putty:putty
 pvpgn;cpe:/a:pvpgn:pvpgn
+pwgen;cpe:/a:pwgen_project:pwgen
 pwlib;cpe:/a:openh323_project:pwlib
 py2play;cpe:/a:py2play:py2play
 pyfribidi;cpe:/a:kobi_zamir:pyfribidi
 pyftpd;cpe:/a:radovan_garabik:pyftpd
 pygments;cpe:/a:pygments:pygments
 pygresql;cpe:/a:pygresql:pygresql
+python-bottle;cpe:/a:bottlepy:bottle
 python-cherrypy;cpe:/a:cherrypy:cherrypy
 python-cjson;cpe:/a:dan_pascu:python-cjson
+python-crypto;cpe:/a:dlitz:pycrypto
 python-django;cpe:/a:djangoproject:django
 python-dns;cpe:/a:debian:python-dns
 python-formencode;cpe:/a:formencode:formencode
@@ -1439,7 +1496,11 @@ python-jwcrypto;cpe:/a:jwcrypto_project:jwcrypto
 python-keystoneclient;cpe:/a:openstack:python-keystoneclient
 python-keystonemiddleware;cpe:/a:openstack:python-keystoneclient
 python-muranoclient;cpe:/a:openstack:python-muranoclient
+python-oauth2;cpe:/a:urbanairship:python-oauth2
+python-pip;cpe:/a:python:pip
 python-pyftpdlib;cpe:/a:g.rodola:pyftpdlib
+python-soappy;cpe:/a:makina-corpus:soappy
+python-tornado;cpe:/a:tornadoweb:tornado
 python-virtualenv;cpe:/a:python:virtualenv
 python2.1;cpe:/a:python:python
 python2.2;cpe:/a:python:python
@@ -1454,6 +1515,7 @@ python3.2;cpe:/a:python:python
 python3.3;cpe:/a:python:python
 python3.4;cpe:/a:python:python
 python3.5;cpe:/a:python:python
+pywbem;cpe:/a:pywbem_project:pywbem
 pywebdav;cpe:/a:simon_pamies:pywebdav
 qdbm;cpe:/a:qdbm:qdbm
 qemu-kvm;cpe:/a:kvm_qumranet:kvm
@@ -1477,6 +1539,8 @@ r-base;cpe:/a:r_foundation:r
 rabbitmq-server;cpe:/a:pivotal_software:rabbitmq
 radiance;cpe:/a:radiance:radiance
 radicale;cpe:/a:radicale:radicale
+radsecproxy;cpe:/a:uninett:radsecproxy
+radvd;cpe:/a:litech:router_advertisement_daemon
 rails-3.2;cpe:/a:rubyonrails:ruby_on_rails
 rails-4.0;cpe:/a:rubyonrails:ruby_on_rails
 rails;cpe:/a:ruby_on_rails:ruby_on_rails
@@ -1492,6 +1556,7 @@ redis;cpe:/a:pivotal_software:redis
 redmine;cpe:/a:redmine:redmine
 rekonq;cpe:/a:adjam:rekonq
 remind;cpe:/a:roaring_penguin:remind
+remstats;cpe:/a:remstats:remstats
 reportbug-ng;cpe:/a:reportbug-ng:reportbug-ng
 reportbug;cpe:/a:reportbug-ng:reportbug
 reprepro;cpe:/a:debian:reprepro
@@ -1503,6 +1568,7 @@ requests;cpe:/a:python:requests
 resmgr;cpe:/a:resmgr:resmgrd
 resteasy;cpe:/a:redhat:resteasy
 restlet;cpe:/a:restlet:restlet_framework
+revelation;cpe:/a:mikel_olasagasti:revelation
 reviewboard;cpe:/a:reviewboard:review_board
 rhapsody;cpe:/a:rhapsody_irc:rhapsody_irc
 rhythmbox;cpe:/a:gnome:rhythmbox
@@ -1522,8 +1588,10 @@ rssh;cpe:/a:rssh:rssh
 rsync;cpe:/a:rsync:rsync
 rsyslog;cpe:/a:rsyslog:rsyslog
 rt73;cpe:/h:ralinktech:rt73
+rtfm;cpe:/a:bestpractical:rtfm
 ruby-gnome2;cpe:/a:ruby_gnome2:ruby_gnome2
 ruby-jquery-rails;cpe:/a:rubyonrails:jquery-rails
+ruby-passenger;cpe:/a:phusion:passenger
 ruby-rack;cpe:/a:rubyforge:rack
 ruby-rails-html-sanitizer;cpe:/a:rubyonrails:html_sanitizer
 ruby1.6;cpe:/a:ruby-lang:ruby
@@ -1549,6 +1617,7 @@ samba4;cpe:/a:samba:samba
 samba;cpe:/a:samba:samba
 samhain;cpe:/a:samhain_labs:samhain
 samizdat;cpe:/a:nongnu:samizdat
+sane-backends;cpe:/a:sane:sane-backend
 sarg;cpe:/a:sarg:squid_analysis_report_generator
 sblim-sfcb;cpe:/a:standards_based_linux_instrumentation:sblim-sfcb
 scilab;cpe:/a:scilab:scilab
@@ -1564,7 +1633,7 @@ sdm;cpe:/a:jonas_smedegaard:sdm-terminal
 secondlife-client;cpe:/a:linden_lab:second_life
 sendmail;cpe:/a:sendmail:sendmail
 serendipity;cpe:/a:s9y:serendipity
-setiathome;cpe:/a:university_of_california:seti_at_home).
+setiathome;cpe:/a:university_of_california:seti_at_home
 sgml2x;cpe:/a:alcovebook:sgml2x
 shadow;cpe:/a:debian:shadow
 sharutils;cpe:/a:gnu:sharutils
@@ -1605,6 +1674,7 @@ smstools;cpe:/a:stefan_frings:sms_server_tools
 sng;cpe:/a:eric_raymond:sng
 snort;cpe:/a:snort:snort
 socat;cpe:/a:dest-unreach:socat
+software-properties;cpe:/a:marc_deslauriers:software-properties
 sork-accounts;cpe:/a:horde:accounts
 sork-forwards;cpe:/a:horde:forwards
 sork-passwd-h3;cpe:/a:horde:passwd
@@ -1625,8 +1695,10 @@ sql-ledger;cpe:/a:sql-ledger:sql-ledger
 sqlite3;cpe:/a:sqlite:sqlite
 squid3;cpe:/a:squid-cache:squid
 squid;cpe:/a:squid-cache:squid
+squidclamav;cpe:/a:darold:squidclamav
 squidguard;cpe:/a:squidguard:squidguard
 squirrelmail;cpe:/a:squirrelmail:squirrelmail
+ssldump;cpe:/a:rtfm:ssldump
 ssmtp;cpe:/a:ssmtp:ssmtp
 sssd;cpe:/a:fedoraproject:sssd
 star;cpe:/a:joerg_schilling:star_tape_archiver
@@ -1637,11 +1709,13 @@ storebackup;cpe:/a:storebackup:storebackup
 streamripper;cpe:/a:streamripper:streamripper
 strongswan;cpe:/a:strongswan:strongswan
 stunnel4;cpe:/a:stunnel:stunnel
+stunnel;cpe:/a:stunnel:stunnel
 subversion;cpe:/a:apache:subversion
 sudo;cpe:/a:todd_miller:sudo
 sugarcrm-ce-5.0;cpe:/a:sugarcrm:sugarcrm
 sun-java5;cpe:/a:sun:jdk
 sun-java6;cpe:/a:sun:jdk
+sup-mail;cpe:/a:supmua:sup
 sup;cpe:/a:sup:sup
 super;cpe:/a:william_deich:super
 suphp;cpe:/a:sebastian_marsching:suphp
@@ -1649,6 +1723,7 @@ suricata;cpe:/a:openinfosecfoundation:suricata
 swfdec0.5;cpe:/a:swfdec:swfdec
 swfdec0.6;cpe:/a:swfdec:swfdec
 swftools;cpe:/a:swftools:swftools
+swi-prolog;cpe:/a:swi-prolog:swi-prolog
 swift;cpe:/a:openstack:swift
 sword;cpe:/a:the_sword_project:sword
 sylpheed-claws;cpe:/a:sylpheed-claws:sylpheed-claws
@@ -1692,6 +1767,7 @@ texinfo;cpe:/a:gnu:texinfo
 texlive-bin;cpe:/a:tug:tex_live
 texmacs;cpe:/a:texmacs:texmacs
 textpattern;cpe:/a:textpattern:textpattern
+tftp-hpa;cpe:/a:h_peter_anvin:tftp-hpa
 tgt;cpe:/a:zaal:tgt
 thin;cpe:/a:macournoyer:thin
 thttpd;cpe:/a:acme:thttpd
@@ -1707,6 +1783,7 @@ tikiwiki;cpe:/a:tikiwiki:tikiwiki_cms_groupware
 tin;cpe:/a:tin:tin
 tinc;cpe:/a:tinc:tinc
 tintin++;cpe:/a:tintin:tintin%2B%2B
+tinymce;cpe:/a:tinymce:tinymce
 tinymux;cpe:/a:tinymux:tinymux
 tinyproxy;cpe:/a:banu:tinyproxy
 tk8.3;cpe:/a:tcl_tk:tcl_tk
@@ -1727,6 +1804,7 @@ tomcat6;cpe:/a:apache:tomcat
 tomcat7;cpe:/a:apache:tomcat
 tomcat8;cpe:/a:apache:tomcat
 tomcat9;cpe:/a:apache:tomcat
+tomcat;cpe:/a:apache:tomcat
 toolchain-source;cpe:/a:debian:toolchain-source
 tor;cpe:/a:tor:tor
 torcs;cpe:/a:bernhard_wymann:torcs
@@ -1774,12 +1852,16 @@ unadf;cpe:/a:unadf_project:unadf
 unalz;cpe:/a:unalz:unalz
 unattended-upgrades;cpe:/a:debian:unattended-upgrades
 unbound;cpe:/a:nlnet_labs:unbound
+undertow;cpe:/a:redhat:undertow
+unity;cpe:/a:ayatana_project:unity
+unixodbc;cpe:/a:unixodbc:unixodbc
 unp;cpe:/a:debian:unp
 unrar-nonfree;cpe:/a:rarlab:unrar
 unrealircd;cpe:/a:unrealircd:unrealircd
 unrtf;cpe:/a:zack_smith:unrtf
 unzip;cpe:/a:info-zip:unzip
 unzoo;cpe:/a:unzoo:unzoo
+up-imapproxy;cpe:/a:up-imapproxy:up-imapproxy
 update-manager;cpe:/a:canonical:update-manager
 upstart;cpe:/a:ubuntu:upstart
 usermin;cpe:/a:usermin:usermin
@@ -1818,11 +1900,13 @@ vobcopy;cpe:/a:vobcopy:vobcopy
 vorbis-tools;cpe:/a:xiph:vorbis-tools
 vsftpd;cpe:/a:redhat:vsftpd
 vte;cpe:/a:nalin_dahyabhai:vte
+vtun;cpe:/a:vtun:vtun
 vzctl;cpe:/a:openvz:vzctl
 w3c-libwww;cpe:/a:w3c:libwww
 w3m;cpe:/a:w3m:w3m
 wafp;cpe:/a:mytty:webapplication_finger_printer
 watchdog;cpe:/a:das_watchdog_project:das_watchdog
+web2py;cpe:/a:web2py:web2py
 webauth;cpe:/a:stanford:webauth
 webcalendar;cpe:/a:k5n:webcalendar
 webcheck;cpe:/a:webcheck:webcheck
@@ -1849,6 +1933,7 @@ widelands;cpe:/a:widelands:widelands
 wimax-tools;cpe:/a:intel:wimax_network_service
 wims;cpe:/a:georges_khaznadar:wims
 wine;cpe:/a:wine:wine
+wireless-tools;cpe:/a:wireless_tools:wireless_tools
 wireshark;cpe:/a:wireshark:wireshark
 wmaker;cpe:/a:windowmaker:windowmaker
 wml;cpe:/a:website_meta_language:website_meta_language
@@ -1867,8 +1952,10 @@ wxwidgets2.8;cpe:/a:wxwidgets:wxwidgets
 wxwindows2.4;cpe:/a:wxwidgets:wxwidgets
 wyrd;cpe:/a:paul_pelzl:wyrd
 wzdftpd;cpe:/a:wzdftpd:wzdftpd
+x2goserver;cpe:/a:x2go:x2go_server
 xapian-omega;cpe:/a:xapian:omega
 xastir;cpe:/a:xastir:xastir
+xbl;cpe:/a:xblockout:xbl
 xbmc;cpe:/a:xbmc:xbmc
 xboard;cpe:/a:tim_mann:xboard
 xboing;cpe:/a:xboing:xboing
@@ -1882,6 +1969,7 @@ xemacs21-packages;cpe:/a:gnu:xemacs
 xemacs21;cpe:/a:gnu:xemacs
 xen-3.0;cpe:/a:xensource:xen
 xen-3;cpe:/a:xensource:xen
+xen-qemu-dm-4.0;cpe:/o:xen:xen
 xen-unstable;cpe:/a:xensource:xen
 xen;cpe:/a:xensource:xen
 xerces-c;cpe:/a:apache:xerces-c
@@ -1890,6 +1978,7 @@ xfig;cpe:/a:xfig:xfig
 xfree86;cpe:/a:x:x11
 xfs;cpe:/a:x.org:x_font_server
 xfsdump;cpe:/a:xfsdump:xfsdump
+xfstt;cpe:/a:xfstt:xfstt
 xine-lib;cpe:/a:xine:xine-lib
 xine-ui;cpe:/a:xine:xine-ui
 xinetd;cpe:/a:xinetd:xinetd
@@ -1900,6 +1989,7 @@ xmail;cpe:/a:davide_libenzi:xmail
 xmame;cpe:/a:xmame:xmame
 xmcd;cpe:/a:ti_kan:xmcd
 xml-light;cpe:/a:nicolas_cannasse:ocaml_xml-light_library
+xml-security-c;cpe:/a:apache:xml_security_for_c%2b%2b
 xmlsec1;cpe:/a:aleksey:xml_security_library
 xmlstarlet;cpe:/a:xmlstarlet:command_line_xml_toolkit
 xmltooling;cpe:/a:internet2:xmltooling
@@ -1919,6 +2009,7 @@ xsok;cpe:/a:michael_bischoff:xsok
 xsp;cpe:/a:mono:xsp
 xsupplicant;cpe:/a:xsupplicant:xsupplicant
 xterm;cpe:/a:invisible-island:xterm
+xtokkaetama;cpe:/a:xtokkaetama:xtokkaetama
 xulrunner;cpe:/a:mozilla:libxul
 xvidcore;cpe:/a:xvid:xvid
 xwine;cpe:/a:xwine:xwine
@@ -1932,6 +2023,7 @@ yate;cpe:/a:yet_another_telephony_engine:yet_another_telephony_engine
 yaws;cpe:/a:yaws:yaws
 yelp;cpe:/a:gnome:yelp
 yiff;cpe:/a:raphael_bossek:yiff_server
+yui3;cpe:/a:yahoo:yui
 yui;cpe:/a:yahoo:yui
 zabbix;cpe:/a:zabbix:zabbix
 zaptel;cpe:/a:asterisk:zaptel
@@ -1958,10 +2050,12 @@ 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.13;cpe:/a:zope:zope
 zope2.7;cpe:/a:zope:zope
 zope2.8;cpe:/a:zope:zope
 zope2.9;cpe:/a:zope:zope
 zope3;cpe:/a:zope:zope
+zope;cpe:/a:zope:zope
 zoph;cpe:/a:zoph:zoph
 zsh;cpe:/a:zsh:zsh
 zvbi;cpe:/a:zapping:zapping_vbi_library