- Update to 2.2.8

PR:		ports/97884
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com> (maintainer)

12 files changed, 35 insertions, 44 deletions

diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index db548c3c4b42..7df849f85cfe 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -20,8 +20,6 @@ COMMENT=	Nessus Attack Scripting Language
 
 LIB_DEPENDS=	nessus.4:${PORTSDIR}/security/nessus-libraries
 
-CONFLICTS=	nessus-libnasl-devel-[0-9]*
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
diff --git a/security/nessus-libnasl/distinfo b/security/nessus-libnasl/distinfo
index 03470d99f6fe..1d95dedfd514 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1,3 +1,3 @@
-MD5 (nessus/libnasl-2.2.7.tar.gz) = 37f6f0db022dad1e218371909de3e8af
-SHA256 (nessus/libnasl-2.2.7.tar.gz) = 6e40f246bc4ff3a7adb48fa417692df02e087c72c372374d88e1175941a5cd00
-SIZE (nessus/libnasl-2.2.7.tar.gz) = 364755
+MD5 (nessus/libnasl-2.2.8.tar.gz) = 07e8d9f06862cb240ede348713cfe31b
+SHA256 (nessus/libnasl-2.2.8.tar.gz) = bf9552443b9d016f6f5861a713f9167efcd9f979fcb6112e6c638541d4e20a1d
+SIZE (nessus/libnasl-2.2.8.tar.gz) = 366779
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index a401c19df47f..4008f08510a7 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -9,7 +9,7 @@
 # client.
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -21,8 +21,6 @@ DISTNAME=	nessus-libraries-${PORTVERSION}
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	Libraries for Nessus, the security scanner
 
-CONFLICTS=	nessus-libraries-devel-[0-9]*
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 7ac598e59e16..d8c8464d2375 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1,3 +1,3 @@
-MD5 (nessus/nessus-libraries-2.2.7.tar.gz) = 740d9f2d97c495a52663a15a0fe5e6cd
-SHA256 (nessus/nessus-libraries-2.2.7.tar.gz) = 5aefd97c5a400088ddbf793cd4b2b688a5a9b7aec51c1403be316453f86f1834
-SIZE (nessus/nessus-libraries-2.2.7.tar.gz) = 426429
+MD5 (nessus/nessus-libraries-2.2.8.tar.gz) = 257048b54b767f54f224bd9440d2b215
+SHA256 (nessus/nessus-libraries-2.2.8.tar.gz) = ed3e072d241352e5cc941d9b5b9acc2f38858c7d806b7a0e4a865c854193aa03
+SIZE (nessus/nessus-libraries-2.2.8.tar.gz) = 426546
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 5d1dfbc06374..6ea6084ba85e 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -22,8 +22,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/n
 RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \
 		nmap:${PORTSDIR}/security/nmap
 
-CONFLICTS=	nessus-plugins-devel-[0-9]*
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
 
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index 2d999f61e092..8c0629f804c9 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (nessus/nessus-plugins-GPL-2.2.7.tar.gz) = 2e51f5ad96dd55888e835382a61de585
-SHA256 (nessus/nessus-plugins-GPL-2.2.7.tar.gz) = 1be559d0c1fd5409e273f816fd59fa133d3344df472699585249cedde576a5ea
-SIZE (nessus/nessus-plugins-GPL-2.2.7.tar.gz) = 1032442
+MD5 (nessus/nessus-plugins-GPL-2.2.8.tar.gz) = 02bc619c89b9615e27f684f97d471c85
+SHA256 (nessus/nessus-plugins-GPL-2.2.8.tar.gz) = 436f8e49ff7bec273f12ad8e8e47a9b50c3935118c25e383ae379dca13aacaaf
+SIZE (nessus/nessus-plugins-GPL-2.2.8.tar.gz) = 1045101
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index 8de2b1b169da..3f10c40dd190 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -75,6 +75,7 @@ lib/nessus/plugins/TelSrv_DoS.nasl
 lib/nessus/plugins/W32.Sasser.Worm.nasl
 lib/nessus/plugins/Xeneo_Web_Server_2.2.9.0_DoS.nasl
 lib/nessus/plugins/Xerver_DoS.nasl
+lib/nessus/plugins/aardvark_422_remote_file_include.nasl
 lib/nessus/plugins/abyss_msdos_dos.nasl
 lib/nessus/plugins/acc.nasl
 lib/nessus/plugins/account_bash.nasl
@@ -92,6 +93,7 @@ lib/nessus/plugins/account_super_forgot.nasl
 lib/nessus/plugins/account_swift_swift.nasl
 lib/nessus/plugins/account_user_debug.nasl
 lib/nessus/plugins/account_user_forgot.nasl
+lib/nessus/plugins/admbook_cmd_exec.nasl
 lib/nessus/plugins/advanced_guestbook.nasl
 lib/nessus/plugins/afs_version.nasl
 lib/nessus/plugins/agora.nasl
