* Upgrade to 1.2.5

* Fix a problem with hanging clients during a nmap scan

PR:		ports/42057
Submitted by:	maintainer
Approved by:	dwcjr (mentor)

10 files changed, 74 insertions, 8 deletions

diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 5b0666b7c2db..db87a7babb7e 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus-libnasl/distinfo b/security/nessus-libnasl/distinfo
index 510861dc5949..92824ba7ac08 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1 +1 @@
-MD5 (nessus/libnasl-1.2.4.tar.gz) = 84d7fae1936675eefe1eb6e211ed3e79
+MD5 (nessus/libnasl-1.2.5.tar.gz) = 87c1bc9bee1569f76232fcd4804980e4
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 2384275e8e4b..a86d4fbccda5 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 61560f5d3af2..dc519d170444 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-1.2.4.tar.gz) = cf5710033fad10863d3ce862de3278ae
+MD5 (nessus/nessus-libraries-1.2.5.tar.gz) = 1a0c73a00b0a22aef6e01c323bdb77d0
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 1881a49d4afa..8ed22e0ebf6b 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index eea672dac2e7..164b15fc4fce 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-1.2.4.tar.gz) = 7924b94a2830948ed05c7d5e97947eac
+MD5 (nessus/nessus-plugins-1.2.5.tar.gz) = 803862261827bc564b1bd4488ab27274
diff --git a/security/nessus-plugins/files/patch-nmap_wrapper.c b/security/nessus-plugins/files/patch-nmap_wrapper.c
new file mode 100644
index 000000000000..d7e4fc15bb91
--- /dev/null
+++ b/security/nessus-plugins/files/patch-nmap_wrapper.c
@@ -0,0 +1,19 @@
+--- plugins/nmap_wrapper/nmap_wrapper.c.orig	Wed Aug  7 16:59:06 2002
++++ plugins/nmap_wrapper/nmap_wrapper.c	Fri Aug 16 16:13:48 2002
+@@ -612,14 +612,12 @@
+  Hostinfos = hostinfos;
+  
+ #ifdef FAKE_PROGRESS_BAR
++ signal(SIGALRM, SIG_IGN);
++ alarm(0);
+  signal(SIGALRM, update_progress_bar);
+  alarm(1);
+ #endif
+  fp = ptycall_nmap (desc, NMAP, argv, &nmap_pid);
+-#ifdef FAKE_PROGRESS_BAR
+- signal(SIGALRM, SIG_IGN);
+- alarm(0);
+-#endif
+  destroy_argv (argv);
+  }
+ 
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index 54ad11bdc125..ec9318e9fc32 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -2,6 +2,8 @@ bin/nessus-build
 etc/nessus/accounts.txt
 etc/nessus/queso.conf
 lib/nessus/plugins/3com_switches.nasl
+lib/nessus/plugins/3com_hub.nes
+lib/nessus/plugins/AnyForm.nasl
 lib/nessus/plugins/BEA_weblogic_Reveal_Script_Code.nasl
 lib/nessus/plugins/BEA_weblogic_Reveal_Script_Code_2.nasl
 lib/nessus/plugins/CSCdi34061.nasl
@@ -43,6 +45,7 @@ lib/nessus/plugins/DDI_PIX_Firewall_Manager.nasl
 lib/nessus/plugins/DDI_Unprotected_PCanywhere.nasl
 lib/nessus/plugins/DDI_Unprotected_SiteScope.nasl
 lib/nessus/plugins/DDI_WhatsUp_Default.nasl
+lib/nessus/plugins/DDI_ws_ftp-server-cpwd-bo.nasl
 lib/nessus/plugins/ExAir_dos_advsearch.nasl
 lib/nessus/plugins/ExAir_dos_query.nasl
 lib/nessus/plugins/ExAir_dos_search.nasl
@@ -56,6 +59,8 @@ lib/nessus/plugins/Omnihttpd_pro_source_disclosure.nasl
 lib/nessus/plugins/PC_anywhere.nasl
 lib/nessus/plugins/PC_anywhere_tcp.nasl
 lib/nessus/plugins/PGPCert_DoS.nasl
