5 files changed, 57 insertions, 39 deletions

diff --git a/security/sguil-client/Makefile b/security/sguil-client/Makefile
index cb8f4be4d46d..461f146430fc 100644
--- a/security/sguil-client/Makefile
+++ b/security/sguil-client/Makefile
@@ -6,22 +6,21 @@
 #
 
 PORTNAME=	sguil-client
-PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTVERSION=	0.7.0
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	sguil
 
 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	Sguil is a network security monitoring program
 
+LIB_DEPENDS=	tls:${PORTSDIR}/devel/tcltls
 RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib \
-		gpgv:${PORTSDIR}/security/gnupg1 \
+		gpg2:${PORTSDIR}/security/gnupg \
 		${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX \
 		${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwidgets
 
-OPTIONS=	TLS "Include openssl support" off \
-		WIRESHARK "Install wireshark" off \
+OPTIONS=	WIRESHARK "Install wireshark" off \
 		AUDIO "Install Festival Speech Synthesis" off
 
 NO_BUILD=	YES
@@ -39,7 +38,8 @@ PORTDOCS=	CHANGES FAQ INSTALL INSTALL.openbsd LICENSE.QPL \
 		OPENSSL.README TODO UPGRADE USAGE sguildb.dia
 
 LIBFILES=	SguilUtil.tcl dkffont.tcl email17.tcl extdata.tcl guilib.tcl nessusheader.html \
-		qrybuild.tcl qrylib.tcl report.tcl sancp.tcl sellib.tcl sound.tcl stdquery.tcl whois.tcl
+		qrybuild.tcl qrylib.tcl report.tcl sancp.tcl sellib.tcl sound.tcl stdquery.tcl \
+		whois.tcl
 
 IMAGES=		DarkLineDown10x9.xbm DarkLineDown12x11.xbm DarkLineDown8x7.xbm DarkLineUp10x9.xbm \
 		DarkLineUp12x11.xbm DarkLineUp8x7.xbm LightLineDown10x9.xbm LightLineDown12x11.xbm \
@@ -55,10 +55,6 @@ SCRIPTS=	mwutil.tcl repair.tcl tablelistBind.tcl tablelistConfig.tcl tablelistEd
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TLS)
-LIB_DEPENDS+=	tls:${PORTSDIR}/devel/tcltls
-.endif
-
 .if defined(WITH_WIRESHARK)
 RUN_DEPENDS+=	wireshark:${PORTSDIR}/net/wireshark
 .endif
diff --git a/security/sguil-client/distinfo b/security/sguil-client/distinfo
index 43a6e9e7b2d5..db03f570bdb5 100644
--- a/security/sguil-client/distinfo
+++ b/security/sguil-client/distinfo
@@ -1,3 +1,3 @@
-MD5 (sguil-client-0.6.1.tar.gz) = 68d209f882d4c8fa9c200ba0924b00b3
-SHA256 (sguil-client-0.6.1.tar.gz) = c493cce8c6c1d5802c2ee3d2e0b7bed913ec511bda565ad697250b23a7809dc9
-SIZE (sguil-client-0.6.1.tar.gz) = 204032
+MD5 (sguil-client-0.7.0.tar.gz) = f0841ef5e0d858a0a643fdc61294c091
+SHA256 (sguil-client-0.7.0.tar.gz) = a12aab9477edc47cce6f1dfa344808e4950c07fdce21691bf4730a43a273ec45
+SIZE (sguil-client-0.7.0.tar.gz) = 206713
diff --git a/security/sguil-client/files/patch-sguil.conf b/security/sguil-client/files/patch-sguil.conf
index 3fd50e360860..a4e2fb6e95e6 100644
--- a/security/sguil-client/files/patch-sguil.conf
+++ b/security/sguil-client/files/patch-sguil.conf
@@ -1,15 +1,20 @@
---- client/sguil.conf.orig	Fri Feb 10 08:59:33 2006
-+++ client/sguil.conf	Mon Nov 13 13:11:03 2006
-@@ -12,7 +12,7 @@
+--- client/sguil.conf.orig	2008-04-04 21:41:20.000000000 -0500
++++ client/sguil.conf	2008-04-04 21:59:36.000000000 -0500
+@@ -12,11 +12,11 @@
  set SERVERHOST demo.sguil.net
  
  # Where any required sguil libraries are (like the font chooser).
 -set SGUILLIB ./lib
-+set SGUILLIB /usr/local/bin/sguil-client/lib
++set SGUILLIB /usr/local/lib/sguil-client/
  # Debug 1=on 0=off  This is VERY chatty
  set DEBUG 1
- # Set up OpenSSL here (read ./doc/OPENSSL.README)
-@@ -30,12 +30,12 @@
+ # PATH to tls lib if needed (tcl can usually find this by default)
+-#set TLS_PATH /usr/lib/tls1.4/libtls1.4.so
++set TLS_PATH /usr/local/lib/libtls.so
+ # win32 example
+ #set TLS_PATH "c:/tcl/lib/tls1.4/tls14.dll"
+ # Path to a whois script.
+@@ -41,12 +41,12 @@
  # If you have festival installed, then you can have alerts spoken to
  # you. Set the path to the festival binary here. If you are using
  # speechd from speechio.org, then leave this commented out.
@@ -18,17 +23,17 @@
  # win32 example
  # set FESTIVAL_PATH "c:\festival\bin\festival.exe"
  #set WHOIS_PATH /common/bin/awhois.sh
- # Path to ethereal
--set ETHEREAL_PATH /usr/sbin/ethereal
-+set ETHEREAL_PATH /usr/local/bin/wireshark
+ # Path to wireshark (ethereal)
+-set WIRESHARK_PATH /usr/sbin/wireshark
++set WIRESHARK_PATH /usr/local/bin/wireshark
  # win32 example
- # set ETHEREAL_PATH "c:/progra~1/ethereal/ethereal.exe"
+ # set WIRESHARK_PATH "c:/progra~1/wireshark/wireshark.exe"
  # Where to save the temporary raw data files on the client system
-@@ -44,7 +44,7 @@
+@@ -55,7 +55,7 @@
  # win32 example
- # set ETHEREAL_STORE_DIR "c:/tmp"
+ # set WIRESHARK_STORE_DIR "c:/tmp"
  # Favorite browser for looking at sig info on snort.org
--set BROWSER_PATH /usr/bin/mozilla
+-set BROWSER_PATH /usr/bin/firefox
 +set BROWSER_PATH /usr/local/bin/firefox
  # win32 example (IE)
  # set BROWSER_PATH c:/progra~1/intern~1/iexplore.exe
diff --git a/security/sguil-client/files/patch-sguil.tk b/security/sguil-client/files/patch-sguil.tk
index 71dc6765621e..82c335f24e2a 100644
--- a/security/sguil-client/files/patch-sguil.tk
+++ b/security/sguil-client/files/patch-sguil.tk
@@ -1,11 +1,28 @@
---- client/sguil.tk.orig	Mon Nov 13 13:19:24 2006
-+++ client/sguil.tk	Mon Nov 13 13:21:03 2006
-@@ -1679,6 +1679,8 @@
+--- client/sguil.tk.orig	2008-04-10 20:14:26.000000000 -0500
++++ client/sguil.tk	2008-04-10 20:42:55.000000000 -0500
+@@ -77,7 +77,7 @@
+ 
+ # Load iwidgets and namespaces
+ if [catch {package require Iwidgets} iwidgetsVersion] {
+-    puts "ERROR: Cannot fine the Iwidgets extension."
++    puts "ERROR: Cannot find the Iwidgets extension."
+     puts "The iwidgets package is part of the incr tcl extension and is"
+     puts "available as a port/package most systems."
+     puts "See http://www.tcltk.com/iwidgets/ for more info."
+@@ -2017,11 +2017,11 @@
      set CONF_FILE $env(HOME)/sguil.conf
    } elseif { [file exists ./sguil.conf] } {
      set CONF_FILE ./sguil.conf
-+  } elseif { [file exists /usr/local/etc/sguil.conf] } {
-+    set CONF_FILE /usr/local/etc/sguil.conf
-   } elseif { [file exists /etc/sguil] &&\
-              [file isdirectory /etc/sguil] &&\
-              [file exists /etc/sguil/sguil.conf] &&\
+-  } elseif { [file exists /etc/sguil] &&\
+-             [file isdirectory /etc/sguil] &&\
+-             [file exists /etc/sguil/sguil.conf] &&\
+-             [file readable /etc/sguil/sguil.conf] } {
+-    set CONF_FILE /etc/sguil/sguil.conf
++  } elseif { [file exists /usr/local/etc/sguil-client] &&\
++             [file isdirectory /usr/local/etc/sguil-client] &&\
++             [file exists /usr/local/etc/sguil-client/sguil.conf] &&\
++             [file readable /usr/local/etc/sguil-client/sguil.conf] } {
++    set CONF_FILE /usr/local/etc/sguil-client/sguil.conf
+   } else {
+     puts "Couldn't determine where the sguil config file is"
+     puts "Looked for $env(HOME)/sguil.conf and ./sguil.conf."
diff --git a/security/sguil-client/pkg-descr b/security/sguil-client/pkg-descr
index 9e9010ffe767..36e405c48caf 100644
--- a/security/sguil-client/pkg-descr
+++ b/security/sguil-client/pkg-descr
@@ -4,13 +4,13 @@ The actual interface and GUI server are written in tcl/tk
 (www.tcl.tk). Sguil also relies on other open source software
 in order to function properly.
 
-The client requires gpg, iwidgets and other tcl packages and may
-also use wireshark, festival and tls depending on your selection
+The client requires tls, gpg, iwidgets and other tcl packages and may
+also use wireshark and festival depending on your selection
 of options.  Run "make config" in the port to see what options
 are available.
 
-Sguil currently functions as an analysis interface and has
-no snort sensor or rule management capabilities.
+Sguil currently functions as an analysis interface and does not yet
+have rule management capabilities.
 
 WWW: http://sguil.sourceforge.net/index.php
 pauls@utdallas.edu