4 files changed, 29 insertions, 23 deletions

diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index f327fdc180e5..a5f8963ff107 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTVERSION=	1.2.6
 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 164b15fc4fce..07909b485bba 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-1.2.5.tar.gz) = 803862261827bc564b1bd4488ab27274
+MD5 (nessus/nessus-plugins-1.2.6.tar.gz) = 846f981530aeb69107a631228942cc45
diff --git a/security/nessus-plugins/files/patch-nmap_wrapper.c b/security/nessus-plugins/files/patch-nmap_wrapper.c
deleted file mode 100644
index d7e4fc15bb91..000000000000
--- a/security/nessus-plugins/files/patch-nmap_wrapper.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 9792610592f1..86eab4bb1b07 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -88,6 +88,7 @@ lib/nessus/plugins/alibaba_pl.nasl
 lib/nessus/plugins/alibaba_tst.nasl
 lib/nessus/plugins/alienform.nasl
 lib/nessus/plugins/altavista_search.nasl
+lib/nessus/plugins/alya.nasl
 lib/nessus/plugins/amanda_detect.nasl
 lib/nessus/plugins/amanda_version.nasl
 lib/nessus/plugins/an_httpd_cgis.nasl
@@ -98,6 +99,7 @@ lib/nessus/plugins/analogx_dos.nasl
 lib/nessus/plugins/analogx_traversal.nasl
 lib/nessus/plugins/annex_dos.nasl
 lib/nessus/plugins/aolserver_default_password.nasl
+lib/nessus/plugins/apache_1_3_27.nasl
 lib/nessus/plugins/apache_Tomcat_DOS_Device_XSS.nasl
 lib/nessus/plugins/apache_Tomcat_Servlet_XSS.nasl
 lib/nessus/plugins/apache_Tomcat_TroubleShooter.nasl
@@ -163,6 +165,8 @@ 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/browsegate_http_overflows.nasl
+lib/nessus/plugins/bugbear.nasl
 lib/nessus/plugins/c32.nasl
 lib/nessus/plugins/ca_unicenter_file_transfer_service.nasl
 lib/nessus/plugins/ca_unicenter_transport_service.nasl
@@ -170,6 +174,7 @@ lib/nessus/plugins/cachefsd_overflow.nasl
 lib/nessus/plugins/cachemgr_cgi.nasl
 lib/nessus/plugins/calendar.nasl
 lib/nessus/plugins/campas.nasl
+lib/nessus/plugins/canna_overflow.nasl
 lib/nessus/plugins/cassandra_nntp_dos.nasl
 lib/nessus/plugins/cayman_any_username.nasl
 lib/nessus/plugins/cdk.nasl
@@ -248,6 +253,7 @@ lib/nessus/plugins/domino_http_dos.nasl
 lib/nessus/plugins/dragon_ftp.nasl
 lib/nessus/plugins/dragon_telnet.nasl
 lib/nessus/plugins/dtspcd.nasl
+lib/nessus/plugins/dump.inc
 lib/nessus/plugins/dumpenv.nasl
 lib/nessus/plugins/dwhttp_format_string.nasl
 lib/nessus/plugins/eDonkey_detect.nasl
@@ -313,12 +319,14 @@ lib/nessus/plugins/ftp_servu_dos2.nasl
 lib/nessus/plugins/ftp_servu_traversal.nasl
 lib/nessus/plugins/ftp_site_exec.nasl
 lib/nessus/plugins/ftp_sol_check_user.nasl
+lib/nessus/plugins/ftp_traversal.nasl
 lib/nessus/plugins/ftp_w98_devname_dos.nasl
 lib/nessus/plugins/ftp_write_dirs.nes
 lib/nessus/plugins/ftp_zaurus.nasl
 lib/nessus/plugins/ftpgate.nasl
 lib/nessus/plugins/ftpglob.nasl
 lib/nessus/plugins/ftpserver_detect_type_nd_version.nasl
+lib/nessus/plugins/gallery_injection.nasl
 lib/nessus/plugins/gatecrasher.nasl
 lib/nessus/plugins/gauntlet_overflow.nasl
 lib/nessus/plugins/generic_WEB-INF.nasl
@@ -425,6 +433,7 @@ lib/nessus/plugins/informix_traversal.nasl
 lib/nessus/plugins/infosrch.nasl
 lib/nessus/plugins/inn.nasl
 lib/nessus/plugins/innd_overflow.nasl
+lib/nessus/plugins/interchange_detect.nasl
 lib/nessus/plugins/interscan_dos.nasl
 lib/nessus/plugins/interscan_vw_cgi.nasl
 lib/nessus/plugins/iplanet_chunked_encoding.nasl
@@ -455,6 +464,7 @@ lib/nessus/plugins/lcdproc_detect.nasl
 lib/nessus/plugins/ldap_null_base.nasl
 lib/nessus/plugins/ldap_null_bind.nasl
 lib/nessus/plugins/libgtop_daemon.nasl
+lib/nessus/plugins/libwhisker_settings.nasl
 lib/nessus/plugins/linux_tftp.nes
 lib/nessus/plugins/linux_zero_len_fragment.nasl
 lib/nessus/plugins/linuxconf_detect.nasl
@@ -484,8 +494,11 @@ lib/nessus/plugins/mercure_imap_read_any_file.nasl
 lib/nessus/plugins/mercure_webview.nasl
 lib/nessus/plugins/metainfo_mail.nasl
 lib/nessus/plugins/minivend_view_page.nasl
