More aliases andCPE mappings.

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

2 files changed, 29 insertions, 0 deletions

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 9c2dd3f87c..32eb98df2b 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -1074,6 +1074,9 @@ cpe:/a:freedesktop:spice-gtk
 cpe:/a:vmware:vmware_player
 cpe:/a:vmware:vmware_player_2
 
+cpe:/a:tinc:tinc
+cpe:/a:tinc-vpn:tinc
+
 # Dummy entries to hide noise
 #cpe:/a:webkit:webkit
 #cpe:/a:google:chrome
diff --git a/data/CPE/list b/data/CPE/list
index 1bff9a191e..e6ca426957 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -8,6 +8,7 @@ abuse;cpe:/a:abuse:abuse-sdl
 accountsservice;cpe:/a:ray_stode:accountsservice
 acidbase;cpe:/a:base:basic_analysis_and_security_engine
 acidlab;cpe:/a:acid:analysis_console_for_intrusion_databases
+ack-grep;cpe:/a:beyondgrep:ack
 acl;cpe:/a:xfs:acl
 acon;cpe:/a:ahmed_abdel-hamid_mohamed:acon
 acpid;cpe:/a:tim_hockin:acpid
@@ -20,6 +21,7 @@ affix-kernel;cpe:/a:nokia:affix
 affix;cpe:/a:nokia:affix
 afuse;cpe:/a:afuse:afuse
 aircrack-ng;cpe:/a:aircrack-ng:airodump-ng
+ajaxplorer;cpe:/a:ajaxplorer:ajaxplorer
 ajaxterm;cpe:/a:antony_lesuisse:ajaxterm
 albatross;cpe:/a:albatross:albatross
 alien-arena;cpe:/a:icculus:alien_arena
@@ -58,6 +60,7 @@ ardour;cpe:/a:ardour:ardour
 argyll;cpe:/a:argyllcms:argyllcms
 aria2;cpe:/a:tatsuhiro_tsujikawa:aria2
 arj;cpe:/a:arj_software:arj_archiver
+armagetron;cpe:/a:armagetron:armagetron
 arora;cpe:/a:arora-browser:arora
 arts;cpe:/a:kde:arts
 as31;cpe:/a:bdale_garbee:as31
@@ -73,6 +76,7 @@ audacity;cpe:/a:audacity:audacity
 audiofile;cpe:/a:68k:audiofile
 audiolink;cpe:/a:audiolink:audiolink
 audit;cpe:/a:linux:audit
+augeas;cpe:/a:augeas:augeas
 auth2db;cpe:/a:auth2db:auth2db
 autofs5;cpe:/a:automount_project:automount
 autofs;cpe:/a:automount_project:automount
@@ -190,6 +194,7 @@ checkinstall;cpe:/a:checkinstall:checkinstall
 checkpw;cpe:/a:checkpw_project:checkpw
 cheesetracker;cpe:/a:cheese_tracker:cheese_tracker
 cheetah;cpe:/a:tavis_rudd:cheetah
+chef;cpe:/a:opscode:chef
 cherokee;cpe:/a:cherokee-project:cherokee
 cherrypy2.1;cpe:/a:cherrypy:cherrypy
 cherrypy3;cpe:/a:cherrypy:cherrypy
@@ -212,6 +217,7 @@ cmsms;cpe:/a:cmsmadesimple:cms_made_simple
 cmus;cpe:/a:cmus:cmus
 cobbler;cpe:/a:michael_dehaan:cobbler
 coccinelle;cpe:/a:emn:coccinelle
+collabtive;cpe:/a:o-dyn:collabtive
 collectd;cpe:/a:collectd:collectd
 colloquy;cpe:/a:colloquy:colloquy
 colord;cpe:/a:freedesktop:colord
@@ -221,6 +227,7 @@ commons-daemon;cpe:/a:apache:apache_commons_daemon
 commons-httpclient;cpe:/a:apache:httpclient
 condor;cpe:/a:condor_project:condor
 conky;cpe:/a:conky:conky
+connman;cpe:/a:connman:connman
 conntrack;cpe:/a:conntrack-tools_project:conntrack-tools
 conquest;cpe:/a:radscan:conquest
 convirt;cpe:/a:convirture:convirt
