From 589300ab18cb278991e8690fbb1ecc95e0f0cbf2 Mon Sep 17 00:00:00 2001
From: Lars Engels <lme@FreeBSD.org>
Date: Fri, 19 Jun 2020 14:20:16 +0000
Subject: MFH: r539543

security/lynis: Update to 3.0.0

This is a major release but also fixes two security problems.

Security:	CVE-2019-13033 CVE-2020-13882

Approved by:	ports-secteam (joneum)
---
 security/lynis/Makefile  | 6 +++---
 security/lynis/distinfo  | 6 +++---
 security/lynis/pkg-plist | 4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/security/lynis/Makefile b/security/lynis/Makefile
index f21d00f5be87..ef9bb20da438 100644
--- a/security/lynis/Makefile
+++ b/security/lynis/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lynis
-PORTVERSION=	2.7.5
+PORTVERSION=	3.0.0
 CATEGORIES=	security
 MASTER_SITES=	https://cisofy.com/files/
 
@@ -20,14 +20,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-PORTDOCS=	FAQ README
+PORTDOCS=	FAQ README *.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/tINCLUDE_TARGETS/ s|".*"|"${DATADIR}/include"|; \
 		/tPLUGIN_TARGETS/ s|".*"|"${DATADIR}/plugins"|; \
-		/tDB_TARGETS/ s|".*"|"${DATADIR}/db"|' ${WRKSRC}/${PORTNAME}
+		/tDB_TARGETS=/ s|\(tDB_TARGETS\)=".*"|\1="${DATADIR}/db"|' ${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/security/lynis/distinfo b/security/lynis/distinfo
index 4c0ab9bf9401..029ea3b97462 100644
--- a/security/lynis/distinfo
+++ b/security/lynis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562081005
-SHA256 (lynis-2.7.5.tar.gz) = 3d27ade73a5c1248925ad9c060024940ce5d2029f40aaa901f43314888fe324d
-SIZE (lynis-2.7.5.tar.gz) = 288688
+TIMESTAMP = 1592485469
+SHA256 (lynis-3.0.0.tar.gz) = 3cc165f9007ba41de6d0b693a1167dbaf0179085f9506dcba64b4b8e37e1bda2
+SIZE (lynis-3.0.0.tar.gz) = 320637
diff --git a/security/lynis/pkg-plist b/security/lynis/pkg-plist
index f3b8d23462a3..a0c7149e291d 100644
--- a/security/lynis/pkg-plist
+++ b/security/lynis/pkg-plist
@@ -37,7 +37,6 @@ man/man8/lynis.8.gz
 %%DATADIR%%/db/sbl.db
 %%DATADIR%%/db/software-eol.db
 %%DATADIR%%/db/tests.db
-@mode 0400
 %%DATADIR%%/include/binaries
 %%DATADIR%%/include/consts
 %%DATADIR%%/include/data_upload
@@ -80,7 +79,7 @@ man/man8/lynis.8.gz
 %%DATADIR%%/include/tests_networking
 %%DATADIR%%/include/tests_php
 %%DATADIR%%/include/tests_ports_packages
-%%DATADIR%%/include/tests_printers_spools
+%%DATADIR%%/include/tests_printers_spoolers
 %%DATADIR%%/include/tests_scheduling
 %%DATADIR%%/include/tests_shells
 %%DATADIR%%/include/tests_snmp
@@ -95,6 +94,5 @@ man/man8/lynis.8.gz
 %%DATADIR%%/include/tests_virtualization
 %%DATADIR%%/include/tests_webservers
 %%DATADIR%%/include/tool_tips
-@mode
 %%DATADIR%%/plugins/README
 %%DATADIR%%/plugins/custom_plugin.template
-- 
cgit v1.2.3