+lib/nessus/plugins/misc_func.inc
 lib/nessus/plugins/miscflood.nasl
 lib/nessus/plugins/mkilog.nasl
+lib/nessus/plugins/mldonkey_telnet.nasl
+lib/nessus/plugins/mldonkey_www.nasl
 lib/nessus/plugins/mod_python_handle.nasl
 lib/nessus/plugins/mod_ssl_offby1.nasl
 lib/nessus/plugins/mod_ssl_overflow.nasl
@@ -583,7 +596,6 @@ lib/nessus/plugins/openssh_afs.nasl
 lib/nessus/plugins/openssh_channel.nasl
 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
@@ -631,7 +643,9 @@ lib/nessus/plugins/phorum.nasl
 lib/nessus/plugins/php.nasl
 lib/nessus/plugins/php3_path_disclosure.nasl
 lib/nessus/plugins/php4_path_disclosure.nasl
+lib/nessus/plugins/phpMyAdmin_file_reading.nasl
 lib/nessus/plugins/phpMyExplorer.nasl
+lib/nessus/plugins/phpPgAdmin_file_reading.nasl
 lib/nessus/plugins/php_4_2_x_malformed_POST.nasl
 lib/nessus/plugins/php_apache_win32_default.nasl
 lib/nessus/plugins/php_file_upload.nasl
@@ -678,6 +692,7 @@ lib/nessus/plugins/proxy_connect.nasl
 lib/nessus/plugins/proxy_port.nasl
 lib/nessus/plugins/proxy_post.nasl
 lib/nessus/plugins/proxy_use.nasl
+lib/nessus/plugins/qmtp_detect.nasl
 lib/nessus/plugins/qpopper.nasl
 lib/nessus/plugins/qpopper2.nasl
 lib/nessus/plugins/qpopper_euidl.nasl
@@ -686,6 +701,7 @@ lib/nessus/plugins/quake3_dos.nasl
 lib/nessus/plugins/queso.nes
 lib/nessus/plugins/quickstore.nasl
 lib/nessus/plugins/quote.nasl
+lib/nessus/plugins/radmin_detect.nasl
 lib/nessus/plugins/ramcrash.nasl
 lib/nessus/plugins/raptor_detect.nasl
 lib/nessus/plugins/raptor_isn.nasl
@@ -760,6 +776,8 @@ lib/nessus/plugins/rwalld_format_string.nasl
 lib/nessus/plugins/rwhois_format_string.nasl
 lib/nessus/plugins/rwhois_format_string2.nasl
 lib/nessus/plugins/samba_arbitrary_file_creation.nasl
+lib/nessus/plugins/samba_possible_overflow.nasl
+lib/nessus/plugins/sambar_DoS.nasl
 lib/nessus/plugins/sambar_cgi.nasl
 lib/nessus/plugins/sambar_mailit.nasl
 lib/nessus/plugins/sambar_pagecount.nasl
@@ -780,6 +798,7 @@ 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_ident.nasl
 lib/nessus/plugins/sendmail_local_overflow.nasl
 lib/nessus/plugins/sendmail_mime_overflow.nasl
 lib/nessus/plugins/sendmail_mime_overflow2.nasl
@@ -883,6 +902,7 @@ lib/nessus/plugins/smb_reg_run_permissions.nasl
 lib/nessus/plugins/smb_reg_schedule.nasl
 lib/nessus/plugins/smb_reg_service_pack.nasl
 lib/nessus/plugins/smb_reg_service_pack_W2K.nasl
+lib/nessus/plugins/smb_reg_service_pack_XP.nasl
 lib/nessus/plugins/smb_reg_sfcdisable.nasl
 lib/nessus/plugins/smb_reg_trojan_paths.nasl
 lib/nessus/plugins/smb_reg_winlogon_permissions.nasl
@@ -930,6 +950,7 @@ lib/nessus/plugins/snmp_portscan.nes
 lib/nessus/plugins/snmp_processes.nasl
 lib/nessus/plugins/snmp_sysDesc.nasl
 lib/nessus/plugins/snmp_vacm.nasl
+lib/nessus/plugins/socks4a_hostname_overflow.nasl
 lib/nessus/plugins/sojourn.nasl
 lib/nessus/plugins/spinclient.nasl
 lib/nessus/plugins/sqlqhit_information_disclosure.nasl
@@ -988,6 +1009,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/ttyprompt.nasl
 lib/nessus/plugins/typsoft_ftp_DoS.nasl
 lib/nessus/plugins/ultraseek_detect.nasl
 lib/nessus/plugins/ultraseek_dos.nasl
@@ -1065,6 +1087,8 @@ 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_header10.nasl
+lib/nessus/plugins/www_too_long_header11.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
@@ -1075,6 +1099,8 @@ lib/nessus/plugins/wwwwais.nasl
 lib/nessus/plugins/xdmcp.nasl
 lib/nessus/plugins/xitami_overflow.nasl
 lib/nessus/plugins/xmail_overflow.nasl
+lib/nessus/plugins/xtel_detect.nasl
+lib/nessus/plugins/xtelw_detect.nasl
 lib/nessus/plugins/xtramail_control.nasl
 lib/nessus/plugins/xtramail_helo.nasl
 lib/nessus/plugins/xtramail_pop_overflow.nasl