+lib/nessus/plugins/PHPAdsNew.nasl
+lib/nessus/plugins/PWS_DoS.nasl
 lib/nessus/plugins/RA_ssh_detect.nasl
 lib/nessus/plugins/RA_www_detect.nasl
 lib/nessus/plugins/ShowCode.nasl
@@ -66,6 +71,7 @@ lib/nessus/plugins/Xerver_DoS.nasl
 lib/nessus/plugins/a1stats.nasl
 lib/nessus/plugins/acc.nasl
 lib/nessus/plugins/accounts.nes
+lib/nessus/plugins/achievo_code_injection.nasl
 lib/nessus/plugins/activestate_perl.nasl
 lib/nessus/plugins/admentor_login_flaw.nasl
 lib/nessus/plugins/afs_version.nasl
@@ -105,6 +111,9 @@ lib/nessus/plugins/apache_slash.nasl
 lib/nessus/plugins/apache_source_asp.nasl
 lib/nessus/plugins/apache_ssl_overflow.nasl
 lib/nessus/plugins/apache_username.nasl
+lib/nessus/plugins/apache_win32_dir_trav.nasl
+lib/nessus/plugins/appsocket_DoS.nasl
+lib/nessus/plugins/arcserve_hidden_share.nasl
 lib/nessus/plugins/arkeia.nasl
 lib/nessus/plugins/ascend_kill.nasl
 lib/nessus/plugins/asip-status.nasl
@@ -112,10 +121,13 @@ lib/nessus/plugins/asp_net_css.nasl
 lib/nessus/plugins/asp_net_path_disclosure.nasl
 lib/nessus/plugins/asp_source_data.nasl
 lib/nessus/plugins/asp_source_dot.nasl
+lib/nessus/plugins/asp_source_space.nasl
 lib/nessus/plugins/ath0_hangup.nasl
 lib/nessus/plugins/auktion_cgi.nasl
 lib/nessus/plugins/auth_enabled.nasl
 lib/nessus/plugins/avengers_news_system_command_execution.nasl
+lib/nessus/plugins/avirt_gateway_telnet.nasl
+lib/nessus/plugins/awol_injection.nasl
 lib/nessus/plugins/axent_raptor_dos.nasl
 lib/nessus/plugins/axis.nasl
 lib/nessus/plugins/axis_camera.nasl
@@ -124,6 +136,7 @@ lib/nessus/plugins/badblue_directory_traversal.nasl
 lib/nessus/plugins/badblue_get_DoS.nasl
 lib/nessus/plugins/badblue_null_byte.nasl
 lib/nessus/plugins/basilix_inc_files.nasl
+lib/nessus/plugins/basilix_webmail.nasl
 lib/nessus/plugins/bb-hist.nasl
 lib/nessus/plugins/bb-hostsvc.nasl
 lib/nessus/plugins/bboard.nasl
@@ -147,6 +160,7 @@ lib/nessus/plugins/bizdb1_search.nasl
 lib/nessus/plugins/blackice_dos.nasl
 lib/nessus/plugins/bonk.nasl
 lib/nessus/plugins/bootparamd.nasl
+lib/nessus/plugins/boozt_admin_overflow.nasl
 lib/nessus/plugins/broadvision_path_disclosure.nasl
 lib/nessus/plugins/broker_ftp.nasl
 lib/nessus/plugins/c32.nasl
@@ -191,6 +205,7 @@ lib/nessus/plugins/cisco_ssh_multiple_vulns.nasl
 lib/nessus/plugins/cisco_voip_dos.nasl
 lib/nessus/plugins/citrix_find.nasl
 lib/nessus/plugins/cmail_overflow.nasl
+lib/nessus/plugins/cobalt_cube_webmail_dir_trav.nasl
 lib/nessus/plugins/cobalt_web_admin_server.nasl
 lib/nessus/plugins/codered_x.nasl
 lib/nessus/plugins/cold_fusion_admin_dos.nasl
@@ -218,6 +233,7 @@ lib/nessus/plugins/deep_throat.nasl
 lib/nessus/plugins/delegate_overflow.nasl
 lib/nessus/plugins/deltaups_detect.nasl
 lib/nessus/plugins/dhcp.nasl
+lib/nessus/plugins/directory_manager.nasl
 lib/nessus/plugins/directoryphp.nasl
 lib/nessus/plugins/directorypro.nasl
 lib/nessus/plugins/dmail_overflow.nasl