@@ -379,6 +386,7 @@ evince;cpe:/a:redhat:evince
 evolution-data-server;cpe:/a:gnome:evolution-data-server
 evolution;cpe:/a:gnome:evolution
 ewiki;cpe:/a:erfurtwiki:erfurtwiki
+exactimage;cpe:/a:exactcode:exactimage
 exiftags;cpe:/a:aertherwide:exiftags
 exim-tls;cpe:/a:exim:exim
 exim4;cpe:/a:exim:exim
@@ -470,6 +478,8 @@ gallery3;cpe:/a:menalto:gallery
 gallery;cpe:/a:menalto:gallery
 ganeti;cpe:/a:roman_marxer:ganeti
 ganglia-monitor-core;cpe:/a:ganglia:ganglia
+ganglia-web;cpe:/a:ganglia:ganglia-web
+ganglia;cpe:/a:ganglia:ganglia
 gatos;cpe:/a:gatos:gatos
 gauche;cpe:/a:gauche:gauche
 gcab;cpe:/a:gnome:gcab
@@ -554,6 +564,7 @@ gpsd;cpe:/a:berlios:gps_daemon
 gpsdrive;cpe:/a:gpsdrive:gpsdrive
 grails;cpe:/a:gopivotal:grails
 graphicsmagick;cpe:/a:graphicsmagick:graphicsmagick
+graphite-web;cpe:/a:graphite_project:graphite
 graphite2;cpe:/a:sil:graphite2
 graphviz;cpe:/a:graphviz:graphviz
 grep;cpe:/a:gnu:grep
@@ -690,6 +701,7 @@ jhead;cpe:/a:sentex:jhead
 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
 jruby;cpe:/a:jruby:jruby
 jsboard;cpe:/a:jsboard:jsboard
@@ -720,6 +732,7 @@ kernel-source-2.6.8;cpe:/o:linux:kernel
 kernel-source-2.6.8;cpe:/o:linux:kernel
 kernel-source-2.6.9;cpe:/o:linux:kernel
 ketm;cpe:/a:ketm:ketm
+kexec-tools;cpe:/a:redhat:kexec-tools
 keystone;cpe:/a:openstack:keystone
 kfreebsd-10;cpe:/o:freebsd:freebsd
 kfreebsd-11;cpe:/o:freebsd:freebsd
@@ -849,6 +862,7 @@ libjbcrypt-java;cpe:/a:mindrot:jbcrypt
 libjfreechart-java;cpe:/o:jfree:jfreechart
 libksba;cpe:/a:libksba_library:libksba_library
 libmatroska;cpe:/a:matroska:libmatroska
+libmcrypt;cpe:/a:mcrypt:libmcrypt
 libmikmod;cpe:/a:raphael_assenat:libmikmod
 libmodplug;cpe:/a:konstanty_bialkowski:libmodplug
 libmodule-signature-perl;cpe:/a:module-signature_project:module-signature
@@ -883,6 +897,7 @@ libphp-snoopy;cpe:/a:andrei_zmievski:snoopy
 libpng1.6;cpe:/a:libpng:libpng
 libpng3;cpe:/a:libpng:libpng
 libpng;cpe:/a:libpng:libpng
+librack-ruby;cpe:/a:rack_project:rack
 libraw;cpe:/a:libraw:libraw
 libreoffice;cpe:/a:libreoffice:libreoffice
 libreswan;cpe:/a:libreswan:libreswan
@@ -943,6 +958,7 @@ libxv;cpe:/a:x.org:libxv
 libxvmc;cpe:/a:x.org:libxvmc
 libyaml;cpe:/a:pyyaml:libyaml
 libzip;cpe:/a:nih:libzip
+libzrtpcpp;cpe:/a:wernerd:zrtpcpp
 licq;cpe:/a:licq:licq
 liferay-portal;cpe:/a:liferay:portal
 liferea;cpe:/a:liferea:liferea
@@ -976,6 +992,7 @@ 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
 lsh-utils;cpe:/a:gnu:lsh
 ltp;cpe:/a:alastair_mckinstry:ltp-network-test
 ltrace;cpe:/a:juan_cespedes:ltrace
@@ -1028,6 +1045,7 @@ mayavi;cpe:/a:abottoms:mayavi
 mbedtls;cpe:/a:arm:mbed_tls
 mc;cpe:/a:midnight_commander:midnight_commander
 mcollective;cpe:/a:puppetlabs:marionette-collective
