recog-intrigue 2.3.7 → 2.3.14

data/xml/mdns_workstation_txt.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <fingerprints matches="mdns.workstation.txt" protocol="mdns" database_type="service">
   <!--
     Fingerprint definitions that are matched against the string values in the
@@ -7,9 +7,11 @@
     to the domain name for a server to respond with the record:
     e.g. 'host-name._workstation._tcp.local'.
   -->
+
   <fingerprint pattern="^org\.freedesktop\.Avahi\.cookie=\S+$">
     <description>Avahi</description>
     <example>org.freedesktop.Avahi.cookie=1023312927</example>
     <param pos="0" name="service.product" value="Avahi"/>
   </fingerprint>
-</fingerprints>
+
+</fingerprints>

data/xml/mysql_banners.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <fingerprints matches="mysql.banners" protocol="mysql" database_type="service" preference="0.75">
   <!--
       Upon successful connection to an MySQL/derivative TCP endpoint, provided
@@ -11,6 +11,7 @@
       the TCP payload and the fingerprints below are used to match and extract
       from this version.
   -->
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)(?:-m\d{1,2})?(?:-rc)?(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-?max)?(?:-rs)?(?:-modified)?(?:-debug)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL (common)</description>
     <example service.version="4.1.20">4.1.20</example>
@@ -33,6 +34,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:-m\d)?(?:-rc)?(?:-alpha)?(?:-beta)?-community(?:-max)?(?:-debug)?(?:-log)?(?:-debug)?$" flags="REG_ICASE">
     <description>Oracle MySQL Community Edition</description>
     <example service.version="5.0.95">5.0.95-community-log</example>
@@ -49,6 +51,7 @@
     <param pos="0" name="service.edition" value="Community Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?-community(?:-max)?-nt(?:-log)?(?:-debug)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Community Edition with Named Pipes (Windows)</description>
     <example service.version="4.1.22">4.1.22-community-max-nt</example>
@@ -66,6 +69,7 @@
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:-alpha)?(?:-beta)?(?:-rc)?(?:-gamma)?(?:-max)?-nt(?:-max)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL with Named Pipes (Windows)</description>
     <example service.version="5.0.18">5.0.18-nt</example>
@@ -81,6 +85,7 @@
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-cll$" flags="REG_ICASE">
     <description>Oracle MySQL hosted on CPanel</description>
     <example service.version="5.5.25a">5.5.25a-cll</example>
@@ -91,6 +96,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-community-cll$" flags="REG_ICASE">
     <description>Oracle MySQL Community hosted on CPanel</description>
     <example service.version="5.0.91">5.0.91-community-cll</example>
@@ -103,6 +109,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-cll-lve$" flags="REG_ICASE">
     <description>Oracle MySQL on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
     <example service.version="5.1.66">5.1.66-cll-lve</example>
@@ -115,6 +122,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-community-cll-lve$" flags="REG_ICASE">
     <description>Oracle MySQL Community on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
     <example service.version="5.0.95">5.0.95-community-cll-lve</example>
@@ -128,6 +136,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})-0ubuntu0.(\d\d\.\d\d)[.\d]*(?:-log)?$">
     <description>Oracle MySQL on Ubuntu</description>
     <example service.version="5.1.66" os.version="10.04">5.1.66-0ubuntu0.10.04.3-log</example>
@@ -143,6 +152,7 @@
     <param pos="2" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})-(?:Debian_)?\dubuntu(\d{1,2}\.\d\d)[.\d]*(?:-log)?$">
     <description>Oracle MySQL on Ubuntu - Debian string variant</description>
     <example service.version="5.0.22" os.version="6.06">5.0.22-Debian_0ubuntu6.06.14-log</example>
@@ -158,6 +168,7 @@
     <param pos="2" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})[-_](?:Ubuntu[_-])?(?:Debian[_-])?\d{1,2}(?:~exp1)?ubuntu\d{1,2}(?:\.\d)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL on Ubuntu where trailing digits aren't OS version</description>
     <example service.version="5.0.45">5.0.45-Debian_1ubuntu3.4</example>
@@ -177,6 +188,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+deb\.sury\.org~precise\+\d(?:-log)?$">
     <description>Oracle MySQL on Ubuntu 12.04 (Precise Pangolin) packaged by deb.sury.org</description>
     <example service.version="5.6.19-1">5.6.19-1+deb.sury.org~precise+1</example>
@@ -192,6 +204,7 @@
     <param pos="0" name="os.version" value="12.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:12.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+deb\.sury\.org~trusty\+\d(?:-log)?$">
     <description>Oracle MySQL on Ubuntu 14.04 (Trusty Tahr) packaged by deb.sury.org</description>
     <example service.version="5.6.21-1">5.6.21-1+deb.sury.org~trusty+1</example>
@@ -207,6 +220,70 @@
     <param pos="0" name="os.version" value="14.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:14.04"/>
   </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+deb8u1(?:-log)?$">
