diff options
| author | Brian Feldman <green@FreeBSD.org> | 2004-04-22 07:27:00 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2004-04-22 07:27:00 +0000 |
| commit | 623104fdc7b23e7cf07059bdf626bbb0c2834230 (patch) | |
| tree | 278b581064d683b75267269c3ff28d7620079b0c | |
| parent | c2b29025c60a77600e2e643bec4bedece4743014 (diff) | |
| download | ports-623104fdc7b23e7cf07059bdf626bbb0c2834230.tar.gz ports-623104fdc7b23e7cf07059bdf626bbb0c2834230.zip | |
Revamp cfssh(1) so that it creates the attach points randomly again.
It used $RANDOM when it was a ksh script, but here it had always
been broken because ash (/bin/sh) doesn't have it.
Also, make the cfssh manpage refer to itself as cfssh instead of ssh.
Submitted by: Martin Kammerhofer <dada@sbox.tugraz.at>
PR: 65620
Notes
Notes:
svn path=/head/; revision=107790
| -rw-r--r-- | security/cfs/Makefile | 6 | ||||
| -rw-r--r-- | security/cfs/files/patch-ac | 20 |
2 files changed, 22 insertions, 4 deletions
diff --git a/security/cfs/Makefile b/security/cfs/Makefile index 261478ad8183..be02129b97dc 100644 --- a/security/cfs/Makefile +++ b/security/cfs/Makefile @@ -7,17 +7,21 @@ PORTNAME= cfs PORTVERSION= 1.4.1 -PORTREVESION= 1 +PORTREVESION= 2 CATEGORIES= security MASTER_SITES= http://www.crypto.com/software/ MAINTAINER= green@FreeBSD.org COMMENT= A cryptographic file system implemented as a user-space NFS server +USE_REINPLACE= yes ALL_TARGET= cfs MAN1= cattach.1 cdetach.1 cmkdir.1 cpasswd.1 cfssh.1 MAN8= ccat.8 cfsd.8 cname.8 +post-patch: + ${REINPLACE_CMD} 's/^\.TH SSH/.TH CFSSH/' ${WRKSRC}/cfssh.1 + do-install: @cd ${WRKSRC}; \ ${INSTALL_PROGRAM} ccat cfsd cname ${PREFIX}/sbin; \ diff --git a/security/cfs/files/patch-ac b/security/cfs/files/patch-ac index bf63c532aede..bd3f9d95a2fa 100644 --- a/security/cfs/files/patch-ac +++ b/security/cfs/files/patch-ac @@ -1,8 +1,22 @@ ---- cfssh.orig Mon May 22 20:56:00 2000 -+++ cfssh Mon May 22 20:56:11 2000 -@@ -1,4 +1,4 @@ +--- cfssh.orig Wed Dec 3 16:21:40 1997 ++++ cfssh Tue Apr 20 19:45:17 2004 +@@ -1,15 +1,16 @@ -#!/bin/ksh +#!/bin/sh if [ -z "$1" ]; then echo Usage: cfssh directory + exit + fi + export PS1="crypto:`basename $1`$ " +-D=.$RANDOM.$RANDOM ++set -- $1 `dd if=/dev/urandom bs=8 count=1 2>/dev/null | od -D` ++D=.$3.$4 + cattach $1 $D || exit 1 + echo "Directory is /crypt/$D" + cd /crypt/$D +-D=" " ++D=" " + CWD=`/bin/pwd` + D=`basename $CWD` + PWD=$CWD |