Update pipsecd to 19991014

5 files changed, 51 insertions, 19 deletions

diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index 35d44344f679..1433f384f97f 100644
--- a/net/pipsecd/Makefile
+++ b/net/pipsecd/Makefile
@@ -6,10 +6,10 @@
 # $FreeBSD$
 #
 
-DISTNAME=	pipsec-19990831
-PKGNAME=	pipsecd-19990831
+DISTNAME=	pipsec-19991014
+PKGNAME=	pipsecd-19991014
 CATEGORIES=	net security
-MASTER_SITES=	http://www.enst.fr/~beyssac/ \
+MASTER_SITES=	http://www.enst.fr/~beyssac/pipsec/ \
 		http://www.mindstep.com/pipsec/
 
 MAINTAINER=	patrick@mindstep.com
@@ -22,6 +22,7 @@ ALL_TARGET=	pipsecd
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pipsecd ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/pipsecd.sh ${PREFIX}/etc/rc.d
 	${MKDIR} ${PREFIX}/etc/ipsec
 	${INSTALL_DATA} ${WRKSRC}/pipsecd.conf.sample ${PREFIX}/etc/ipsec
 .if !defined(NOPORTDOCS)
diff --git a/net/pipsecd/distinfo b/net/pipsecd/distinfo
index eebcb4e9f6fc..bffa96b23426 100644
--- a/net/pipsecd/distinfo
+++ b/net/pipsecd/distinfo
@@ -1 +1 @@
-MD5 (pipsec-19990831.tar.gz) = 395390108fe7ca36ded292e4d5b2762c
+MD5 (pipsec-19991014.tar.gz) = d814966f46038bc79db686af7ad7351f
diff --git a/net/pipsecd/files/patch-aa b/net/pipsecd/files/patch-aa
index b84f63e1a459..88f6b6f09f59 100644
--- a/net/pipsecd/files/patch-aa
+++ b/net/pipsecd/files/patch-aa
@@ -1,26 +1,31 @@
---- Makefile.orig	Mon Aug 16 11:51:13 1999
-+++ Makefile	Mon Aug 16 12:28:08 1999
-@@ -6,17 +6,20 @@
+--- Makefile.orig	Thu Sep 16 17:44:50 1999
++++ Makefile	Thu Oct 14 10:27:50 1999
+@@ -6,10 +6,13 @@
  CLEANFILES=	*.core *.o pipsecd
  
  # Where your OpenSSL includes are located
 -INCDIR=/usr/local/ssl/include
-+INCDIR=-I$(PREFIX)/include -I$(PREFIX)/include/openssl
++INCDIR=-I$(PREFIX)/include/openssl -I$(PREFIX)/include
  
  # Where your libcrypto is located
 -LIBDIR=/usr/local/ssl/lib
 +LIBDIR=-L$(PREFIX)/lib
 +
-+# Misc Defines
++# Misc defines
 +DEFINES=-DFILE_PREFIX=\"$(PREFIX)\"
  
- # Optional (to use FreeBSD's libmd)
- #OPTLIB= -lmd
- #OPTDEF= -DUSE_SYSTEM_HASH
+ # Optional: use FreeBSD's libmd
+ #OPTLIB += -lmd
+@@ -19,10 +22,10 @@
+ #OPTDEF += -DUSE_ETHERTAP
  
  pipsecd:	tunip.c defs.h
--	gcc -Wall -I$(INCDIR) -g -o $(OPTDEF) pipsecd tunip.c -L$(LIBDIR) $(OPTLIB) -lcrypto
-+	gcc -Wall $(INCDIR) -g -o $(OPTDEF) pipsecd tunip.c $(LIBDIR) $(OPTLIB) -lcrypto $(DEFINES)
+-	gcc -Wall -I$(INCDIR) -g $(OPTDEF) -o pipsecd tunip.c -L$(LIBDIR) $(OPTLIB) -lcrypto
++	gcc -Wall $(INCDIR) -g $(OPTDEF) -o pipsecd tunip.c $(LIBDIR) $(OPTLIB) -lcrypto $(DEFINES)
  
  install: pipsecd
- 	install pipsecd /usr/local/sbin/
+-	install pipsecd /usr/local/sbin/
++	install pipsecd $(PREFIX)/sbin/
+ 
+ tar:
+ 	tar cfvz tunip.tar.gz $(DISTFILES)
diff --git a/net/pipsecd/files/patch-ac b/net/pipsecd/files/patch-ac
index 03cf242aed31..c6c28d940ce9 100644
--- a/net/pipsecd/files/patch-ac
+++ b/net/pipsecd/files/patch-ac
@@ -1,6 +1,6 @@
---- README.port.orig	Mon Aug 16 12:58:09 1999
-+++ README.port	Mon Aug 16 13:03:28 1999
-@@ -0,0 +1,19 @@
+--- README.port.orig	Thu Oct 14 12:17:02 1999
++++ README.port	Thu Oct 14 13:10:50 1999
+@@ -0,0 +1,44 @@
 +This is the ported version of the pipsecd program
 +from Pierre Beyssac at the ENST.
 +
@@ -13,7 +13,32 @@
 +Pierre Beyssac.
 +
 +You can obtain the source distribution of pipsecd at:
-+http://www.enst.fr/~beyssac/tunip.tar.gz
++http://www.enst.fr/~beyssac/pipsec/
++or
++http://www.mindstep.com/pipsec/
++
++
++Version 19991014 (pipsec-19991014.tar.gz):
++------------------------------------------
++
++This version adds the following fetures:
++- tunnels over UDP and ICMP packets (in authentication mode only).
++- logging of events to syslog
++- startup script in /usr/local/etc/rc.d (port only)
++
++
++Version 19990831 (pipsec-19990831.tar.gz):
++------------------------------------------
++
++No new feature.
++Source distribution mirrored at http://www.mindstep.com/pipsec/
++
++
++Version 19990519:
++-----------------
++
++Initial version for the ports distribution.
++
 +
 +Enjoy!
 +
diff --git a/net/pipsecd/pkg-plist b/net/pipsecd/pkg-plist
index 9eab26bf97e3..52cb3ce4d888 100644
--- a/net/pipsecd/pkg-plist
+++ b/net/pipsecd/pkg-plist
@@ -1,5 +1,6 @@
 sbin/pipsecd
 etc/ipsec/pipsecd.conf.sample
+etc/rc.d/pipsecd.sh
 share/doc/pipsecd/README
 share/doc/pipsecd/COPYRIGHT
 share/doc/pipsecd/README.port