@@ -233,11 +249,14 @@ lib/nessus/plugins/dragon_ftp.nasl
 lib/nessus/plugins/dragon_telnet.nasl
 lib/nessus/plugins/dtspcd.nasl
 lib/nessus/plugins/dumpenv.nasl
+lib/nessus/plugins/dwhttp_format_string.nasl
 lib/nessus/plugins/eDonkey_detect.nasl
+lib/nessus/plugins/eXtremail_format_strings.nasl
 lib/nessus/plugins/echo.nasl
 lib/nessus/plugins/eftp_bufferoverflow.nasl
 lib/nessus/plugins/eftp_directory_traversal.nasl
 lib/nessus/plugins/eftp_dos.nasl
+lib/nessus/plugins/eftp_root_disclosure.nasl
 lib/nessus/plugins/eicon_modem_dos.nasl
 lib/nessus/plugins/empower_path.nasl
 lib/nessus/plugins/eserv.nasl
@@ -280,6 +299,7 @@ lib/nessus/plugins/ftp_bounce.nasl
 lib/nessus/plugins/ftp_bounce_scan.nes
 lib/nessus/plugins/ftp_check_user.nasl
 lib/nessus/plugins/ftp_cwd_root.nasl
+lib/nessus/plugins/ftp_func.inc
 lib/nessus/plugins/ftp_glob_overflow.nasl
 lib/nessus/plugins/ftp_overflow.nasl
 lib/nessus/plugins/ftp_pasv_dos.nasl
@@ -344,6 +364,7 @@ lib/nessus/plugins/hyperbomb.nasl
 lib/nessus/plugins/i2odialogd.nasl
 lib/nessus/plugins/iChat.nasl
 lib/nessus/plugins/iParty.nasl
+lib/nessus/plugins/ibillpm_detect.nasl
 lib/nessus/plugins/ibm_server_code.nasl
 lib/nessus/plugins/icat.nasl
 lib/nessus/plugins/icecap_default_pw.nasl
@@ -522,11 +543,13 @@ lib/nessus/plugins/netscape_pop_auth.nasl
 lib/nessus/plugins/netscape_publishing_expert_psuser.nasl
 lib/nessus/plugins/netscape_wp_tag.nasl
 lib/nessus/plugins/netstat.nasl
+lib/nessus/plugins/nettools_cmd_exec.nasl
 lib/nessus/plugins/newdsn.nasl
 lib/nessus/plugins/newsdesk.nasl
 lib/nessus/plugins/nikto_wrapper.nes
 lib/nessus/plugins/nimda.nasl
 lib/nessus/plugins/nis_server.nasl
+lib/nessus/plugins/nisd_overflow.nasl
 lib/nessus/plugins/nmap_tcp_connect.nes
 lib/nessus/plugins/nmap_wrapper.nes
 lib/nessus/plugins/nntp_info.nasl
@@ -549,6 +572,7 @@ lib/nessus/plugins/ntp_open.nasl
 lib/nessus/plugins/ntp_overflow.nasl
 lib/nessus/plugins/oas_overflow.nasl
 lib/nessus/plugins/objectserver.nes
+lib/nessus/plugins/officescan_disclosure.nasl
 lib/nessus/plugins/oops_overflow.nasl
 lib/nessus/plugins/openlink_overflow.nasl
 lib/nessus/plugins/openssh_231.nasl
@@ -561,6 +585,8 @@ lib/nessus/plugins/openssh_uselogin.nasl
 lib/nessus/plugins/openssh_uselogin_environment.nasl
 lib/nessus/plugins/openssl_overflow.nasl
 lib/nessus/plugins/openssl_overflow_generic_test.nasl
+lib/nessus/plugins/oracle9iAS_slashdot_DoS.nasl
+lib/nessus/plugins/oracle9iAS_too_long_url.nasl
 lib/nessus/plugins/oracle9i_XSQLServlet_XSQLConfig.nasl
 lib/nessus/plugins/oracle9i_apache_dms.nasl
 lib/nessus/plugins/oracle9i_dad_admin.nasl
