PR: ports/14773

Submitted by:		maintainer
Update to 0.99.1, and disable nessus for compiling in -current.
Original patch submitted by the maintainer, and some fixes from me.

5 files changed, 91 insertions, 261 deletions

diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 22762c99b11d..6a3868d89a02 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -6,31 +6,45 @@
 # $FreeBSD$
 #
 
-DISTNAME=	nessus-alpha2-fix4
-PKGNAME=	nessus-a2
+DISTNAME=	nessus-core-0.99.1
+PKGNAME=	nessus-0.99.1
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-RELEASE/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-RELEASE/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-RELEASE/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-RELEASE/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-RELEASE/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-RELEASE/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-RELEASE/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-RELEASE/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-RELEASE/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
 
 MAINTAINER=	anders@fix.no
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	nasl.99:${PORTSDIR}/security/nessus-libnasl \
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+NESSUS_REV=	${DISTNAME:S/nessus-core-//g}
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
+DIST_SUBDIR=	nessus
+WRKSRC=		${WRKDIR}/nessus-core
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV=  GTKCONFIG="${GTK_CONFIG}"
 MAN1=		nessus.1
+MAN8=		nessusd.8
+
+.include <bsd.port.pre.mk>  
+                            
+.if ${OSVERSION} >= 400001
+BROKEN=		"Can't be built successfully in -CURRENT"
+.endif 
 
 post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		@${ECHO} "=========================================================="
+		@${ECHO} "Be sure to erase your old /usr/local/share/nessus!"
+		@${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!"
+		@${ECHO} "=========================================================="
 
 .include <bsd.port.mk>
diff --git a/security/nessus-devel/distinfo b/security/nessus-devel/distinfo
index ddfaca0757a8..8f71abeb1d05 100644
--- a/security/nessus-devel/distinfo
+++ b/security/nessus-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus-alpha2-fix4.tgz) = a79cb81a4607552e1cbad2a213bba3dc
+MD5 (nessus/nessus-core-0.99.1.tar.gz) = a2bac198ccc9fbcf3af0a11270feed74
diff --git a/security/nessus-devel/files/patch-ag b/security/nessus-devel/files/patch-ag
new file mode 100644
index 000000000000..aec877fcbadd
--- /dev/null
+++ b/security/nessus-devel/files/patch-ag
@@ -0,0 +1,35 @@
+--- nessus/preferences.c.orig	Sat Nov 13 18:06:16 1999
++++ nessus/preferences.c	Tue Nov 30 20:49:15 1999
+@@ -24,7 +24,7 @@
+ #include "globals.h"
+ #include "nessus.h"
+ #ifdef ENABLE_CRYPTO_LAYER
+-#include <peks.h>
++#include "peks/peks.h"
+ #endif
+ 
+ static int preferences_new();
+@@ -60,15 +60,6 @@
+ static char * 
+ preferences_get_filename()
+ {
+-#ifdef ENABLE_CRYPTO_LAYER
+-  char *t, *s = peks_get_dirfile (NESSUS_RCFILE);
+-  if (s == 0) 
+-    return 0 ;
+-  /* peks uses another memory management */
+-  t = estrdup (s);
+-  xfree (s);
+-  return t;
+-#else
+   char* home;
+   char * ret;
+   struct passwd * pwd;
+@@ -88,7 +79,6 @@
+    return(ret);
+   } 
+   return(NULL);
+-#endif
+ }
+  
+ static int preferences_new()
diff --git a/security/nessus-devel/pkg-descr b/security/nessus-devel/pkg-descr
index 63fb5543ecf9..50ac65a809d9 100644
--- a/security/nessus-devel/pkg-descr
+++ b/security/nessus-devel/pkg-descr
@@ -1,13 +1,16 @@
-Nessus is a security scanner. That is, it's a program which will scan a
-given network and will seek for vulnerabilities which could be exploited
-by some remote intruder. 
-
-The Nessus Project was originally started by Renaud Deraison 
-(deraison@worldnet.fr). Many people contributed in many ways to the 
-project, and the Nessus core team is now made up of Alexis de Bernis
-(alexisb@mygale.org), who is the Java specialist, Noam Rathaus 
-(dolittle@isrealmail.com) who is in charge of the Nessus client for
-Windows, and Renaud Deraison who is still here and who is the project 
-leader. 
-
-Check the homepage at: http://www.nessus.org/
+The 'Nessus' Project was started in early 1998, and first released in
+April 1998. At this time, the most complete free security scanner was
+SATAN, which is clearly outdated, and you could see the emergence of
+several commercial ones, that were clearly too expensive.
+
+The Nessus Security Scanner is not only another security auditing tool. It
+is a security auditing as I think it should be - never trust the version
+number, never trust that a given service is listenning on the good port
+(do all the web servers on earth listen on port 80 ?).
+
+The Nessus Security Scanner is free, open-sourced and wants to be easy to
+use. 
+
+WWW: http://www.nessus.org/
+
+PS: To install the lot in one operation, do nessus-plugins first.
diff --git a/security/nessus-devel/pkg-plist b/security/nessus-devel/pkg-plist
index 07f218bf403d..b1e696acf33a 100644
--- a/security/nessus-devel/pkg-plist
+++ b/security/nessus-devel/pkg-plist
@@ -1,233 +1,11 @@
+include/nessus/config.h
+include/nessus/ntcompat.h
+include/nessus/includes.h
+include/nessus/nessus-devel.h
+include/nessus/nessusraw.h
+include/nessus/nessusip.h
+include/nessus/nessusicmp.h
+include/nessus/nessustcp.h
+include/nessus/nessusudp.h
 bin/nessus