@@ -180,6 +182,7 @@ lib/nessus/plugins/bugbear_b.nasl
 lib/nessus/plugins/bugbear_b_1080.nasl
 lib/nessus/plugins/bugport_attachment_handling_flaw.nasl
 lib/nessus/plugins/bugzilla_remote_exec.nasl
+lib/nessus/plugins/burning_board_database_sql_injection.nasl
 lib/nessus/plugins/cachemgr_cgi.nasl
 lib/nessus/plugins/cactuShop_multiple_flaws.nasl
 lib/nessus/plugins/calendar_express_flaws.nasl
@@ -322,6 +325,7 @@ lib/nessus/plugins/finger_overflow.nasl
 lib/nessus/plugins/formmail_pl.nasl
 lib/nessus/plugins/fortigate_detect.nasl
 lib/nessus/plugins/foxweb_dll.nasl
+lib/nessus/plugins/free_articles_directory_file_includes.nasl
 lib/nessus/plugins/frontpage_overflow.nasl
 lib/nessus/plugins/ftp_administrator.nasl
 lib/nessus/plugins/ftp_func.inc
@@ -334,6 +338,7 @@ lib/nessus/plugins/ftpglob.nasl
 lib/nessus/plugins/fusetalk_forum_xss.nasl
 lib/nessus/plugins/fw1_udp_DoS.nasl
 lib/nessus/plugins/gator.nasl
+lib/nessus/plugins/gcards_dir_transversal.nasl
 lib/nessus/plugins/generic_WEB-INF.nasl
 lib/nessus/plugins/gentoo_GLSA-200409-14.nasl
 lib/nessus/plugins/gentoo_GLSA-200411-01.nasl
@@ -477,6 +482,8 @@ lib/nessus/plugins/iplanet_data_snag.nasl
 lib/nessus/plugins/iplanet_perf.nasl
 lib/nessus/plugins/ipswitch_IMail_bo.nasl
 lib/nessus/plugins/ipswitch_IMail_version.nasl
+lib/nessus/plugins/ipswitch_whatsup_auth_bypass.nasl
+lib/nessus/plugins/ipswitch_whatsup_info_disclosure.nasl
 lib/nessus/plugins/ircd.nasl
 lib/nessus/plugins/ircd_ignition_ircop_vuln.nasl
 lib/nessus/plugins/iss_deploymanager.nasl
@@ -551,6 +558,7 @@ lib/nessus/plugins/mdaemon_imap_server_dos2.nasl
 lib/nessus/plugins/mdaemon_mail_server_dos.nasl
 lib/nessus/plugins/merak_multiple_vulns.nasl
 lib/nessus/plugins/mercora_imradio_installed.nasl
+lib/nessus/plugins/mercur_imap_buffer_overflow.nasl
 lib/nessus/plugins/metacart_sql.nasl
 lib/nessus/plugins/minishare_overflow.nasl
 lib/nessus/plugins/misc_format_string.nasl
@@ -581,8 +589,10 @@ lib/nessus/plugins/mssql_hello_overflow.nasl
 lib/nessus/plugins/mssql_ping.nasl
 lib/nessus/plugins/mssqlserver_detect.nasl
 lib/nessus/plugins/mt-load_cgi.nasl
+lib/nessus/plugins/mtl_remote_file_include.nasl
 lib/nessus/plugins/multiple_ftpd_dos.nasl
 lib/nessus/plugins/mvnforum_search_xss.nasl
+lib/nessus/plugins/myevent_multiple_flaws.nasl
 lib/nessus/plugins/myserver_dir_list_and_xss.nasl
 lib/nessus/plugins/myserver_post_dos.nasl
 lib/nessus/plugins/myserver_traversal.nasl
@@ -704,6 +714,7 @@ lib/nessus/plugins/phorum_register_xss.nasl
 lib/nessus/plugins/php3_path_disclosure.nasl
 lib/nessus/plugins/phpMyAdmin_remote_cmd.nasl
 lib/nessus/plugins/phpMyAdmin_xss.nasl
+lib/nessus/plugins/phpMyAgenda_30final_file_include.nasl
 lib/nessus/plugins/phpSurveyor_sql_inject.nasl
 lib/nessus/plugins/php_apache_win32_default.nasl
 lib/nessus/plugins/php_arbitrary_file_access.nasl
@@ -735,6 +746,7 @@ lib/nessus/plugins/phpgroupware_sql_injection.nasl
 lib/nessus/plugins/phpgroupware_xss.nasl
 lib/nessus/plugins/phpinfo.nasl
 lib/nessus/plugins/phpix.nasl
+lib/nessus/plugins/phplistpro_remote_file_include.nasl
 lib/nessus/plugins/phpmyfaq_action_parameter_flaw.nasl
 lib/nessus/plugins/phprocketaddin_traversal.nasl
 lib/nessus/plugins/phptonuke_dir_trav.nasl