@@ -597,6 +623,7 @@ lib/nessus/plugins/perl_cal.nasl
 lib/nessus/plugins/perl_cgi.nasl
 lib/nessus/plugins/pfdipaly.nasl
 lib/nessus/plugins/pftp.nasl
+lib/nessus/plugins/pgpmail.nasl
 lib/nessus/plugins/pgpnet_detect.nasl
 lib/nessus/plugins/phf.nasl
 lib/nessus/plugins/phonebook.nasl
@@ -620,6 +647,7 @@ lib/nessus/plugins/php_safe_mode.nasl
 lib/nessus/plugins/php_split_mime.nasl
 lib/nessus/plugins/phpix.nasl
 lib/nessus/plugins/phprocketaddin_traversal.nasl
+lib/nessus/plugins/pi3web_dos.nasl
 lib/nessus/plugins/pi3web_isapi.nasl
 lib/nessus/plugins/pimp.nasl
 lib/nessus/plugins/ping_asp.nasl
@@ -631,6 +659,7 @@ lib/nessus/plugins/pnserver.nasl
 lib/nessus/plugins/poc32.nasl
 lib/nessus/plugins/pollit.nasl
 lib/nessus/plugins/pop3_overflow.nasl
+lib/nessus/plugins/poprelayd_auth.nasl
 lib/nessus/plugins/popserver_detect.nasl
 lib/nessus/plugins/port_shell_execution.nasl
 lib/nessus/plugins/portal_of_doom.nasl
@@ -675,6 +704,7 @@ lib/nessus/plugins/rfpoison.nasl
 lib/nessus/plugins/rh_inetd.nasl
 lib/nessus/plugins/rich_media_ecommerce_stores_sensitive_information_insecurely.nasl
 lib/nessus/plugins/rlogin.nasl
+lib/nessus/plugins/rlogin_froot.nasl
 lib/nessus/plugins/roads_cgi.nasl
 lib/nessus/plugins/rockliffe_mailsite_overflow.nasl
 lib/nessus/plugins/rover_pop3_overflow.nasl
@@ -719,6 +749,7 @@ lib/nessus/plugins/rpc_ypbind.nasl
 lib/nessus/plugins/rpc_yppasswd.nasl
 lib/nessus/plugins/rpc_ypupated.nasl
 lib/nessus/plugins/rpc_ypxfrd.nasl
+lib/nessus/plugins/rpcinfo.nasl
 lib/nessus/plugins/rpm_query.nasl
 lib/nessus/plugins/rsh.nasl
 lib/nessus/plugins/rsh_null.nasl
@@ -744,12 +775,15 @@ lib/nessus/plugins/securemote.nasl
 lib/nessus/plugins/securemote_info_leak.nasl
 lib/nessus/plugins/sedum_dos.nasl
 lib/nessus/plugins/sendmail_bt_switch.nasl
+lib/nessus/plugins/sendmail_custom_config.nasl
 lib/nessus/plugins/sendmail_debug.nasl
+lib/nessus/plugins/sendmail_debug_leak.nasl
 lib/nessus/plugins/sendmail_decode.nasl
 lib/nessus/plugins/sendmail_expn.nasl
 lib/nessus/plugins/sendmail_local_overflow.nasl
 lib/nessus/plugins/sendmail_mime_overflow.nasl
 lib/nessus/plugins/sendmail_mime_overflow2.nasl
+lib/nessus/plugins/sendmail_queue_destruction.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
 lib/nessus/plugins/sendtemp.nasl
 lib/nessus/plugins/servletExec_DoS.nasl
@@ -838,6 +872,8 @@ lib/nessus/plugins/smb_nt_ms02-017.nasl
 lib/nessus/plugins/smb_nt_ms02-018.nasl
 lib/nessus/plugins/smb_nt_ms02-024.nasl
 lib/nessus/plugins/smb_nt_ms02-029.nasl
+lib/nessus/plugins/smb_nt_ms02-042.nasl
+lib/nessus/plugins/smb_null_params_dos.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
 lib/nessus/plugins/smb_reg_hklm.nasl
 lib/nessus/plugins/smb_reg_missing_winreg.nasl
