From 05fa44bb052564c40510b6a343feb8135150e793 Mon Sep 17 00:00:00 2001
From: Jon Hart <jon_hart@rapid7.com>
Date: Mon, 6 Apr 2015 15:14:24 -0700
Subject: [PATCH 1/3] Remove overly loose FreeBSD SNMP sysDesc match

---
 xml/snmp_sysdescr.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 5462f9bd..02bb262d 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -2502,15 +2502,6 @@ Copyright (c) 1995-2005 by Cisco Systems
       <param pos="3" name="os.arch"/>
    </fingerprint>
 
-   <fingerprint pattern="^FreeBSD">
-      <description>FreeBSD generic</description>
-      <example>FreeBSD freebsd</example>
-      <param pos="0" name="os.certainty" value="0.5"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.product" value="Linux"/>
-      <param pos="0" name="os.device" value="General"/>
-   </fingerprint>
-
    <!--======================================================================
                               FUJI XEROX
    =======================================================================-->

From f94264920f86345859902122211ac1970e1067ce Mon Sep 17 00:00:00 2001
From: Jon Hart <jon_hart@rapid7.com>
Date: Mon, 6 Apr 2015 15:17:19 -0700
Subject: [PATCH 2/3] Correct FreeBSD fingerprint; fixes #44

---
 xml/snmp_sysdescr.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 02bb262d..cb80934f 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -2486,7 +2486,7 @@ Copyright (c) 1995-2005 by Cisco Systems
                               FreeBSD
    =======================================================================-->
 
-   <fingerprint pattern="(^FreeBSD) \S+ ([\d\.]+-(?:STABLE|RELEASE)(?:-p\d+)?).*\s(\w+)$">
+   <fingerprint pattern="^FreeBSD \S+ ([\d\.]+-(?:STABLE|RELEASE)(?:-p\d+)?).*\s(\w+)$">
       <description>FreeBSD 10.0</description>
       <example>FreeBSD freebsd-10-x64-ports-p 10.0-RELEASE-p4 FreeBSD 10.0-RELEASE-p4 #0: Tue Jun 3 13:14:57 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64</example>
       <example>FreeBSD freebsd-92-x64-snmp 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64</example>
@@ -2494,12 +2494,12 @@ Copyright (c) 1995-2005 by Cisco Systems
       <example>FreeBSD freebsd-8-stable-x64-p.vuln.lax.rapid7.com 8.4-STABLE FreeBSD 8.4-STABLE #0 r266809: Wed May 28 16:54:28 EDT 2014 root@freebsd-8-stable-x64-p.vuln.lax.rapid7.com:/usr/obj/usr/src/sys/GENERIC amd64</example>
       <example>FreeBSD freebsd-64-x64-u.vuln.lax.rapid7.com 6.4-RELEASE FreeBSD 6.4-RELEASE #0: Wed Nov 26 08:21:48 UTC 2008 root@palmer.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64</example>
       <param pos="0" name="os.certainty" value="0.9"/>
-      <param pos="0" name="os.family" value="Linux"/>
-      <param pos="0" name="os.vendor" value="Linux"/>
+      <param pos="0" name="os.vendor" value="FreeBSD"/>
+      <param pos="0" name="os.product" value="FreeBSD"/>
+      <param pos="0" name="os.family" value="FreeBSD"/>
       <param pos="0" name="os.device" value="General"/>
-      <param pos="1" name="os.product"/>
-      <param pos="2" name="os.version"/>
-      <param pos="3" name="os.arch"/>
+      <param pos="1" name="os.version"/>
+      <param pos="2" name="os.arch"/>
    </fingerprint>
 
    <!--======================================================================

From e381eebff7efc8a56a86bb42959df10a4bb800df Mon Sep 17 00:00:00 2001
From: Jon Hart <jon_hart@rapid7.com>
Date: Mon, 6 Apr 2015 15:20:06 -0700
Subject: [PATCH 3/3] Add example extractions for FreeBSD SNMP sysDesc

---
 xml/snmp_sysdescr.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index cb80934f..2dd08d04 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -2488,11 +2488,11 @@ Copyright (c) 1995-2005 by Cisco Systems
 
    <fingerprint pattern="^FreeBSD \S+ ([\d\.]+-(?:STABLE|RELEASE)(?:-p\d+)?).*\s(\w+)$">
       <description>FreeBSD 10.0</description>
-      <example>FreeBSD freebsd-10-x64-ports-p 10.0-RELEASE-p4 FreeBSD 10.0-RELEASE-p4 #0: Tue Jun 3 13:14:57 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64</example>
-      <example>FreeBSD freebsd-92-x64-snmp 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64</example>
-      <example>FreeBSD freebsd-84-x64-pkgng-p.vuln.lax.rapid7.com 8.4-RELEASE-p11 FreeBSD 8.4-RELEASE-p11 #0: Tue Jun 3 07:47:34 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64</example>
-      <example>FreeBSD freebsd-8-stable-x64-p.vuln.lax.rapid7.com 8.4-STABLE FreeBSD 8.4-STABLE #0 r266809: Wed May 28 16:54:28 EDT 2014 root@freebsd-8-stable-x64-p.vuln.lax.rapid7.com:/usr/obj/usr/src/sys/GENERIC amd64</example>
-      <example>FreeBSD freebsd-64-x64-u.vuln.lax.rapid7.com 6.4-RELEASE FreeBSD 6.4-RELEASE #0: Wed Nov 26 08:21:48 UTC 2008 root@palmer.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64</example>
+      <example os.version="10.0-RELEASE-p4" os.arch="amd64">FreeBSD freebsd-10-x64-ports-p 10.0-RELEASE-p4 FreeBSD 10.0-RELEASE-p4 #0: Tue Jun 3 13:14:57 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64</example>
+      <example os.version="9.2-RELEASE" os.arch="amd64">FreeBSD freebsd-92-x64-snmp 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64</example>
+      <example os.version="8.4-RELEASE-p11" os.arch="amd64">FreeBSD freebsd-84-x64-pkgng-p.vuln.lax.rapid7.com 8.4-RELEASE-p11 FreeBSD 8.4-RELEASE-p11 #0: Tue Jun 3 07:47:34 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64</example>
+      <example os.version="8.4-STABLE" os.arch="amd64">FreeBSD freebsd-8-stable-x64-p.vuln.lax.rapid7.com 8.4-STABLE FreeBSD 8.4-STABLE #0 r266809: Wed May 28 16:54:28 EDT 2014 root@freebsd-8-stable-x64-p.vuln.lax.rapid7.com:/usr/obj/usr/src/sys/GENERIC amd64</example>
+      <example os.version="6.4-RELEASE" os.arch="amd64">FreeBSD freebsd-64-x64-u.vuln.lax.rapid7.com 6.4-RELEASE FreeBSD 6.4-RELEASE #0: Wed Nov 26 08:21:48 UTC 2008 root@palmer.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64</example>
       <param pos="0" name="os.certainty" value="0.9"/>
       <param pos="0" name="os.vendor" value="FreeBSD"/>
       <param pos="0" name="os.product" value="FreeBSD"/>