+mcrypt;cpe:/a:mcrypt:mcrypt
 mecab;cpe:/a:mecab:mecab
 mediaelement;cpe:/a:mediaelementjs:mediaelement.js
 mediawiki1.5;cpe:/a:mediawiki:mediawiki
@@ -1073,6 +1091,7 @@ mongodb;cpe:/a:mongodb:mongodb
 mongrel;cpe:/a:mongrel:mongrel
 monit;cpe:/a:tildeslash:monit
 moniwiki;cpe:/a:moniwiki:moniwiki
+monkey;cpe:/a:monkey-project:monkey_http_daemon
 monkeysphere;cpe:/a:monkeysphere_project:monkeysphere
 mono-debugger;cpe:/a:debian:mono-debugger
 mono;cpe:/a:mono_project:mono
@@ -1274,6 +1293,7 @@ patch;cpe:/a:gnu:patch
 pavuk;cpe:/a:pavuk:pavuk
 pax;cpe:/a:pax_project:pax
 pcal;cpe:/a:pcal:pcal
+pcp;cpe:/a:sgi:performance_co-pilot
 pcre2;cpe:/a:pcre:pcre
 pcre3;cpe:/a:pcre:pcre
 pcs;cpe:/a:pacemaker%2fcorosync_configuration_system_project:pacemaker%2fcorosync_configuration_system
@@ -1539,6 +1559,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).
 sgml2x;cpe:/a:alcovebook:sgml2x
 shadow;cpe:/a:debian:shadow
 sharutils;cpe:/a:gnu:sharutils
@@ -1641,6 +1662,7 @@ systemtap;cpe:/a:systemtap:systemtap
 t-prot;cpe:/a:jochen_striepe:t-prot
 t1lib;cpe:/a:t1lib:t1lib
 t1utils;cpe:/a:t1utils_project:t1utils
+taglib;cpe:/a:scott_wheeler:taglib
 tangerine;cpe:/a:alex_launi:tangerine
 tar;cpe:/a:gnu:tar
 tardiff;cpe:/a:tardiff_project:tardiff
@@ -1678,6 +1700,7 @@ tigervnc;cpe:/a:tigervnc:tigervnc
 tightvnc;cpe:/a:tightvnc:tightvnc
 tikiwiki;cpe:/a:tikiwiki:tikiwiki_cms_groupware
 tin;cpe:/a:tin:tin
+tinc;cpe:/a:tinc:tinc
 tintin++;cpe:/a:tintin:tintin%2B%2B
 tinymux;cpe:/a:tinymux:tinymux
 tinyproxy;cpe:/a:banu:tinyproxy
@@ -1708,6 +1731,7 @@ torrentflux;cpe:/a:torrentflux:torrentflux
 tqsllib;cpe:/a:arrl:tqsllib
 trac-git;cpe:/a:nanosleep:trac-git
 trac;cpe:/a:edgewall:trac
+traceroute-nanog;cpe:/a:ehud_gavron:traceroute-nanog
 trafficserver;cpe:/a:apache:traffic_server
 tramp;cpe:/a:gnu:tramp
 transmission;cpe:/a:transmissionbt:transmission
@@ -1751,6 +1775,7 @@ unrealircd;cpe:/a:unrealircd:unrealircd
 unrtf;cpe:/a:zack_smith:unrtf
 unzip;cpe:/a:info-zip:unzip
 unzoo;cpe:/a:unzoo:unzoo
+update-manager;cpe:/a:canonical:update-manager
 upstart;cpe:/a:ubuntu:upstart
 usermin;cpe:/a:usermin:usermin
 ust;cpe:/a:lttng:ust
@@ -1797,6 +1822,7 @@ webauth;cpe:/a:stanford:webauth
 webcalendar;cpe:/a:k5n:webcalendar
 webcheck;cpe:/a:webcheck:webcheck
 webcit;cpe:/a:citadel:webcit
+webfs;cpe:/a:webfs:webfs
 webgui;cpe:/a:plainblack:webgui
 webkit;cpe:/a:webkit:webkit
 webkitkde;cpe:/a:urs_wolfer:kwebkitpart