Update portsentry from 1.0 to 1.2.

Major changes from previous version:

	Master site has moved to sourceforge
	Licence has changed to a GPL-like licence

Minor changes from previous version:
12-21-1999 - 1.1 Fixed typo in bare-bones TCP list where 524 was supposed to be for 1524.
03-31-2000 - 1.1 Updated .conf to add ipf blocking rule. Thanks Graham Dunn
<gdunn@inscriber.com>
06-08-2000 - 1.1 Fixed an error in the state engine portion that could cause an increment error
under certain conditions. Thanks Peter M. Allan <peter.m.allan@hsbcgroup.com> for finding this.
6-21-2000 - 1.1 New Features added
                - Added in feature to disable DNS host resolution by checking RESOLVE_HOST in
                conf file.
                - Added in feature to have external command run before or after blocking has
                occurred as defined in KILL_RUN_CMD_FIRST option in conf file.
                - Removed DoBlockTCP/UDP functions. Converted over to generic flag checker.
7-5-2000 - 1.1
                - Added iptables support (thanks Scott Catterton <scatterton@valinux.com>)
                - Added Makefile support for Irix
                - Put in ports for common DDOS ports
9-8-2000 - 1.1  - Added in netmask support
9-9-2000 - 1.1  - Finally moved resolver functions to own area.
                - Made CleanAndResolve to ensure DNS records returned are sanitized
                  correctly before being passed back.
3-23-2001 - 1.1 - Fixed a bug that showed up under Linux 2.4 Kernel that would cause accept
to loop. There was an error with how I used a count variable after trying to bind to ports.
If the port didn't bind the count for the openSockfd would still increment and this caused
the error to show up.
6-26-2001 - 1.1 - Added Mac OS X build support (Same as FreeBSD). Fixed bug for Advanced mode
to properly monitor 1024 ports (it only did first 1023 before). Thanks Guido.
05-23-2003 - 1.2 - Removed references to old psionic e-mail and changed license to
Common Public License.

I've also added a fix for a multi-line string constant for gcc3.

4 files changed, 24 insertions, 28 deletions

diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile
index 6ea40c46d08..54ba2ee8032 100644
--- a/security/portsentry/Makefile
+++ b/security/portsentry/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2003/07/30 05:47:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 10:08:19 agc Exp $
 #
 
-DISTNAME=	portsentry-1.0
-PKGREVISION=	2
+DISTNAME=	portsentry-1.2
 CATEGORIES=	security
-MASTER_SITES=	# was: http://www.psionic.com/tools/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sentrytools/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
-#HOMEPAGE=	http://www.psionic.com/abacus/portsentry/
+HOMEPAGE=	http://sourceforge.net/projects/sentrytools/
 COMMENT=	Detects and respond to port scans against a target host in real-time
 
-LICENSE=	portsentry-license
-
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
+WRKSRC=		${WRKDIR}/portsentry_beta
 
 ALL_TARGET=	${LOWER_OPSYS}
 
diff --git a/security/portsentry/distinfo b/security/portsentry/distinfo
index 07811c5fb4a..ec91c9bb60d 100644
--- a/security/portsentry/distinfo
+++ b/security/portsentry/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/05/01 21:32:46 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/01/22 10:08:19 agc Exp $
 
-SHA1 (portsentry-1.0.tar.gz) = b28f84bb483701380a7f004c4b13a8f52eda89ab
-Size (portsentry-1.0.tar.gz) = 43034 bytes
+SHA1 (portsentry-1.2.tar.gz) = 091124db3f9ccc29afae08d6ab1fdd073b789d0a
+Size (portsentry-1.2.tar.gz) = 48054 bytes
 SHA1 (patch-aa) = eea7602eaed3d065b4ec6002dff524bdcd846e9f
-SHA1 (patch-ab) = e76c1a4c1d7f4766b3e72f58f008e0530f85dab0
-SHA1 (patch-ac) = 7f6af88199ec110fe46a0d8de62927b19adf7305
+SHA1 (patch-ab) = 76d9062ba8fd205b05d64ce8485e1c6c294bed1a
+SHA1 (patch-ac) = eec6acd40439fff51744feb1b15e07ff0bc1d196
+SHA1 (patch-ad) = 9d1a6769bb83eff53faccbd70979c48d13f432e8
diff --git a/security/portsentry/patches/patch-ab b/security/portsentry/patches/patch-ab
index fb5ca1b5a8a..d8ab809e145 100644
--- a/security/portsentry/patches/patch-ab
+++ b/security/portsentry/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2003/05/01 21:32:46 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/22 10:08:19 agc Exp $
 
 --- portsentry.conf	1999/11/09 02:45:42	1.13
 +++ portsentry.conf	2000/02/07 15:11:33
@@ -15,9 +15,9 @@ $NetBSD: patch-ab,v 1.2 2003/05/01 21:32:46 jmmv Exp $
 -BLOCKED_FILE="/usr/local/psionic/portsentry/portsentry.blocked"
 +BLOCKED_FILE="@PKG_SYSCONFDIR@/portsentry.blocked"
  
- ###################
- # Response Options#
-@@ -158,10 +158,10 @@
+ ##############################
+ # Misc. Configuration Options#
+@@ -167,10 +167,10 @@
  #KILL_ROUTE="/sbin/route add -host $TARGET$ reject"
  
  # Generic BSD (BSDI, OpenBSD, NetBSD, FreeBSD)
diff --git a/security/portsentry/patches/patch-ac b/security/portsentry/patches/patch-ac
index cefb06b0bac..9a8f747600b 100644
--- a/security/portsentry/patches/patch-ac
+++ b/security/portsentry/patches/patch-ac
@@ -1,20 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2003/05/01 21:32:46 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2004/01/22 10:08:19 agc Exp $
 
 --- Makefile	2000/02/07 15:16:12	1.1
 +++ Makefile	2000/02/07 15:17:47
-@@ -21,9 +21,9 @@
+@@ -20,7 +20,7 @@
  #
  #
- # Generic compiler
+ # Generic compiler (usually linked to gcc on most platforms)
 -CC = cc
-+# CC = cc
- # GNU..
--#CC = gcc 
-+CC = gcc 
++#CC = cc
  
- # Normal systems flags
- CFLAGS = -O -Wall
-@@ -35,8 +35,8 @@
+ # GNU..
+ #CC = gcc 
+@@ -37,8 +37,8 @@
  #CFLAGS = -pg -O -Wall -DNODAEMON
  #LIBS = /usr/lib/libefence.a
  
@@ -25,12 +22,12 @@ $NetBSD: patch-ac,v 1.2 2003/05/01 21:32:46 jmmv Exp $
  
  all:
  		@echo "Usage: make <systype>"
-@@ -67,21 +67,17 @@
+@@ -69,21 +69,17 @@
  install:	
  		@echo "Creating psionic directory $(INSTALLDIR)"
  		@if [ ! -d $(INSTALLDIR) ]; then /bin/mkdir $(INSTALLDIR); fi
 -		@echo "Setting directory permissions"
--		chmod 700 $(INSTALLDIR)
+-		@if [ "$(INSTALLDIR)" = "/usr/local/psionic" ]; then /bin/chmod 700 $(INSTALLDIR) ; fi
  		@echo "Creating portsentry directory $(INSTALLDIR)$(CHILDDIR)"
  		@if [ ! -d $(INSTALLDIR)$(CHILDDIR) ]; then /bin/mkdir\
  			$(INSTALLDIR)$(CHILDDIR); fi