From 7d1bdb35ca39cc15d48501a2fc48b63242f7cb3f Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 1 Jun 2016 10:44:08 +0200
Subject: [PATCH] Update of parsed versions

---
 lib/core/settings.py   |  2 +-
 xml/banner/generic.xml | 21 ++++++++++--------
 xml/banner/server.xml  | 50 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 2d6001b84..08df618cb 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.5.130"
+VERSION = "1.0.5.131"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/xml/banner/generic.xml b/xml/banner/generic.xml
index 9a221fd91..244cee49e 100644
--- a/xml/banner/generic.xml
+++ b/xml/banner/generic.xml
@@ -27,23 +27,26 @@
         <info sp="4"/>
     </regexp>
 
-    <regexp value="Windows.*7\.5">
-        <info type="Windows" distrib="2008"/>
+    <!-- Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx -->
+
+    <regexp value="Windows.*10\.0">
+        <info type="Windows" distrib="2016|10"/>
     </regexp>
 
-    <regexp value="Windows.*7\.0">
-        <info type="Windows" distrib="Vista"/>
+    <regexp value="Windows.*6\.3">
+        <info type="Windows" distrib="2012 R2|8.1"/>
+    </regexp>
+
+    <regexp value="Windows.*6\.2">
+        <info type="Windows" distrib="2012|8"/>
     </regexp>
 
     <regexp value="Windows.*6\.1">
-        <info type="Windows" distrib="7"/>
+        <info type="Windows" distrib="2008 R2|7"/>
     </regexp>
 
     <regexp value="Windows.*6\.0">
-        <!-- TODO: verify this
-        <info type="Windows" distrib="Vista"/>
-        -->
-        <info type="Windows" distrib="2003"/>
+        <info type="Windows" distrib="2008|Vista"/>
     </regexp>
 
     <regexp value="Windows.*5\.2">
diff --git a/xml/banner/server.xml b/xml/banner/server.xml
index 0fcb29519..48f0ab158 100644
--- a/xml/banner/server.xml
+++ b/xml/banner/server.xml
@@ -9,6 +9,10 @@
 <root>
     <!-- Microsoft IIS -->
 
+    <regexp value="Microsoft-IIS/(10\.0)">
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2016|10"/>
+    </regexp>
+
     <regexp value="Microsoft-IIS/(8\.5)">
         <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2012 R2|8.1"/>
     </regexp>
@@ -82,7 +86,7 @@
     </regexp>
 
     <regexp value="Apache/2\.2\.15 \(CentOS\)">
-        <info type="Linux" distrib="CentOS" release="6.5"/>
+        <info type="Linux" distrib="CentOS" release="6.8"/>
     </regexp>
 
     <!-- Apache: Debian -->
@@ -147,6 +151,14 @@
         <info type="Linux" distrib="Debian" release="7.0" codename="wheezy"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.10 \(Debian\)">
+        <info type="Linux" distrib="Debian" release="8.0" codename="jessie"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.18 \(Debian\)">
+        <info type="Linux" distrib="Debian" release="9.0" codename="jessie (testing)"/>
+    </regexp>
+
     <!-- Apache: Fedora -->
 
     <regexp value="Apache/2\.0\.47 \(Fedora\)">
@@ -249,6 +261,18 @@
         <info type="Linux" distrib="Fedora" release="20" codename="Heisenbug"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.10 \(Fedora\)">
+        <info type="Linux" distrib="Fedora" release="21"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.12 \(Fedora\)">
+        <info type="Linux" distrib="Fedora" release="22"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.16 \(Fedora\)">
+        <info type="Linux" distrib="Fedora" release="23"/>
+    </regexp>
+
     <!-- Apache: FreeBSD -->
 
     <regexp value="Apache/2\.0\.16 \(FreeBSD\)">
@@ -347,6 +371,14 @@
         <info type="FreeBSD" release="9.2"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.9 \(FreeBSD\)">
+        <info type="FreeBSD" release="9.3"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.16 \(FreeBSD\)">
+        <info type="FreeBSD" release="10.3"/>
+    </regexp>
+
     <!-- Apache: Mandrake / Mandriva -->
 
     <regexp value="Apache/1\.3\.6 \(Unix\)\s+\(Mandrake/Linux\)">
@@ -642,6 +674,10 @@
         <info type="Linux" distrib="SuSE" release="13.1"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.10 \(Linux/SuSE\)">
+        <info type="Linux" distrib="SuSE" release="13.2"/>
+    </regexp>
+
     <!-- Apache: Ubuntu -->
 
     <regexp value="Apache/2\.0\.50 \(Ubuntu\)">
@@ -708,6 +744,18 @@
         <info type="Linux" distrib="Ubuntu" release="13.10" codename="Saucy Salamander"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.10 \(Ubuntu\)">
+        <info type="Linux" distrib="Ubuntu" release="14.10|15.04" codename="utopic|vivid"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.12 \(Ubuntu\)">
+        <info type="Linux" distrib="Ubuntu" release="15.10" codename="willy"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.18 \(Ubuntu\)">
+        <info type="Linux" distrib="Ubuntu" release="16.04" codename="xenial"/>
+    </regexp>
+
     <!-- Nginx -->
 
     <regexp value="nginx/([\w\.]+)">