+    <description>Oracle MySQL on Debian 8.1 (jessie)</description>
+    <example service.version="5.5.62-0">5.5.62-0+deb8u1</example>
+    <example service.version="5.5.49-0">5.5.49-0+deb8u1-log</example>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="8.1"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:8.1"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+\d?jessie\d?(?:-log)?$">
+    <description>Oracle MySQL on Debian 8.0 (jessie)</description>
+    <example service.version="5.6.31-1">5.6.31-1+jessie</example>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="8.0"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:8.0"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+deb7u2(?:-log)?$">
+    <description>Oracle MySQL on Debian 7.2 (wheezy)</description>
+    <example service.version="5.5.60-0">5.5.60-0+deb7u2</example>
+    <example service.version="5.5.60-0">5.5.60-0+deb7u2-log</example>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="7.2"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:7.2"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+deb7u1(?:-log)?$">
+    <description>Oracle MySQL on Debian 7.1 (wheezy)</description>
+    <example service.version="5.5.60-0">5.5.60-0+deb7u1</example>
+    <example service.version="5.5.60-0">5.5.60-0+deb7u1-log</example>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.vendor" value="Oracle"/>
+    <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MySQL"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Debian"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="7.1"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:7.1"/>
+  </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+(?:squeeze\d|deb6u1)(?:-log)?$">
     <description>Oracle MySQL on Debian 6.0 (squeeze)</description>
     <example service.version="5.1.66-0">5.1.66-0+squeeze1</example>
@@ -223,10 +300,12 @@
     <param pos="0" name="os.version" value="6.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:6.0"/>
   </fingerprint>
-  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+wheezy\d(?:-log)?$">
+
+  <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+\d?wheezy\d?(?:-log)?$">
     <description>Oracle MySQL on Debian 7.0 (wheezy)</description>
     <example service.version="5.5.41-0">5.5.41-0+wheezy1</example>
     <example service.version="5.5.35-0">5.5.35-0+wheezy1-log</example>
+    <example service.version="5.5.59-25.23">5.5.59-25.23+1wheezy</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.family" value="MySQL"/>
@@ -238,6 +317,7 @@
     <param pos="0" name="os.version" value="7.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:7.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[^+]+)\+lenny\d*(?:\+spu\d)?(?:-log)?$">
     <description>Oracle MySQL on Debian 5.0 (lenny)</description>
     <example service.version="5.0.51a-24">5.0.51a-24+lenny1-log</example>
@@ -254,6 +334,7 @@
     <param pos="0" name="os.version" value="5.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:5.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d~bpo50" flags="REG_ICASE">
     <description>Oracle MySQL Backport on Debian 5.0 (lenny)</description>
     <example service.version="5.1.49">5.1.49-3~bpo50+1-log</example>
@@ -268,6 +349,7 @@
     <param pos="0" name="os.version" value="5.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:5.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}).*~?bpo40(?:\+\d)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Backport on Debian 4.0 (etch)</description>
     <example service.version="5.0.51a">5.0.51a-24+lenny2~bpo40+1-log</example>
@@ -282,6 +364,7 @@
     <param pos="0" name="os.version" value="4.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:4.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-Debian.*~?bpo31(?:\+\d)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Backport on Debian 3.1 (sarge)</description>
     <example service.version="5.0.32">5.0.32-Debian_7etch5~bpo31+1-log</example>
@@ -296,7 +379,9 @@
     <param pos="0" name="os.version" value="3.1"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:3.1"/>
   </fingerprint>
+
   <!-- FIXFIX -->
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-Debian_\d~?bpo\.?\d" flags="REG_ICASE">
     <description>Oracle MySQL Backport on Debian</description>
     <example service.version="5.0.22">5.0.22-Debian_2bpo1</example>
@@ -311,6 +396,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})-Debian_\d?etch\d*(?:-log)?$">
     <description>Oracle MySQL on Debian 4.0 (etch)</description>
     <example service.version="4.1.11">4.1.11-Debian_etch1-log</example>
@@ -326,6 +412,7 @@
     <param pos="0" name="os.version" value="4.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:4.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})[_-]Debian[_-]\d{1,2}sarge\d*(?:-log)?$">
     <description>Oracle MySQL on Debian 3.1 (sarge)</description>
     <example service.version="4.0.24">4.0.24_Debian-10sarge2-log</example>
@@ -341,6 +428,7 @@
     <param pos="0" name="os.version" value="3.1"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:3.1"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})[_-]Debian[_-]\d{1,2}woody\d*(?:-log)?$">
     <description>Oracle MySQL on Debian 3.0 (woody)</description>
     <example service.version="4.0.24">4.0.24_Debian-4woody1</example>
@@ -355,6 +443,7 @@
     <param pos="0" name="os.version" value="3.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:3.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:[_-]\d{8})?[_-]Debian[_-]\d{1,2}(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL on Debian (Generic match)</description>
     <example service.version="4.0.23">4.0.23_Debian-3-log</example>
@@ -369,6 +458,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.\d{1,2})(?:-rc)?[_-]Debian[_-]\d{1,2}~ppa\d(?:-log)?$">
     <description>Oracle MySQL on Debian (Generic match) using PPA</description>
     <example service.version="5.1.22">5.1.22-rc-Debian_2~ppa5-log</example>
