Update to cfs version 1.4.0 beta 2.

Submitted by:	Ollivier Robert <roberto@FreeBSD.org>

5 files changed, 28 insertions, 43 deletions

diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index c31e52973d80..531d1eb71ca9 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cfs
-PORTVERSION=	1.3.3.1
+PORTVERSION=	1.4.0b2
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.hacktic.nl/pub/crypto/disk/ \
-		ftp://ftp.uni-bielefeld.de/pub/crypto/replay/disk/
-DISTNAME=	cfs-1.3.3bf
+MASTER_SITES=	ftp://ftp.hacktic.nl/pub/crypto/disk/cfs/ \
+		ftp://ftp.uni-bielefeld.de/pub/crypto/replay/disk/cfs/
+DISTNAME=	cfs.1.4.0.beta2
 
 MAINTAINER=	green@FreeBSD.org
 
@@ -19,15 +19,13 @@ MAN1=		cattach.1 cdetach.1 cmkdir.1 cpasswd.1 cfssh.1
 MAN8=		ccat.8 cfsd.8 cname.8
 RESTRICTED=	"contains crypto code"
 
-pre-build:
-	@${CP} ${FILESDIR}/bf_tab.h ${WRKSRC}
+NO_WRKSUBDIR=	yes
 
 do-install:
-	@${CP} ${WRKSRC}/ssh.1 ${WRKSRC}/cfssh.1
 	@cd ${WRKSRC}; \
 	    ${INSTALL_PROGRAM} ccat cfsd cname ${PREFIX}/sbin; \
 	    ${INSTALL_PROGRAM} cattach cdetach cmkdir cpasswd ${PREFIX}/bin; \
-	    ${INSTALL_SCRIPT} ssh ${PREFIX}/bin/cfssh; \
+	    ${INSTALL_SCRIPT} cfssh ${PREFIX}/bin/cfssh; \
 	    ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1; \
 	    ${INSTALL_MAN} ${MAN8} ${PREFIX}/man/man8; \
 	    ${MKDIR} ${PREFIX}/share/doc/cfs; \
diff --git a/security/cfs/distinfo b/security/cfs/distinfo
index 0be16f4a65fd..deb853b3eba7 100644
--- a/security/cfs/distinfo
+++ b/security/cfs/distinfo
@@ -1 +1 @@
-MD5 (cfs-1.3.3bf.tar.gz) = c0cb2dbb09eb2c0b583337aa784ba49d
+MD5 (cfs.1.4.0.beta2.tar.gz) = e0e7623b95fbcfa0cdde7fa4ea9e1afd
diff --git a/security/cfs/files/patch-aa b/security/cfs/files/patch-aa
index bd60941df05d..89fd41593808 100644
--- a/security/cfs/files/patch-aa
+++ b/security/cfs/files/patch-aa
@@ -1,18 +1,18 @@
---- Makefile.orig	Wed Dec 25 15:43:50 1996
-+++ Makefile	Mon Mar 22 23:12:48 1999
-@@ -71,8 +71,9 @@
+--- Makefile.orig	Sat Dec 20 10:57:08 1997
++++ Makefile	Mon May 22 18:38:56 2000
+@@ -74,8 +74,9 @@
  #CC=cc
  #COPT=-O -DNOT_ANSI_C -DPROTOTYPES=0
  # for gcc, use
 -CC=gcc
--COPT=-O2 -DPROTOTYPES=1 -DNOTDEF
+-COPT=-O2 -DPROTOTYPES=1
 +CC?=gcc
 +CFLAGS?=-O2
-+CFLAGS+=-DPROTOTYPES=1 -DNOTDEF
++CFLAGS+=-DPROTOTYPES=1
  
  #1B: paths:
- BINDIR=/usr/local/bin
-@@ -193,12 +194,18 @@
+ #some peple like /usr/local/sbin instead of /usr/local/etc
+@@ -217,12 +218,18 @@
  ## not sure what to do for NeXT.  I think this works:
  #CFLAGS=$(COPT) -posix -D_BSD -DANYPORT -I$(RINCLUDES)
  
diff --git a/security/cfs/files/patch-ab b/security/cfs/files/patch-ab
index 3bdd4e1ec5b0..a5d7ffaf953f 100644
--- a/security/cfs/files/patch-ab
+++ b/security/cfs/files/patch-ab
@@ -1,6 +1,6 @@
---- cfs.c.orig	Wed Mar 20 09:57:56 1996
-+++ cfs.c	Mon Oct 13 21:30:22 1997
-@@ -42,7 +42,7 @@
+--- cfs.c.orig	Fri Dec 19 01:30:50 1997
++++ cfs.c	Mon May 22 18:30:01 2000
+@@ -43,7 +43,7 @@
  
  struct in_addr validhost;
  
@@ -9,12 +9,12 @@
  void nfs_program_2();
  void adm_program_2();
  #include <string.h>
-@@ -233,7 +233,7 @@
+@@ -236,7 +236,7 @@
   	setuid(0);
  	umask(0);
  
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__NetBSD__) || defined(__bsdi__)
++#if defined(__NetBSD__) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__OpenBSD__)
  #ifndef DEBUG
  	/* detach from terminal */
  	daemon(0,0);
diff --git a/security/cfs/files/patch-ac b/security/cfs/files/patch-ac
index 810482602cee..bf63c532aede 100644
--- a/security/cfs/files/patch-ac
+++ b/security/cfs/files/patch-ac
@@ -1,21 +1,8 @@
---- ssh.1.orig	Sat Jan  1 04:35:00 1994
-+++ ssh.1	Sun Sep 20 17:59:46 1998
-@@ -1,14 +1,14 @@
- .TH SSH 1 ""
- .SH NAME
--ssh - (somewhat) secure CFS shell
-+cfssh - (somewhat) secure CFS shell
- .SH SYNOPSIS
--.B ssh
-+.B cfssh
- \fIdirectory\fP
- .SH DESCRIPTION
--\fBssh\fP uses \fBcattach\fP(1) to associate the encrypted
-+\fBcfssh\fP uses \fBcattach\fP(1) to associate the encrypted
- \fIdirectory\fP (previously created with \fBcmkdir\fP(1)) with a
- randomly selected name.  Once the correct passphrase is provided,
--\fBssh\fP invokes a new shell with the random directory in /crypt as its
-+\fBcfssh\fP invokes a new shell with the random directory in /crypt as its
- working directory.
- When the shell exits, the temporary attach name is deleted with
- cdetach(1).
+--- cfssh.orig	Mon May 22 20:56:00 2000
++++ cfssh	Mon May 22 20:56:11 2000
+@@ -1,4 +1,4 @@
+-#!/bin/ksh
++#!/bin/sh
+ 
+ if [ -z "$1" ]; then
+ 	echo Usage: cfssh directory