-bin/nessusd
-bin/nsr2html
-lib/libnessus.a
-lib/libnessus.la
-lib/libnessus.so
-lib/libnessus.so.0
-lib/libnessusc.a
-lib/libnessusc.la
-lib/libnessusc.so
-lib/libnessusc.so.0
-lib/libpcap-nessus.a
-lib/libpcap-nessus.la
-lib/libpcap-nessus.so
-lib/libpcap-nessus.so.0
-lib/libhosts_gatherer.a
-lib/libhosts_gatherer.la
-lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.0
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-nessus/Manual
-nessus/plugins/ExAir_dos.nes
-nessus/plugins/WebSite.nes
-nessus/plugins/annex_dos.nes
-nessus/plugins/ascend_kill.nes
-nessus/plugins/ath0_hangup.nes
-nessus/plugins/auth_enabled.nes
-nessus/plugins/automountd.nes
-nessus/plugins/backorifice.nes
-nessus/plugins/bind_bof.nes
-nessus/plugins/bnc.nes
-nessus/plugins/bonk.nes
-nessus/plugins/bootparamd.nes
-nessus/plugins/bootparamd_gave_domain.nes
-nessus/plugins/campas.nes
-nessus/plugins/cfinger_search.nes
-nessus/plugins/cgi_perl.nes
-nessus/plugins/chameleon_smtpd_overflow.nes
-nessus/plugins/cisco_dos.nes
-nessus/plugins/count_cgi.nes
-nessus/plugins/daytime.nes
-nessus/plugins/default_accounts.nes
-nessus/plugins/dumpenv.nes
-nessus/plugins/ews.nes
-nessus/plugins/fakebo_overflow.nes
-nessus/plugins/faxsurvey.nes
-nessus/plugins/find_service.nes
-nessus/plugins/finger.nes
-nessus/plugins/finger_backdoor.nes
-nessus/plugins/finger_cgi.nes
-nessus/plugins/finger_redirection.nes
-nessus/plugins/firewall_icmp.nes
-nessus/plugins/frontpage.nes
-nessus/plugins/fsp_daemon.nes
-nessus/plugins/ftp_anonymous.nes
-nessus/plugins/ftp_backdoor.nes
-nessus/plugins/ftp_bounce.nes
-nessus/plugins/ftp_bounce_scan.nes
-nessus/plugins/ftp_cwd_root.nes
-nessus/plugins/ftp_get_passwd.nes
-nessus/plugins/ftp_misc_overflows.nes
-nessus/plugins/ftp_pass_overflow.nes
-nessus/plugins/ftp_pasv_dos.nes
-nessus/plugins/ftp_pasv_on_connect.nes
-nessus/plugins/ftp_realpath.nes
-nessus/plugins/ftp_root.nes
-nessus/plugins/ftp_site_exec.nes
-nessus/plugins/ftp_user_overflow.nes
-nessus/plugins/ftp_write_dirs.nes
-nessus/plugins/glimpse.nes
-nessus/plugins/gopher_as_proxy.nes
-nessus/plugins/guess_os.nes
-nessus/plugins/handler.nes
-nessus/plugins/hidepak.nes
-nessus/plugins/hidesource.nes
-nessus/plugins/hp_printer.nes
-nessus/plugins/hp_remote_print.nes
-nessus/plugins/htmlscript.nes
-nessus/plugins/iChat.nes
-nessus/plugins/iParty.nes
-nessus/plugins/icat.nes
-nessus/plugins/icmp_broadcast.nes
-nessus/plugins/icmp_maskreq.nes
-nessus/plugins/icmp_redirect.nes
-nessus/plugins/icmp_timestamp.nes
-nessus/plugins/iis_crash.nes
-nessus/plugins/iis_ftp_crash.nes
-nessus/plugins/iis_perl_problem.nes
-nessus/plugins/iis_scripts_browsable.nes
-nessus/plugins/imail_imapd.nes
-nessus/plugins/imail_imonitor.nes
-nessus/plugins/imap.nes
-nessus/plugins/in_fingerd.nes
-nessus/plugins/info2www.nes
-nessus/plugins/inn.nes
-nessus/plugins/ircd_dos.nes
-nessus/plugins/jetdirect_display_hack.nes
-nessus/plugins/jetdirect_single_thread.nes
-nessus/plugins/jj.nes
-nessus/plugins/land.nes
-nessus/plugins/linux_tftp.nes
-nessus/plugins/linux_zero_len_fragment.nes
-nessus/plugins/lpd.nes
-nessus/plugins/mdaemon.nes
-nessus/plugins/metainfo_mail.nes
-nessus/plugins/motorola_cable_modem.nes
-nessus/plugins/mountd_overflow.nes
-nessus/plugins/mspws.nes
-nessus/plugins/mspws_dotdotdot.nes
-nessus/plugins/msql_debug.nes
-nessus/plugins/msql_init.nes
-nessus/plugins/nestea.nes
-nessus/plugins/netbus_pro.nes
-nessus/plugins/netscape_PageServices.nes
-nessus/plugins/netscape_fasttrack.nes
-nessus/plugins/nfs_world_export.nes
-nessus/plugins/nis_check_domain.nes
-nessus/plugins/nis_server.nes
-nessus/plugins/nmap_tcp_connect.nes
-nessus/plugins/notes_mta_dos.nes
-nessus/plugins/nph-test-cgi.nes
-nessus/plugins/nt_ftp_guest.nes
-nessus/plugins/nt_ras_ptp.nes
-nessus/plugins/oshare.nes
-nessus/plugins/ows_overflow.nes
-nessus/plugins/pcnfsd_printerlist.nes
-nessus/plugins/pcnfsd_userlist.nes
-nessus/plugins/pcnfsd_warning.nes
-nessus/plugins/pfdispaly.nes
-nessus/plugins/phf.nes
-nessus/plugins/php.nes
-nessus/plugins/php_overflow.nes
-nessus/plugins/pmcrash.nes
-nessus/plugins/pnserver.nes
-nessus/plugins/pop3_overflow.nes
-nessus/plugins/portmap.nes
-nessus/plugins/proxy_GET.nes
-nessus/plugins/proxy_POST.nes
-nessus/plugins/proxy_connect.nes
-nessus/plugins/qpopper_overflow.nes
-nessus/plugins/queso.nes
-nessus/plugins/rcommands.nes
-nessus/plugins/recursive_finger.nes
-nessus/plugins/remwatch.nes
-nessus/plugins/rexecd.nes
-nessus/plugins/rootkit.nes
-nessus/plugins/router_dos.nes
-nessus/plugins/rpc_3270_mapper.nes
-nessus/plugins/rpc_X25.nes
-nessus/plugins/rpc_alis.nes
-nessus/plugins/rpc_database.nes
-nessus/plugins/rpc_etherstatd.nes
-nessus/plugins/rpc_keyserv.nes
-nessus/plugins/rpc_llockmgr.nes
-nessus/plugins/rpc_nlockmgr.nes
-nessus/plugins/rpc_nsed.nes
-nessus/plugins/rpc_nsemntd.nes
-nessus/plugins/rpc_rexd.nes
-nessus/plugins/rpc_rje_mapper.nes
-nessus/plugins/rpc_rquotad.nes
-nessus/plugins/rpc_rstatd.nes
-nessus/plugins/rpc_rusersd.nes
-nessus/plugins/rpc_sched.nes
-nessus/plugins/rpc_selection.nes
-nessus/plugins/rpc_showfhd.nes
-nessus/plugins/rpc_snmp.nes
-nessus/plugins/rpc_sprayd.nes
-nessus/plugins/rpc_statmon.nes
-nessus/plugins/rpc_sunlink_mapper.nes
-nessus/plugins/rpc_tfsd.nes
-nessus/plugins/rpc_walld.nes
-nessus/plugins/rpc_ypbind.nes
-nessus/plugins/rpc_yppasswdd.nes
-nessus/plugins/rpc_ypupdated.nes
-nessus/plugins/rpc_ypxfrd.nes
-nessus/plugins/sendmail.nes
-nessus/plugins/sendmail_debug.nes
-nessus/plugins/sendmail_decode.nes
-nessus/plugins/sendmail_ehlo.nes
-nessus/plugins/sendmail_expn.nes
-nessus/plugins/sendmail_helo.nes
-nessus/plugins/sendmail_overwrite.nes
-nessus/plugins/sendmail_program.nes
-nessus/plugins/sendmail_redirection_attack.nes
-nessus/plugins/sendmail_relaying.nes
-nessus/plugins/servu_dos.nes
-nessus/plugins/shell_cgi.nes
-nessus/plugins/slmail.nes
-nessus/plugins/slmail_helo.nes
-nessus/plugins/slmail_vrfy.nes
-nessus/plugins/smad.nes
-nessus/plugins/sping.nes
-nessus/plugins/ssh_insertion.nes
-nessus/plugins/standardsys.nes
-nessus/plugins/statd.nes
-nessus/plugins/sunkill.nes
-nessus/plugins/tcp_ack_scan.nes
-nessus/plugins/tcp_chorusing.nes
-nessus/plugins/tcp_fin_scan.nes
-nessus/plugins/tcp_maimon_scan.nes
-nessus/plugins/tcp_null_scan.nes
-nessus/plugins/tcp_seq.nes
-nessus/plugins/tcp_syn_scan.nes
-nessus/plugins/tcp_xmas_scan.nes
-nessus/plugins/teardrop.nes
-nessus/plugins/test-cgi.nes
-nessus/plugins/tftp_grab_file.nes
-nessus/plugins/thttpd.nes
-nessus/plugins/tooltalk.nes
-nessus/plugins/udp_scan.nes
-nessus/plugins/unfsd_bug.nes
-nessus/plugins/uploader_exe.nes
-nessus/plugins/uw_imapd.nes
-nessus/plugins/view_source_cgi.nes
-nessus/plugins/webdist.nes
-nessus/plugins/webgais.nes
-nessus/plugins/websendmail.nes
-nessus/plugins/wftp.nes
-nessus/plugins/wingate.nes
-nessus/plugins/wingate2.nes
-nessus/plugins/wingate_user.nes
-nessus/plugins/winnt_dns_flood.nes
-nessus/plugins/winnt_dns_qr.nes
-nessus/plugins/winnuke.nes
-nessus/plugins/wins_udp_flood.nes
-nessus/plugins/wrap_cgi.nes
-nessus/plugins/wu_ftpd_mkdir.nes
-nessus/plugins/x11.nes
-nessus/queso.conf
-@dirrm nessus/plugins
-@dirrm nessus/reports
-@dirrm nessus
+sbin/nessusd