@@ -382,6 +472,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:-\d{1,2})?(?:-Debian)?(?:-Dotdeb)?[-~_\d\.]+dotdeb\.\d(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL packaged by DotDeb.org</description>
     <example service.version="5.1.54">5.1.54-0.dotdeb.0</example>
@@ -398,6 +489,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:-alpha)?(?:-beta)?(?:-gamma)?(?:-rc)?-standard(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Standard Edition</description>
     <example service.version="5.0.13">5.0.13-rc-standard-log</example>
@@ -410,6 +502,7 @@
     <param pos="0" name="service.edition" value="Standard Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-pro(?:-gpl)?-nt(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Commercial Edition with Named Pipes (Windows)</description>
     <example service.version="5.0.24">5.0.24-pro-nt</example>
@@ -423,6 +516,7 @@
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-pro(?:-gpl)?(?:-cert)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Commercial Edition</description>
     <example service.version="4.1.23">4.1.23-pro-gpl-log</example>
@@ -434,6 +528,7 @@
     <param pos="0" name="service.edition" value="Commercial Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}sp1)" flags="REG_ICASE">
     <description>Oracle MySQL Enterprise Edition</description>
     <example service.version="5.0.82sp1">5.0.82sp1</example>
@@ -445,6 +540,7 @@
     <param pos="0" name="service.edition" value="Enterprise Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-enterprise-nt" flags="REG_ICASE">
     <description>Oracle MySQL Enterprise Edition with Named Pipes (Windows)</description>
     <example service.version="5.0.84">5.0.84-enterprise-nt</example>
@@ -457,6 +553,7 @@
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:-rc)?-enterprise" flags="REG_ICASE">
     <description>Oracle MySQL Enterprise Edition - variant 1</description>
     <example service.version="5.1.26">5.1.26-rc-enterprise-gpl-log</example>
@@ -468,6 +565,7 @@
     <param pos="0" name="service.edition" value="Enterprise Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-ndb-\d\.\d{1,2}\.[a-f\d]{1,3})" flags="REG_ICASE">
     <description>Oracle MySQL Cluster Edition - nbd variant</description>
     <example service.version="5.1.30-ndb-6.3.20">5.1.30-ndb-6.3.20-cluster-gpl-log</example>
@@ -479,6 +577,7 @@
     <param pos="0" name="service.edition" value="Cluster Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-CLUSTERS?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Cluster Edition</description>
     <example service.version="4.1.21">4.1.21-CLUSTERS</example>
@@ -490,6 +589,7 @@
     <param pos="0" name="service.edition" value="Cluster Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-classic(?:-log)?" flags="REG_ICASE">
     <description>Oracle MySQL Classic Edition</description>
     <example service.version="5.0.86">5.0.86-classic-log</example>
@@ -500,8 +600,11 @@
     <param pos="0" name="service.edition" value="Classic Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <!-- Linux only - http://www.percona.com/services/mysql-support/supported-platforms -->
+
   <!-- Build list - http://www.percona.com/doc/percona-server/5.1/release-notes/release-notes_index.html -->
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-?rel\d\d\.\d)(?:-log)?" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) match w/ 'rel'</description>
     <example service.version="5.1.57-rel12.8">5.1.57-rel12.8</example>
@@ -515,6 +618,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d{1,2}-rel\d\d\.\d{1,2}(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) match w/ 'rel' variant 1</description>
     <example service.version="5.6.17">5.6.17-65.0-rel65.0</example>
@@ -526,6 +630,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-(?:rc)?percona" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) w/ percona in banner</description>
     <example service.version="5.1.50">5.1.50-percona</example>
@@ -539,6 +644,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d{1,2}(?:-\d\d)?(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) (just version number match)</description>
     <example service.version="5.1.73">5.1.73-14.12</example>
@@ -552,6 +658,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-rc\d\d\.\d(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) match w/ 'rc'</description>
     <example service.version="5.6.13">5.6.13-rc60.6</example>
@@ -564,6 +671,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d-\d{3}\.trusty(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) on Ubuntu 14.04 (Trusty Tahr)</description>
     <example service.version="5.6.17">5.6.17-65.0-583.trusty</example>
@@ -578,6 +686,7 @@
     <param pos="0" name="os.version" value="14.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:14.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d-\d{3}\.saucy(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) on Ubuntu 13.10 (Saucy Salamander)</description>
     <example service.version="5.6.17">5.6.17-65.0-587.saucy</example>
@@ -592,6 +701,7 @@
     <param pos="0" name="os.version" value="13.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:13.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d-\d{3}\.quantal(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) on Ubuntu 12.10 (Quantal Quetzal)</description>
     <example service.version="5.6.16">5.6.16-64.2-569.quantal-log</example>
@@ -606,8 +716,9 @@
     <param pos="0" name="os.version" value="12.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:12.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d-\d{3}\.precise(?:-log)?$" flags="REG_ICASE">
-    <description>Percona Server (MySQL fork) on Ubuntu 12.04 LTS (Precise Pangolin)</description>
+    <description>Percona Server (MySQL fork) on Ubuntu 12.04 (Precise Pangolin)</description>
     <example service.version="5.6.16">5.6.16-64.2-569.precise-log</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="Percona"/>
@@ -620,6 +731,7 @@
     <param pos="0" name="os.version" value="12.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:12.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d-\d{3}\.wheezy(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) on Debian 7.0 (wheezy)</description>
     <example service.version="5.5.36">5.5.36-34.2-648.wheezy-log</example>
@@ -634,6 +746,7 @@
     <param pos="0" name="os.version" value="7.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:7.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d-\d{3}\.squeeze(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) on Debian 6.0 (squeeze)</description>
     <example service.version="5.5.36">5.5.36-34.2-648.squeeze</example>
@@ -648,6 +761,7 @@
     <param pos="0" name="os.version" value="6.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:6.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-nmm" flags="REG_ICASE">
     <description>Oracle MySQL (nmm variant)</description>
     <example service.version="4.0.27">4.0.27-nmm1-log</example>
