Christian Weisgerber <[email protected]> writes:
> Jérémie Courrèges-Anglas:
>
>> Diff for security/cfs. Please close your eyes before running "make".
>
> I can't run make because cfs only builds on obsolete platforms. :->
Mwahaha, I hadn't noticed NOT_FOR_ARCHS, but somehow I'm not really
surprised.
>> +--- getpass.c.orig Wed Dec 3 22:51:34 1997
>> ++++ getpass.c Sat Nov 30 02:21:29 2013
>> +@@ -45,7 +45,7 @@
>> + #include "cfs.h"
>> + #include "shs.h"
>> +
>> +-#if defined(irix) || defined(linux)
>> ++#if defined(irix) || defined(linux) || defined(__OpenBSD__)
>> + /* hacks to use POSIX style termios instead of old BSD style sgttyb */
>> + #include <termios.h>
>> + #define sgttyb termios
>
> That's the least intrusive way to do it. You also need the
> "|| defined(__OpenBSD__)" a few lines higher up where <sgtty.h>
> is included, which will go away with libcompat.
Well, I didn't know that we were going to remove that header too...
> Alternatively, we could gut the whole function body and just use
> getpass().
Yup. Anyway, here's another one that doesn't include sgtty.h.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/cfs/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 11 Mar 2013 11:41:24 -0000 1.32
+++ Makefile 30 Nov 2013 02:07:17 -0000
@@ -5,7 +5,7 @@ NOT_FOR_ARCHS= ${LP64_ARCHS}
COMMENT= cryptographic file system (user-space NFS server)
DISTNAME= cfs-1.4.1
-REVISION = 3
+REVISION = 4
CATEGORIES= security
HOMEPAGE= http://www.crypto.com/software/
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/security/cfs/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 7 Apr 2005 20:23:44 -0000 1.3
+++ patches/patch-Makefile 30 Nov 2013 01:26:00 -0000
@@ -1,5 +1,5 @@
--- Makefile.orig Thu May 3 20:29:21 2001
-+++ Makefile Sat Mar 12 20:30:36 2005
++++ Makefile Sat Nov 30 02:22:13 2013
@@ -74,8 +74,8 @@
#CC=cc
#COPT=-O -DNOT_ANSI_C -DPROTOTYPES=0
@@ -11,7 +11,7 @@
#1B: paths:
#some peple like /usr/local/sbin instead of /usr/local/etc
-@@ -199,6 +199,14 @@
+@@ -199,6 +199,14 @@ RINCLUDES=/usr/mab/rsaref/source
#COMPAT=-lcompat
#RPCOPTS=
@@ -20,13 +20,13 @@
+# mount -o port=3049,nfsv2,intr localhost:/null /crypt
+CFLAGS=$(COPT) -DBSD44 -DANYPORT
+LIBS=
-+COMPAT=-lcompat
++COMPAT=
+RPCOPTS=
+
##Use these for NetBSD i386 1.0 (John Kohl)
## For mounting, you need to use a command like:
## mount -o -P,-c localhost:/null /crypt
-@@ -253,7 +261,7 @@
+@@ -253,7 +261,7 @@ OBJS= cfs.o nfsproto_xdr.o nfsproto_svr.o admproto_xdr
EOBJS=dhparams.o truerand.o esm_gen.o esm.o esm_cipher.o
COBJS=admproto_clnt.o cfs_des.o cfs_cipher.o cattach.o getpass.o cmkdir.o \
cdetach.o ver.o cname.o ccat.o mcgsbox.o mcgsbox.o mcg.o shs.o cpasswd.o \
@@ -35,7 +35,7 @@
OTHERS = nfsproto.h nfsproto_svr.c nfsproto_xdr.c admproto.h admproto_svr.c \
admproto_xdr.c admproto_clnt.c ver.c
-@@ -277,16 +285,16 @@
+@@ -277,16 +285,16 @@ cdetach: cdetach.o admproto_clnt.o admproto_xdr.o adm.
ver.o $(LIBS) -o cdetach
cmkdir: getpass.o adm.o cfs_des.o cfs_cipher.o cmkdir.o ver.o mcg.o \
Index: patches/patch-getpass_c
===================================================================
RCS file: /cvs/ports/security/cfs/patches/patch-getpass_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-getpass_c
--- patches/patch-getpass_c 7 Apr 2005 20:23:44 -0000 1.1
+++ patches/patch-getpass_c 30 Nov 2013 19:42:04 -0000
@@ -1,6 +1,24 @@
---- getpass.c.orig Sun Mar 13 13:59:43 2005
-+++ getpass.c Sun Mar 13 14:00:06 2005
-@@ -64,7 +64,7 @@
+--- getpass.c.orig Wed Dec 3 22:51:34 1997
++++ getpass.c Sat Nov 30 20:37:29 2013
+@@ -35,7 +35,7 @@
+
+ #include <stdio.h>
+ #include <signal.h>
+-#ifndef linux
++#if !defined(linux) || !defined(OpenBSD)
+ #include <sgtty.h>
+ #endif
+ #include <sys/types.h>
+@@ -45,7 +45,7 @@
+ #include "cfs.h"
+ #include "shs.h"
+
+-#if defined(irix) || defined(linux)
++#if defined(irix) || defined(linux) || defined(__OpenBSD__)
+ /* hacks to use POSIX style termios instead of old BSD style sgttyb */
+ #include <termios.h>
+ #define sgttyb termios
+@@ -64,7 +64,7 @@ char *prompt;
register char *p;
register c;
FILE *fi;
