Index: branches/2020Q2/security/lynis/Makefile
===================================================================
--- branches/2020Q2/security/lynis/Makefile	(revision 539613)
+++ branches/2020Q2/security/lynis/Makefile	(revision 539614)
@@ -1,46 +1,46 @@
 # Created by: Cory McIntire (loon@noncensored.com)
 # $FreeBSD$
 
 PORTNAME=	lynis
-PORTVERSION=	2.7.5
+PORTVERSION=	3.0.0
 CATEGORIES=	security
 MASTER_SITES=	https://cisofy.com/files/
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Security and system auditing tool
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	lsof:sysutils/lsof
 
 USES=		cpe
 CPE_VENDOR=	cisofy
 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}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/default.prf \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}/default.prf.sample
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "include db plugins" ${STAGEDIR}${DATADIR}/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/extras/bash_completion.d/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2020Q2/security/lynis/distinfo
===================================================================
--- branches/2020Q2/security/lynis/distinfo	(revision 539613)
+++ branches/2020Q2/security/lynis/distinfo	(revision 539614)
@@ -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
Index: branches/2020Q2/security/lynis/pkg-plist
===================================================================
--- branches/2020Q2/security/lynis/pkg-plist	(revision 539613)
+++ branches/2020Q2/security/lynis/pkg-plist	(revision 539614)
@@ -1,100 +1,98 @@
 bin/lynis
 etc/bash_completion.d/lynis
 @sample %%ETCDIR%%/default.prf.sample
 man/man8/lynis.8.gz
 %%DATADIR%%/db/fileperms.db
 %%DATADIR%%/db/hints.db
 %%DATADIR%%/db/integrity.db
 %%DATADIR%%/db/languages/az
 %%DATADIR%%/db/languages/br
 %%DATADIR%%/db/languages/cn
 %%DATADIR%%/db/languages/da
 %%DATADIR%%/db/languages/de
 %%DATADIR%%/db/languages/en
 %%DATADIR%%/db/languages/en-GB
 %%DATADIR%%/db/languages/en-US
 %%DATADIR%%/db/languages/es
 %%DATADIR%%/db/languages/fi
 %%DATADIR%%/db/languages/fr
 %%DATADIR%%/db/languages/gr
 %%DATADIR%%/db/languages/he
 %%DATADIR%%/db/languages/hu
 %%DATADIR%%/db/languages/it
 %%DATADIR%%/db/languages/ja
 %%DATADIR%%/db/languages/ko
 %%DATADIR%%/db/languages/nb-NO
 %%DATADIR%%/db/languages/nl
 %%DATADIR%%/db/languages/nl-BE
 %%DATADIR%%/db/languages/nl-NL
 %%DATADIR%%/db/languages/pl
 %%DATADIR%%/db/languages/pt
 %%DATADIR%%/db/languages/ru
 %%DATADIR%%/db/languages/se
 %%DATADIR%%/db/languages/sk
 %%DATADIR%%/db/languages/tr
 %%DATADIR%%/db/malware-susp.db
 %%DATADIR%%/db/malware.db
 %%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
 %%DATADIR%%/include/functions
 %%DATADIR%%/include/helper_audit_dockerfile
 %%DATADIR%%/include/helper_configure
 %%DATADIR%%/include/helper_generate
 %%DATADIR%%/include/helper_show
 %%DATADIR%%/include/helper_system_remote_scan
 %%DATADIR%%/include/helper_update
 %%DATADIR%%/include/osdetection
 %%DATADIR%%/include/parameters
 %%DATADIR%%/include/profiles
 %%DATADIR%%/include/report
 %%DATADIR%%/include/tests_accounting
 %%DATADIR%%/include/tests_authentication
 %%DATADIR%%/include/tests_banners
 %%DATADIR%%/include/tests_boot_services
 %%DATADIR%%/include/tests_containers
 %%DATADIR%%/include/tests_crypto
 %%DATADIR%%/include/tests_custom.template
 %%DATADIR%%/include/tests_databases
 %%DATADIR%%/include/tests_dns
 %%DATADIR%%/include/tests_file_integrity
 %%DATADIR%%/include/tests_file_permissions
 %%DATADIR%%/include/tests_filesystems
 %%DATADIR%%/include/tests_firewalls
 %%DATADIR%%/include/tests_hardening
 %%DATADIR%%/include/tests_homedirs
 %%DATADIR%%/include/tests_insecure_services
 %%DATADIR%%/include/tests_kernel
 %%DATADIR%%/include/tests_kernel_hardening
 %%DATADIR%%/include/tests_ldap
 %%DATADIR%%/include/tests_logging
 %%DATADIR%%/include/tests_mac_frameworks
 %%DATADIR%%/include/tests_mail_messaging
 %%DATADIR%%/include/tests_malware
 %%DATADIR%%/include/tests_memory_processes
 %%DATADIR%%/include/tests_nameservices
 %%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
 %%DATADIR%%/include/tests_squid
 %%DATADIR%%/include/tests_ssh
 %%DATADIR%%/include/tests_storage
 %%DATADIR%%/include/tests_storage_nfs
 %%DATADIR%%/include/tests_system_integrity
 %%DATADIR%%/include/tests_time
 %%DATADIR%%/include/tests_tooling
 %%DATADIR%%/include/tests_usb
 %%DATADIR%%/include/tests_virtualization
 %%DATADIR%%/include/tests_webservers
 %%DATADIR%%/include/tool_tips
-@mode
 %%DATADIR%%/plugins/README
 %%DATADIR%%/plugins/custom_plugin.template
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 539613)
+++ branches/2020Q2	(revision 539614)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r539543