@@ -878,6 +914,7 @@ lib/nessus/plugins/smtp_program.nasl
 lib/nessus/plugins/smtp_relay.nasl
 lib/nessus/plugins/smtp_settings.nasl
 lib/nessus/plugins/smtpserver_detect.nasl
+lib/nessus/plugins/snapstream_dir_trav.nasl
 lib/nessus/plugins/snmpXdmid.nasl
 lib/nessus/plugins/snmp_cisco_type.nasl
 lib/nessus/plugins/snmp_default_communities.nasl
@@ -951,6 +988,7 @@ lib/nessus/plugins/trinity.nasl
 lib/nessus/plugins/trinoo.nasl
 lib/nessus/plugins/tripwire_webpage.nasl
 lib/nessus/plugins/ttawebtop.nasl
+lib/nessus/plugins/typsoft_ftp_DoS.nasl
 lib/nessus/plugins/ultraseek_detect.nasl
 lib/nessus/plugins/ultraseek_dos.nasl
 lib/nessus/plugins/unicast_dos.nasl
@@ -962,6 +1000,7 @@ lib/nessus/plugins/uw_imap_overflow.nasl
 lib/nessus/plugins/uw_imap_overflow_two.nasl
 lib/nessus/plugins/vftpd_overflow.nasl
 lib/nessus/plugins/view_source_cgi.nasl
+lib/nessus/plugins/viralator.nasl
 lib/nessus/plugins/visadmin.nasl
 lib/nessus/plugins/visualroute_server_detect.nasl
 lib/nessus/plugins/vnc.nasl
@@ -976,6 +1015,7 @@ lib/nessus/plugins/web_traversal.nasl
 lib/nessus/plugins/webactive_log.nasl
 lib/nessus/plugins/webalizer.nasl
 lib/nessus/plugins/webcart.nasl
+lib/nessus/plugins/webcart_cmd_exec.nasl
 lib/nessus/plugins/webdav.nasl
 lib/nessus/plugins/webdav_iis.nasl
 lib/nessus/plugins/webdist.nasl
@@ -988,6 +1028,7 @@ lib/nessus/plugins/webmin.nasl
 lib/nessus/plugins/webmirror.nasl
 lib/nessus/plugins/webplus.nasl
 lib/nessus/plugins/webplus_version.nasl
+lib/nessus/plugins/webseal_DoS.nasl
 lib/nessus/plugins/websendmail.nasl
 lib/nessus/plugins/webserver_robot.nasl
 lib/nessus/plugins/webshield.nasl
@@ -1012,16 +1053,22 @@ lib/nessus/plugins/winnt_pptp_dos.nasl
 lib/nessus/plugins/winnuke.nasl
 lib/nessus/plugins/wins_udp_flood.nasl
 lib/nessus/plugins/winsatan.nasl
+lib/nessus/plugins/wnn_overflow.nasl
 lib/nessus/plugins/worldclient_server_detection.nasl
 lib/nessus/plugins/worldspan_gw_DoS.nasl
 lib/nessus/plugins/wrap.nasl
+lib/nessus/plugins/wsftp_overflows.nasl
 lib/nessus/plugins/wu_ftpd_overflow.nasl
 lib/nessus/plugins/wu_ftpd_site_exec.nasl
 lib/nessus/plugins/wu_ftpd_site_newer.nasl
+lib/nessus/plugins/www_infinite_request_DoS.nasl
 lib/nessus/plugins/www_too_long_auth.nasl
+lib/nessus/plugins/www_too_long_cookie.nasl
+lib/nessus/plugins/www_too_long_header.nasl
 lib/nessus/plugins/www_too_long_method.nasl
 lib/nessus/plugins/www_too_long_post.nasl
 lib/nessus/plugins/www_too_long_url.nasl
+lib/nessus/plugins/www_too_long_useragent.nasl
 lib/nessus/plugins/www_too_long_version.nasl
 lib/nessus/plugins/wwwboardpwd.nasl
 lib/nessus/plugins/wwwwais.nasl
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 8d53453bc13e..17b0f6d46b6b 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index 2860da874d74..a12cc86a6072 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-1.2.4.tar.gz) = 9b19ff966ad35b631ebde067f9b35f54
+MD5 (nessus/nessus-core-1.2.5.tar.gz) = 8bd8c7c014ebca11b28e8892f8221f26