From f7a291a62f2e4747eb7624f06a0c34581cfb9f3f Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Mon, 4 Mar 2019 12:33:03 +0100
Subject: [PATCH] Use datestamps instead of date, due to compatibility with
 other platforms

---
 db/software-eol.db  | 48 +++++++++++++++++++++++++++------------------
 include/osdetection |  8 +++-----
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/db/software-eol.db b/db/software-eol.db
index 9bf96c12..56b3cb76 100644
--- a/db/software-eol.db
+++ b/db/software-eol.db
@@ -1,22 +1,32 @@
+#
 # End-of-life for operating systems and software
+#
+# This file has 4 fields:
+# 1) category
+# 2) name
+# 3) date (human-readable)
+# 4) converted date (seconds since epoch)
+#
+# Date can be converted on Linux using: date "+%s" --date=2020-01-01
+#
 # FreeBSD - https://www.freebsd.org/releases/
-os:FreeBSD 9.3:2014-07-01:
-os:FreeBSD 10.0:2014-01-01:
-os:FreeBSD 10.1:2014-11-01:
-os:FreeBSD 10.2:2015-08-01:
-os:FreeBSD 10.3:2016-04-01:
-os:FreeBSD 10.4:2017-10-01:
-os:FreeBSD 11.0:2016-10-01:
-os:FreeBSD 11.1:2017-07-01:
+os:FreeBSD 9.3:2014-07-01:1404165600:
+os:FreeBSD 10.0:2014-01-01:1388530800:
+os:FreeBSD 10.1:2014-11-01:0:
+os:FreeBSD 10.2:2015-08-01:0:
+os:FreeBSD 10.3:2016-04-01:0:
+os:FreeBSD 10.4:2017-10-01:0:
+os:FreeBSD 11.0:2016-10-01:0:
+os:FreeBSD 11.1:2017-07-01:0:
 # Ubuntu - https://wiki.ubuntu.com/Kernel/LTSEnablementStack
-os:Ubuntu 14.04:2019-05-01:
-os:Ubuntu 14.10:2015-07-01:
-os:Ubuntu 15.04:2016-01-01:
-os:Ubuntu 15.10:2016-07-01:
-os:Ubuntu 16.04:2021-05-01:
-os:Ubuntu 16.10:2017-07-01:
-os:Ubuntu 17.04:2018-01-01:
-os:Ubuntu 17.10:2018-07-01:
-os:Ubuntu 18.04:2023-05-01:
-os:Ubuntu 18.10:2019-07-01:
-os:Ubuntu 19.04:2020-01-01:
\ No newline at end of file
+os:Ubuntu 14.04:2019-05-01:0:
+os:Ubuntu 14.10:2015-07-01:0:
+os:Ubuntu 15.04:2016-01-01:0:
+os:Ubuntu 15.10:2016-07-01:0:
+os:Ubuntu 16.04:2021-05-01:0:
+os:Ubuntu 16.10:2017-07-01:0:
+os:Ubuntu 17.04:2018-01-01:0:
+os:Ubuntu 17.10:2018-07-01:0:
+os:Ubuntu 18.04:2023-05-01:1682892000:
+os:Ubuntu 18.10:2019-07-01:1561932000:
+os:Ubuntu 19.04:2020-01-01:1577833200:
\ No newline at end of file
diff --git a/include/osdetection b/include/osdetection
index ef105eba..069167bb 100644
--- a/include/osdetection
+++ b/include/osdetection
@@ -515,13 +515,11 @@
     if [ ! -z "${OS_VERSION}" ]; then
         if [ -f "${DBDIR}/software-eol.db" ]; then
             FIND="${OS_FULLNAME}"
-            EOL_DATE=$(awk -v value="${FIND}" -F: '{if ($1=="os" && value ~ $2){print $3}}' ${DBDIR}/software-eol.db | head -n 1)
-            #EOL_DATE=$(grep "os:${FIND}" ${DBDIR}/software-eol.db | awk -F: '{print $3}' | head -n 1)
+            EOL_DATE=$(awk -v value="${FIND}" -F: '{if ($1=="os" && value ~ $2){print $4}}' ${DBDIR}/software-eol.db | head -n 1)
             if [ ! -z "${EOL_DATE}" ]; then
                 NOW=$(date "+%s")
-                FIND=$(date "+%s" --date=${EOL_DATE})
-                if [ ! -z "${FIND}" ]; then
-                    if [ ${NOW} -gt ${FIND} ]; then
+                if [ ! -z "${NOW}" ]; then
+                    if [ ${NOW} -gt ${EOL_DATE} ]; then
                         EOL=1
                     else
                         EOL=0