From 3512068a491aa3fb1952583dc2df54b197e2023a Mon Sep 17 00:00:00 2001
From: Brian Ginsbach <31138029+bginsbach@users.noreply.github.com>
Date: Sat, 19 Aug 2017 03:53:25 -0500
Subject: [PATCH] [PKGS-7380] Fix NetBSD packages vulnerabilities file name
(#443)
* [PKGS-7380] Fix NetBSD packages vulnerabilities file name
* OS Detection: Add early Mac OS X releases
---
include/osdetection | 7 +++++++
include/tests_ports_packages | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/osdetection b/include/osdetection
index 44a0947d..0f4a7b24 100644
--- a/include/osdetection
+++ b/include/osdetection
@@ -46,6 +46,13 @@
OS_VERSION_NAME="unknown"
OS_FULLNAME="macOS (unknown version)"
case ${OS_VERSION} in
+ 10.0 | 10.0.[0-9]*) OS_FULLNAME="Mac OS X 10.0 (Cheetah)" ;;
+ 10.1 | 10.1.[0-9]*) OS_FULLNAME="Mac OS X 10.1 (Puma)" ;;
+ 10.2 | 10.2.[0-9]*) OS_FULLNAME="Mac OS X 10.2 (Jaguar)" ;;
+ 10.3 | 10.3.[0-9]*) OS_FULLNAME="Mac OS X 10.3 (Panther)" ;;
+ 10.4 | 10.4.[0-9]*) OS_FULLNAME="Mac OS X 10.4 (Tiger)" ;;
+ 10.5 | 10.5.[0-9]*) OS_FULLNAME="Mac OS X 10.5 (Leopard)" ;;
+ 10.6 | 10.6.[0-9]*) OS_FULLNAME="Mac OS X 10.6 (Snow Leopard)" ;;
10.7 | 10.7.[0-9]*) OS_FULLNAME="Mac OS X 10.7 (Lion)" ;;
10.8 | 10.8.[0-9]*) OS_FULLNAME="Mac OS X 10.8 (Mountain Lion)" ;;
10.9 | 10.9.[0-9]*) OS_FULLNAME="Mac OS X 10.9 (Mavericks)" ;;
diff --git a/include/tests_ports_packages b/include/tests_ports_packages
index a804113d..06fd1c4b 100644
--- a/include/tests_ports_packages
+++ b/include/tests_ports_packages
@@ -693,7 +693,7 @@
if [ -x ${ROOTDIR}usr/sbin/pkg_admin ]; then
PACKAGE_AUDIT_TOOL_FOUND=1
PACKAGE_AUDIT_TOOL="pkg_admin audit"
- if [ -f ${ROOTDIR}var/db/pkg/pkgs-vulnerabilities ]; then
+ if [ -f ${ROOTDIR}var/db/pkg/pkg-vulnerabilities ]; then
FIND=$(${ROOTDIR}usr/sbin/pkg_admin audit)
if [ -z "${FIND}" ]; then
LogText "Result: pkg_admin audit results are clean"