@@ -658,6 +772,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-nightly-\d{8}(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL nightly build</description>
     <example service.version="3.23.59">3.23.59-nightly-20050301-log</example>
@@ -667,6 +782,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-SERVER" flags="REG_ICASE">
     <description>Oracle MySQL (SERVER variant)</description>
     <example service.version="5.1.30">5.1.30-SERVER-104</example>
@@ -676,6 +792,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-ISPrime" flags="REG_ICASE">
     <description>Oracle MySQL (ISPrime variant)</description>
     <example service.version="4.0.15a">4.0.15a-ISPrime</example>
@@ -685,6 +802,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-rc-\d\.\d{1,2}\.[a-f\d]{1,3}" flags="REG_ICASE">
     <description>Oracle MySQL possibly Debian specific</description>
     <example service.version="5.1.26">5.1.26-rc-5.1.26rc-log</example>
@@ -694,6 +812,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-ius(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL packaged for RHEL/CentOS by IUS</description>
     <example service.version="5.1.66">5.1.66-ius-log</example>
@@ -705,6 +824,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})[\.-]d\d{1,2}-ourdelta\d{0,2}(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL tweaked and packaged by OurDelta</description>
     <example service.version="5.0.67">5.0.67.d7-ourdelta-log</example>
@@ -717,6 +837,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-Alibaba(?:-rds)?-\d{6}(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL Alibaba build? distro? Aliyun.com hosted?</description>
     <example service.version="5.1.61">5.1.61-Alibaba-121011-log</example>
@@ -727,24 +848,21 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <!--
     MariaDB Fingerprinting note: MariaDB uses version numbers in the same range
     as MySQL all the way through the 5.5.x family.  Banners look like this:
-
     5.5.34-MariaDB-cll-lve
     5.5.31-MariaDB-1~squeeze-log
-
     After 5.5.x they jumped to 10.x.x.  Banners for the 10.x.x family will have
     MySQL version that the code is based off of first, and then the MariaDB
     version number will follow:
-
     5.5.5-10.0.15-MariaDB-cll-lve
     5.5.5-10.0.15-MariaDB-1~squeeze-log
-
     In the banners above, 10.0.15 is the accurate version number.
-
     Reference: https://mariadb.org/explanation-on-mariadb-10-0/
   -->
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB(?:-log)?-cll-lve$" flags="REG_ICASE">
     <description>MariaDB MariaDB on CloudLinux in a Lightweight Virtual Environment (LVE)</description>
     <example service.version="5.5.34">5.5.34-MariaDB-cll-lve</example>
@@ -759,6 +877,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~jessie(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Debian 8.0 (jessie)</description>
     <example service.version="5.5.37">5.5.37-MariaDB-1~jessie-log</example>
@@ -775,6 +894,7 @@
     <param pos="0" name="os.version" value="8.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:8.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~wheezy(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Debian 7.0 (wheezy)</description>
     <example service.version="5.5.37">5.5.37-MariaDB-1~wheezy-log</example>
@@ -791,6 +911,7 @@
     <param pos="0" name="os.version" value="7.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:7.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~squeeze(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Debian 6.0 (squeeze)</description>
     <example service.version="5.5.31">5.5.31-MariaDB-1~squeeze-log</example>
@@ -806,6 +927,7 @@
     <param pos="0" name="os.version" value="6.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:6.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-MariaDB.+~lenny(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Debian 5.0 (lenny)</description>
     <example service.version="5.3.2">5.3.2-MariaDB-beta-mariadb102~lenny</example>
@@ -820,8 +942,9 @@
     <param pos="0" name="os.version" value="5.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:5.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~sid(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Debian Unstable/No version  (sid)</description>
+    <description>MariaDB MariaDB on Debian Unstable/No version (sid)</description>
     <example service.version="10.0.16">5.5.5-10.0.16-MariaDB-1~sid</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -833,6 +956,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~xenial(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 16.04 (Xenial Xerus)</description>
     <example service.version="10.1.23">5.5.5-10.1.23-MariaDB-1~xenial</example>
@@ -847,6 +971,7 @@
     <param pos="0" name="os.version" value="16.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:16.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~utopic(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 14.10 (Utopic Unicorn)</description>
     <example service.version="10.0.16">5.5.5-10.0.16-MariaDB-1~utopic-log</example>
@@ -861,6 +986,7 @@
     <param pos="0" name="os.version" value="14.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:14.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~trusty(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 14.04 (Trusty Tahr)</description>
     <example service.version="10.0.15">5.5.5-10.0.15-MariaDB-1~trusty</example>
@@ -875,6 +1001,7 @@
     <param pos="0" name="os.version" value="14.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:14.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~saucy(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 13.10 (Saucy Salamander)</description>
     <example service.version="5.5.39">5.5.39-MariaDB-1~saucy-log</example>
@@ -889,8 +1016,9 @@
     <param pos="0" name="os.version" value="13.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:13.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~buster(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Debian 10 (Buster)</description>
+    <description>MariaDB MariaDB on Debian 10 (buster)</description>
     <example service.version="10.3.20">5.5.5-10.3.20-MariaDB-1:10.3.20+maria~buster-log</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -901,8 +1029,9 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="10.0"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:canonical:debian_linux:10.0"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:10.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~yakkety(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 16.10 (Yakkety Yak)</description>
     <example service.version="10.1.26">5.5.5-10.1.26-MariaDB-1~yakkety</example>
@@ -917,22 +1046,25 @@
     <param pos="0" name="os.version" value="16.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:16.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB-1~yakkety-(?:wsrep)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB-wsrep on Ubuntu 16.10 (Yakkety Yak)</description>
+    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 16.10 (Yakkety Yak)</description>
     <example service.version="10.0.28">5.5.5-10.0.28-MariaDB-1~yakkety-wsrep</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
     <param pos="0" name="service.edition" value="Galera Cluster"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.version" value="16.10"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:13.10"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:16.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~wily(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Ubuntu 15.10 (wily)</description>
+    <description>MariaDB MariaDB on Ubuntu 15.10 (Wily Werewolf)</description>
     <example service.version="10.3.22">5.5.5-10.3.22-MariaDB-1:10.3.22+maria~wily</example>
     <example service.version="10.4.12">5.5.5-10.4.12-MariaDB-1:10.4.12+maria~wily-log</example>
     <example service.version="10.1.11">5.5.5-10.1.11-MariaDB-1~wily-log</example>
@@ -948,6 +1080,7 @@
     <param pos="0" name="os.version" value="15.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:15.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~vivid(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 15.04 (Vivid Vervet)</description>
     <example service.version="10.0.24">5.5.5-10.0.24-MariaDB-1~vivid</example>
@@ -963,6 +1096,7 @@
     <param pos="0" name="os.version" value="15.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:15.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~vivid-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Ubuntu 15.04 (Vivid Vervet)</description>
     <example service.version="10.0.24">5.5.5-10.0.24-MariaDB-1~vivid-wsrep</example>
@@ -970,6 +1104,7 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
+    <param pos="0" name="service.product" value="MariaDB"/>
     <param pos="0" name="service.edition" value="Galera Cluster"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
@@ -978,8 +1113,9 @@
     <param pos="0" name="os.version" value="15.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:15.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~eoan(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Ubuntu 19.10 (Eoan)</description>
+    <description>MariaDB MariaDB on Ubuntu 19.10 (Eoan Ermine)</description>
     <example service.version="10.3.22">5.5.5-10.3.22-MariaDB-1:10.3.22+maria~eoan</example>
     <example service.version="10.4.12">5.5.5-10.4.12-MariaDB-1:10.4.12+maria~eoan-log</example>
     <param pos="1" name="service.version"/>
@@ -993,8 +1129,9 @@
     <param pos="0" name="os.version" value="19.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:19.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~cosmic(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Ubuntu 18.10 (Cosmic)</description>
+    <description>MariaDB MariaDB on Ubuntu 18.10 (Cosmic Cuttlefish)</description>
     <example service.version="10.3.17">5.5.5-10.3.17-MariaDB-1:10.3.17+maria~cosmic-log</example>
     <example service.version="10.1.20">5.5.5-10.1.20-MariaDB-1:10.3.17+maria~cosmic</example>
     <param pos="1" name="service.version"/>
@@ -1008,8 +1145,9 @@
     <param pos="0" name="os.version" value="18.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:18.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~disco(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Ubuntu 19.04 (Disco)</description>
+    <description>MariaDB MariaDB on Ubuntu 19.04 (Disco Dingo)</description>
     <example service.version="10.3.17">5.5.5-10.3.17-MariaDB-1:10.3.17+maria~disco-log</example>
     <example service.version="10.1.20">5.5.5-10.1.20-MariaDB-1:10.3.17+maria~disco</example>
     <param pos="1" name="service.version"/>
@@ -1023,6 +1161,7 @@
     <param pos="0" name="os.version" value="19.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:19.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~raring(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 13.04 (Raring Ringtail)</description>
     <example service.version="5.5.32">5.5.32-MariaDB-1~raring-log</example>
@@ -1037,6 +1176,7 @@
     <param pos="0" name="os.version" value="13.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:13.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~quantal(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 12.10 (Quantal Quetzal)</description>
     <example service.version="10.0.12">5.5.5-10.0.12-MariaDB-1~quantal-log</example>
@@ -1052,8 +1192,9 @@
     <param pos="0" name="os.version" value="12.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:12.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~precise(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Ubuntu 12.04 LTS (Precise Pangolin)</description>
+    <description>MariaDB MariaDB on Ubuntu 12.04 (Precise Pangolin)</description>
     <example service.version="5.5.41">5.5.41-MariaDB-1~precise-log</example>
     <example service.version="10.0.16">5.5.5-10.0.16-MariaDB-1~precise-log</example>
     <param pos="1" name="service.version"/>
@@ -1067,8 +1208,9 @@
     <param pos="0" name="os.version" value="12.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:12.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~hardy(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB on Ubuntu 8.04 LTS (Hardy Heron)</description>
+    <description>MariaDB MariaDB on Ubuntu 8.04 (Hardy Heron)</description>
     <example service.version="5.5.34">5.5.34-MariaDB-mariadb122~hardy-log</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -1081,6 +1223,7 @@
     <param pos="0" name="os.version" value="8.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:8.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~trusty-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Ubuntu 14.04 (Trusty Tahr)</description>
     <example service.version="10.1.1">5.5.5-10.1.1-MariaDB-1~trusty-wsrep-log</example>
@@ -1096,8 +1239,9 @@
     <param pos="0" name="os.version" value="14.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:14.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~jessie-wsrep(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB with Galera Cluster on Debian 8.0 (Jessie)</description>
+    <description>MariaDB MariaDB with Galera Cluster on Debian 8.0 (jessie)</description>
     <example service.version="10.0.26">5.5.5-10.0.26-MariaDB-1~jessie-wsrep</example>
     <example service.version="10.0.22">5.5.5-10.0.22-MariaDB-1~jessie-wsrep-log</example>
     <param pos="1" name="service.version"/>
@@ -1112,6 +1256,7 @@
     <param pos="0" name="os.version" value="8.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:8.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~xenial-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Ubuntu 16.04 (Xenial Xerus)</description>
     <example service.version="10.0.36">5.5.5-10.0.36-MariaDB-1~xenial-wsrep</example>
@@ -1128,6 +1273,7 @@
     <param pos="0" name="os.version" value="16.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:16.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~saucy-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Ubuntu 13.10 (Saucy Salamander)</description>
     <example service.version="10.0.10">5.5.5-10.0.10-MariaDB-1~saucy-wsrep-log</example>
@@ -1143,6 +1289,7 @@
     <param pos="0" name="os.version" value="13.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:13.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~precise-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Ubuntu 12.04 (Precise Pangolin)</description>
     <example service.version="10.1.1">5.5.5-10.1.1-MariaDB-1~precise-wsrep</example>
@@ -1158,8 +1305,9 @@
     <param pos="0" name="os.version" value="12.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:12.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~lucid-wsrep(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 10.04 TLS (Lucid Lynx)</description>
+    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 10.04 (Lucid Lynx)</description>
     <example service.version="5.5.34">5.5.34-MariaDB-1~lucid-wsrep-log</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -1173,6 +1321,7 @@
     <param pos="0" name="os.version" value="10.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:10.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB-\dubuntu\d(?:\.\d{1,3}\.\d{1,3}\.\d{1,3})?(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu</description>
     <example service.version="10.0.17">5.5.5-10.0.17-MariaDB-0ubuntu1</example>
@@ -1189,7 +1338,8 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
   </fingerprint>
-    <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~lucid(?:-log)?$" flags="REG_ICASE">
+
+  <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~lucid(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 10.04 (Lucid lynx)</description>
     <example service.version="5.5.34">5.5.34-MariaDB-1~lucid-log</example>
     <param pos="1" name="service.version"/>
@@ -1203,8 +1353,9 @@
     <param pos="0" name="os.version" value="10.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:10.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB-\d\:.*\+maria\~focal$" flags="REG_ICASE">
-    <description>MariaDB MariaDB running on a Ubuntu Focal Fossil (20.4)</description>
+    <description>MariaDB MariaDB on Ubuntu 20.04 (Focal Fossa)</description>
     <example service.version="10.5.2">5.5.5-10.5.2-MariaDB-1:10.5.2+maria~focal</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -1217,8 +1368,9 @@
     <param pos="0" name="os.version" value="20.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:20.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB-mariadb\d\Smaverick$" flags="REG_ICASE">
-    <description>MariaDB MariaDB running on a Ubuntu Maverick (10.10)</description>
+    <description>MariaDB MariaDB on Ubuntu 10.10 (Maverick Meerkat)</description>
     <example service.version="5.5.29">5.5.29-MariaDB-mariadb1~maverick</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
@@ -1231,8 +1383,9 @@
     <param pos="0" name="os.version" value="10.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:10.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4}(?:\-\d)?)-MariaDB-alt\d{1,2}(?:-log)?.*$" flags="REG_ICASE">
-    <description>MariaDB MariaDB running on a ALT Linux</description>
+    <description>MariaDB MariaDB on a ALT Linux</description>
     <example service.version="10.1.29">5.5.5-10.1.29-MariaDB-alt1.M80P.1</example>
     <example service.version="10.2.15">5.5.5-10.2.15-MariaDB-alt2.M80P.3.S1</example>
     <param pos="1" name="service.version"/>
@@ -1243,8 +1396,8 @@
     <param pos="0" name="os.vendor" value="ALT"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:altlinux:alt_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4}\-\d{1,2})-MariaDB-enterprise(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB Maria DB Enterprise Edition</description>
     <example service.version="10.4.10-4">5.5.5-10.4.10-4-MariaDB-enterprise-log</example>
@@ -1255,6 +1408,7 @@
     <param pos="0" name="service.edition" value="Enterprise Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4}(?:\-\d)?)-MariaDB(?:\-\d{1,2})?(?:\+\S{1,2})?$" flags="REG_ICASE">
     <description>MariaDB</description>
     <example service.version="10.0.40-2">5.5.5-10.0.40-2-MariaDB</example>
@@ -1269,7 +1423,8 @@
     <param pos="0" name="service.product" value="MariaDB"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
   </fingerprint>
-    <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)MariaDB-\d{1,2}\:(\d{1,2}\.\d{1,2}\.\d{1,2})$" flags="REG_ICASE">
+
+  <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)MariaDB-\d{1,2}\:(\d{1,2}\.\d{1,2}\.\d{1,2})$" flags="REG_ICASE">
     <description>MariaDB MariaDB alternate version format</description>
     <example service.version="10.3.13">5.7.8-MariaDB-1:10.3.13</example>
     <param pos="1" name="service.version"/>
@@ -1278,6 +1433,7 @@
     <param pos="0" name="service.product" value="MariaDB"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~wheezy-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Debian 7.0 (wheezy)</description>
     <example service.version="10.1.1">5.5.5-10.1.1-MariaDB-1~wheezy-wsrep-log</example>
@@ -1293,6 +1449,7 @@
     <param pos="0" name="os.version" value="7.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:7.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~squeeze-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Debian 6.0 (squeeze)</description>
     <example service.version="10.1.1">5.5.5-10.1.1-MariaDB-1~squeeze-wsrep</example>
@@ -1308,6 +1465,7 @@
     <param pos="0" name="os.version" value="6.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:6.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~zesty(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB on Ubuntu 17.04 (Zesty Zapus)</description>
     <example service.version="10.2.12">5.5.5-10.2.12-MariaDB-10.2.12+maria~zesty-log</example>
@@ -1323,15 +1481,15 @@
     <param pos="0" name="os.version" value="17.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:17.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~artful(?:-log)?$" flags="REG_ICASE">
-    <description>MariaDB MariaDB with Galera Cluster on Ubuntu 17.10 (Artful Ardvark)</description>
+    <description>MariaDB MariaDB on Ubuntu 17.10 (Artful Ardvark)</description>
     <example service.version="10.5.12">5.5.5-10.5.12-MariaDB-10.2.12+maria~artful-log</example>
     <example service.version="10.3.2">5.5.5-10.3.2-MariaDB-10.2.12+maria~artful</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
-    <param pos="0" name="service.edition" value="Galera Cluster"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -1339,6 +1497,7 @@
     <param pos="0" name="os.version" value="17.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:17.10"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB.+~sid-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster on Debian Unstable/No version (sid)</description>
     <example service.version="10.0.16">5.5.5-10.0.16-MariaDB-1~sid-wsrep</example>
@@ -1353,6 +1512,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB-wsrep(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB with Galera Cluster</description>
     <example service.version="10.0.15">5.5.5-10.0.15-MariaDB-wsrep</example>
@@ -1363,6 +1523,7 @@
     <param pos="0" name="service.edition" value="Galera Cluster"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-Maria(?:DB)?[-\d]*(?:-debug)?(?:-ga)?(?:-beta)?(?:-mariadb)?[~\.\d]*(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB</description>
     <example service.version="5.1.39">5.1.39-maria-beta</example>
@@ -1378,6 +1539,7 @@
     <param pos="0" name="service.product" value="MariaDB"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-Community-Maria(?:DB)?(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB Community Edition</description>
     <example service.version="5.1.44">5.1.44-community-maria-log</example>
@@ -1388,6 +1550,7 @@
     <param pos="0" name="service.edition" value="Community Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)?(\d{1,2}\.\d{1,3}\.[a-f\d]{1,4})-MariaDB-enterprise(?:-log)?$" flags="REG_ICASE">
     <description>MariaDB MariaDB Enterprise Edition</description>
     <example service.version="10.1.21">5.5.5-10.1.21-MariaDB-enterprise</example>
@@ -1400,6 +1563,7 @@
     <param pos="0" name="service.edition" value="Enterprise Edition"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,2}\.[a-f\d]{1,2})(?:-\d{1,2}\.\d{1,2}\.[a-f\d]{1,2})?\s(\d{1,2}\.\d{1,2}\.\d{1,2})-maxscale$">
     <description>MariaDB MariaDB MaxScale</description>
     <example service.version="2.1.14">5.5.5-10.0.0 2.1.14-maxscale</example>
@@ -1408,6 +1572,7 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MaxScale"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-falcon-alpha-community-nt" flags="REG_ICASE">
     <description>Oracle MySQL with defunct Falcon Storage Engine with Named Pipes (Windows)</description>
     <example service.version="5.2.0">5.2.0-falcon-alpha-community-nt</example>
@@ -1419,6 +1584,7 @@
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-falcon-alpha(?:-community)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL with defunct Falcon Storage Engine</description>
     <example service.version="5.2.0">5.2.0-falcon-alpha-log</example>
@@ -1429,6 +1595,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-tokudb-\d\.\d\.\d{1,2}(?:-\d*)?(?:-log)?$" flags="REG_ICASE">
     <description>Tokutek customized MySQL</description>
     <example service.version="5.5.40">5.5.40-tokudb-7.5.3-log</example>
@@ -1438,6 +1605,7 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-tokudb-.*MariaDB(?:-log)?$" flags="REG_ICASE">
     <description>Tokutek customized MariaDB</description>
     <example service.version="5.5.25">5.5.25-tokudb-6.1.1-47477-MariaDB-log</example>
@@ -1446,47 +1614,57 @@
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)(\d*\.\d*\.\d*)-MariaDB.*-*~bionic?(?:-log)?$" flags="REG_ICASE">
-  	<description>Mariadb MariaDB running on Ubuntu Bionic (18.04)</description>
-	<example service.version="10.2.17">5.5.5-10.2.17-MariaDB-1:10.2.17+maria~bionic</example>
-	<example service.version="10.2.14">5.5.5-10.2.14-MariaDB-1:10.2.14+maria~bionic-log</example>
-	<example service.version="10.1.40">5.5.5-10.1.40-MariaDB-1~bionic</example>
-	<example service.version="10.2.39">5.5.5-10.2.39-MariaDB-1~bionic-log</example>
+    <description>MariaDB MariaDB on Ubuntu 18.04 (Bionic Beaver)</description>
+    <example service.version="10.2.17">5.5.5-10.2.17-MariaDB-1:10.2.17+maria~bionic</example>
+    <example service.version="10.2.14">5.5.5-10.2.14-MariaDB-1:10.2.14+maria~bionic-log</example>
+    <example service.version="10.1.40">5.5.5-10.1.40-MariaDB-1~bionic</example>
+    <example service.version="10.2.39">5.5.5-10.2.39-MariaDB-1~bionic-log</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
     <param pos="0" name="os.vendor" value="Ubuntu"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="18.04"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:18.04"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)(\d*\.\d*\.\d*)-MariaDB.*~stretch(?:-log)?$" flags="REG_ICASE">
-   <description>MariaDB MariaDB running on Debian 9.0 (Stretch)</description>
-   <example service.version="10.2.17">5.5.5-10.2.17-MariaDB-1:10.2.17+maria~stretch</example>
-   <example service.version="10.2.25">5.5.5-10.2.25-MariaDB-10.2.25+maria~stretch-log</example>
-   <example service.version="10.1.39">5.5.5-10.1.39-MariaDB-1~stretch</example>
+    <description>MariaDB MariaDB on Debian 9.0 (stretch)</description>
+    <example service.version="10.2.17">5.5.5-10.2.17-MariaDB-1:10.2.17+maria~stretch</example>
+    <example service.version="10.2.25">5.5.5-10.2.25-MariaDB-10.2.25+maria~stretch-log</example>
+    <example service.version="10.1.39">5.5.5-10.1.39-MariaDB-1~stretch</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
     <param pos="0" name="os.vendor" value="Debian"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="9.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:9.0"/>
   </fingerprint>
+
   <fingerprint pattern="^(?:\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}-)(\d*\.\d*\.\d*)-MariaDB\S*deb\S*$" flags="REG_ICASE">
-    <description>MariaDB MariaDB running on Debian 9.1 (Stretch)</description>
+    <description>MariaDB MariaDB on Debian 9.1 (stretch)</description>
     <example service.version="10.1.23">5.5.5-10.1.23-MariaDB-9+deb9u1</example>
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.vendor" value="MariaDB"/>
     <param pos="0" name="service.family" value="MySQL"/>
     <param pos="0" name="service.product" value="MariaDB"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mariadb:mariadb:{service.version}"/>
     <param pos="0" name="os.vendor" value="Debian"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.version" value="9.1"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:9.1"/>
   </fingerprint>
+
   <fingerprint pattern="^^(\d{1,2}\.\d{1,2}\.[a-f\d]{1,3})-Sphinx" flags="REG_ICASE">
     <description>Oracle MySQL with the Sphinx full text search engine</description>
     <example service.version="5.1.40">5.1.40-Sphinx</example>
@@ -1496,6 +1674,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})(?:-\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})?\+tld\d" flags="REG_ICASE">
     <description>Oracle MySQL packaged by TLD Linux</description>
     <example service.version="5.0.91">5.0.91+tld0-log</example>