@@ -1011,8 +1023,10 @@ lib/nessus/plugins/w_agora_dir_traversal.nasl
 lib/nessus/plugins/w_agora_dir_traversal2.nasl
 lib/nessus/plugins/wackowiki_xss.nasl
 lib/nessus/plugins/webadmin.nasl
+lib/nessus/plugins/webalbum_local_file_include.nasl
 lib/nessus/plugins/webalizer.nasl
 lib/nessus/plugins/webapp_apage_cmd_exe.nasl
+lib/nessus/plugins/webcalendar_info_disclosure.nasl
 lib/nessus/plugins/webcart_cmd_exec.nasl
 lib/nessus/plugins/webfroot_shoutbox_traversal.nasl
 lib/nessus/plugins/webgui_remote_cmd_exec.nasl
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 2ba7cadedf0a..6a30a3ac4a14 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -11,7 +11,7 @@
 #  WITHOUT_NESSUS_GTK
 
 PORTNAME=	nessus
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -25,15 +25,13 @@ COMMENT=	A security scanner: looks for vulnerabilities in a given network
 
 LIB_DEPENDS=	nasl.4:${PORTSDIR}/security/nessus-libnasl
 
-CONFLICTS=	nessus-devel-[0-9]* nessus-devel-gtk-[0-9]* \
-		nessus-devel-gtk2-[0-9]*
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall.sh
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	PKGNAME=${PKGNAME}
 
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	YES
+USE_RC_SUBR=	nessusd.sh
 WANT_GNOME=	yes
 .if defined(WITHOUT_NESSUS_GTK) || defined(WITHOUT_GTK)
 WITHOUT_GNOME=	yes
@@ -54,21 +52,7 @@ CONFIGURE_ARGS+=--disable-gtk
 MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1 nessus-fetch.1
 MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
 
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
-		RC_SUBR=${RC_SUBR}
-
-SED_SCRIPT=	-e 's,%%PKGNAME%%,${PKGNAME},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g'
-
-post-build:
-.for script in pkg-deinstall
-	@${SED} ${SED_SCRIPT} ${SCRIPTDIR}/${script} > ${WRKDIR}/${script}.sh
-.endfor
-
 post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/nessusd.sh > ${PREFIX}/etc/rc.d/nessusd.sh
-	@${CHMOD} +x ${PREFIX}/etc/rc.d/nessusd.sh
 	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.conf \
 		> ${PREFIX}/etc/nessus/nessusd.conf.dist
 	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.rules \
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index caefd892b163..dc596fe09b8a 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1,3 +1,3 @@
-MD5 (nessus/nessus-core-2.2.7.tar.gz) = 2dd8c116b435d3ec698d3caed0b48859
-SHA256 (nessus/nessus-core-2.2.7.tar.gz) = eb6d46cd6b4f872ec6f04b825eb40bbdb0b73bf1cbc1bbc7ebf004ac942a0eee
-SIZE (nessus/nessus-core-2.2.7.tar.gz) = 673852
+MD5 (nessus/nessus-core-2.2.8.tar.gz) = 7580ed539c38b6514d1a3cdf62cbe346
+SHA256 (nessus/nessus-core-2.2.8.tar.gz) = 4efa050d0a319fa8523af6284462c45a82ec0940ed5bc20db0cb693dca75314b
+SIZE (nessus/nessus-core-2.2.8.tar.gz) = 674132
diff --git a/security/nessus/files/nessusd.sh b/security/nessus/files/nessusd.sh.in
index f5785a6405cd..f5785a6405cd 100644
--- a/security/nessus/files/nessusd.sh
+++ b/security/nessus/files/nessusd.sh.in
diff --git a/security/nessus/scripts/pkg-deinstall b/security/nessus/files/pkg-deinstall.in
index 573b33a8ace9..0f43ca05b165 100644
--- a/security/nessus/scripts/pkg-deinstall
+++ b/security/nessus/files/pkg-deinstall.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/nessus/scripts/Attic/pkg-deinstall,v 1.2 2004-12-15 16:01:51 sem Exp $
+# $FreeBSD$
 #
 
 ECHO_CMD=echo
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index f1263b9acaa5..5773a23214b3 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -7,8 +7,7 @@ bin/nessus-mkrand
 etc/nessus/nessusd.conf.dist
 etc/nessus/nessusd.rules.dist
 @exec if [ ! -f %D/etc/nessus/nessusd.conf ]; then cp -p %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; fi
-@exec if [ ! -f %D/etc/nessus/nessusd.rules ]; then cp -p %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; fi
-etc/rc.d/nessusd.sh
+@exec if [ ! -f %D/etc/nessus/nessusd.rules ]; then cp -p %D/etc/nessus/nessusd.rules.dist %D/etc/nessus/nessusd.rules; fi
 include/nessus/config.h
 include/nessus/includes.h
 include/nessus/nessus-devel.h