@@ -1509,6 +1688,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-Debian_\d\.infrant\d$" flags="REG_ICASE">
     <description>Oracle MySQL on a Netgear ReadyNAS</description>
     <example service.version="5.0.24a">5.0.24a-Debian_3.infrant1</example>
@@ -1527,6 +1707,7 @@
     <param pos="0" name="hw.family" value="ReadyNAS"/>
     <param pos="0" name="hw.product" value="ReadyNAS"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-beget(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL at Ukrainian hoster BeGet(?)</description>
     <example service.version="5.1.61">5.1.61-beget-log</example>
@@ -1536,6 +1717,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-(?:Linuxtone.Org|LTOPS)(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL at Chinese hoster Linuxtone.org</description>
     <example service.version="5.0.56">5.0.56-Linuxtone.Org</example>
@@ -1546,6 +1728,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-xencdn.net(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL at Chinese hoster Xencdn.net</description>
     <example service.version="5.1.66">5.1.66-xencdn.net-log</example>
@@ -1555,6 +1738,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-Comsenz(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL at Chinese hoster Comsenz</description>
     <example service.version="5.0.27">5.0.27-Comsenz-log</example>
@@ -1564,6 +1748,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-www\.gamewave\.net(?:-edition)?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL at Chinese game hoster Gamewave</description>
     <example service.version="5.1.56">5.1.56-www.gamewave.net-edition-log</example>
@@ -1574,6 +1759,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}(?:[.-]\d{1,2})?(?:[.-]\d{1})?)[-\d]*-beget(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL at Russian hoster Beget</description>
     <example service.version="5.6.16-64.0">5.6.16-64.0-beget-log</example>
@@ -1584,6 +1770,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})yes(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL part of KB2 / Kimsboard (Korean site mgmt)?</description>
     <example service.version="4.0.27">4.0.27yes</example>
@@ -1593,6 +1780,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})\.t\d{1,2}(?:[\.\d]{3})?(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL audited/published by Twitter</description>
     <example service.version="5.5.24">5.5.24.t7-log</example>
@@ -1603,6 +1791,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}) Hybrid Cluster MySQL Proxy to$" flags="REG_ICASE">
     <description>Oracle MySQL by Hybrid Cluster (hosted?)</description>
     <example service.version="5.5.15">5.5.15 Hybrid Cluster MySQL Proxy to</example>
@@ -1612,6 +1801,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}) ScaleBase Data Traffic Manager [\.\d]+$" flags="REG_ICASE">
     <description>Oracle MySQL behind ScaleBase Data Traffic Manager</description>
     <example service.version="5.1.53">5.1.53 ScaleBase Data Traffic Manager 3.2.3</example>
@@ -1621,6 +1811,7 @@
     <param pos="0" name="service.product" value="MySQL"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:mysql:{service.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3})-\d\d\.\d{1,2}-\d\.ctbanco\d+(?:-log)?$" flags="REG_ICASE">
     <description>Percona Server (MySQL fork) with 'ctbanco' </description>
     <example service.version="5.6.16">5.6.16-64.1-1.ctbanco60-log</example>
@@ -1633,6 +1824,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
+
   <fingerprint pattern="^(\d{1,2}\.\d{1,3}\.[a-f\d]{1,3}) Complete MySQL by Server Logistics(?:-log)?$" flags="REG_ICASE">
     <description>Oracle MySQL packaged by Server Logistics, Mac specific</description>
     <example service.version="4.0.21">4.0.21 Complete MySQL by Server Logistics-log</example>
@@ -1646,4 +1838,5 @@
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
   </fingerprint>
-</fingerprints>
+
+</fingerprints>