- make conform with update-patches

- fix build, dunno if it works

security/stel/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2001/07/13 11:24:43 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2001/09/29 21:27:50 naddy Exp $
 
 COMMENT=	"Secure Telnet, encrypted version of the telnet daemon"
 
@@ -16,10 +16,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
 
+LIB_DEPENDS=	gmp.::devel/gmp
+
 WRKDIST=	${WRKDIR}
 
 ALL_TARGET=	bsdi
 
+post-extract:
+	@rm ${WRKSRC}/stel/login.c.orig
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stel/stel ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/stel/steld ${PREFIX}/sbin

security/stel/patches/patch-Makefile

@@ -1,5 +1,6 @@
---- Makefile.orig	Sat May  4 12:18:02 1996
-+++ Makefile	Mon Nov 16 23:52:08 1998
+$OpenBSD: patch-Makefile,v 1.1 2001/09/29 21:27:50 naddy Exp $
+--- Makefile.orig	Sat May  4 18:18:02 1996
++++ Makefile	Sat Sep 29 22:55:22 2001
 @@ -1,5 +1,5 @@
 -#DIRS	= descore gmp-1.3.2 regex-0.12 libdes skey stel
 -DIRS	= gmp-1.3.2 regex-0.12 libdes skey stel
@@ -8,7 +9,7 @@
  ETC	= COPYRIGHT LICENSE Makefile README stel-paper.ps man
  
  all	:
-@@ -24,9 +24,7 @@
+@@ -24,9 +24,7 @@ all	:
  	@echo to stel-authors@idea.sec.dsi.unimi.it.  Good luck\!
  
  hpux sunos4 solaris24 solaris25 irix linux ultrix freebsd bsdi aix:

security/stel/patches/patch-ac

@@ -1,11 +0,0 @@
---- stel/defs.h.orig	Fri Apr 26 12:26:17 1996
-+++ stel/defs.h	Mon Nov 16 23:04:58 1998
-@@ -162,7 +162,7 @@
- #define ENCRYPT		DES_ENCRYPT
- #define DECRYPT		DES_DECRYPT
- #else
--#include "des.h"
-+#include <des.h>
- #endif
- 
- #ifdef hpux

security/stel/patches/patch-stel_Makefile

@@ -1,5 +1,6 @@
+$OpenBSD: patch-stel_Makefile,v 1.1 2001/09/29 21:27:50 naddy Exp $
 --- stel/Makefile.orig	Sat May  4 18:05:16 1996
-+++ stel/Makefile	Tue Feb 27 20:11:09 2001
++++ stel/Makefile	Sat Sep 29 23:02:22 2001
 @@ -46,16 +46,13 @@
  # OFFSET_T=long for most architectures
  # OFFSET_T=off_t for POSIX systems
@@ -19,7 +20,7 @@
  GNUREGEX = ../regex-0.12
  
  # SOCKS support
-@@ -68,11 +65,11 @@
+@@ -68,11 +65,11 @@ GNUREGEX = ../regex-0.12
  ###SDILIB	= $(SDIDIR)/sdiclient.a
  ###SDILIB	= $(SDIDIR)/sdiclient.a
  
@@ -35,15 +36,21 @@
  
  
  S5R3OBJ = utmp_init.o utmp_login.o utmp_logout.o updwtmp.o
-@@ -163,7 +160,6 @@
+@@ -163,10 +160,11 @@ freebsd:
  bsdi:
  	make all ALLMASTER="$(BSD4OBJ) $(MASTER)" \
  	ALLSLAVE="$(SLAVE)" \
 -	OPTIMIZE="-O2" \
  	SYSDEFS="-DBSDI -DIDEA32 -DLOGPRI=LOG_INFO -DOFFSET_T=off_t \
  	-DHAS_SYS_PARAM_H" \
- 	SYSLIBS="$(DESCORELIB)"
-@@ -203,7 +199,7 @@
+-	SYSLIBS="$(DESCORELIB)"
++	SYSLIBS="$(DESCORELIB)" \
++	OTHERINCDIR="-I${LOCALBASE}/include" \
++	OTHERLIBDIR="-L${LOCALBASE}/lib"
+ 
+ ultrix:
+ 	make all ALLMASTER="$(BSD4OBJ) $(MASTER)" \
+@@ -203,7 +201,7 @@ shar	:
  lint	:
  	lint \
  	-DIDEA32 -DHIGHFIRST -DLOGPRI=LOG_INFO -DOFFSET_T=long \

security/stel/patches/patch-stel_defs_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-stel_defs_h,v 1.1 2001/09/29 21:27:50 naddy Exp $
+--- stel/defs.h.orig	Fri Apr 26 18:26:17 1996
++++ stel/defs.h	Sat Sep 29 22:55:22 2001
+@@ -162,7 +162,7 @@ typedef union {
+ #define ENCRYPT		DES_ENCRYPT
+ #define DECRYPT		DES_DECRYPT
+ #else
+-#include "des.h"
++#include <des.h>
+ #endif
+ 
+ #ifdef hpux

security/stel/patches/patch-stel_makeio_c

@@ -1,6 +1,7 @@
---- stel/makeio.c.orig	Fri Apr 26 12:29:27 1996
-+++ stel/makeio.c	Sun Nov 29 04:44:21 1998
-@@ -21,7 +21,8 @@
+$OpenBSD: patch-stel_makeio_c,v 1.1 2001/09/29 21:27:50 naddy Exp $
+--- stel/makeio.c.orig	Fri Apr 26 18:29:27 1996
++++ stel/makeio.c	Sat Sep 29 22:55:22 2001
+@@ -21,7 +21,8 @@ static char *rcsid = "@(#) $Id: makeio.c
  #include <sys/time.h>
  #include <netinet/in.h>
  #include <pwd.h>
@@ -10,7 +11,7 @@
  
  #ifdef HAS_SYS_PARAM_H
  #include <sys/param.h>
-@@ -33,7 +34,7 @@
+@@ -33,7 +34,7 @@ static char *rcsid = "@(#) $Id: makeio.c
  #endif
  #endif
  
@@ -19,7 +20,7 @@
  #include "defs.h"
  
  #define ESCAPE_CMD	"escape"
-@@ -74,7 +75,7 @@
+@@ -74,7 +75,7 @@ long	crc32val;
  #define CONTROL(x)	((x) & 0x1f)		/* CTRL(x) is not portable */
  static int		escape = CONTROL(']');
  static long		oldmask;
@@ -28,7 +29,7 @@
  static char		skeybuf[SKEYBUFSIZE];
  static unsigned long	userstrokes, traffic, xfertraffic;
  
-@@ -364,7 +365,15 @@
+@@ -364,7 +365,15 @@ int		*len;
  
  				p = (char *)strtok(line +
  						strlen(LOG_CMD), " \t");
@@ -45,7 +46,7 @@
  				if ((logfh = open(logfilename,
  					O_WRONLY | O_CREAT, 0600)) == -1) {
  					perror(logfilename);
-@@ -650,6 +659,9 @@
+@@ -650,6 +659,9 @@ int	automjr;
  	printf("\n");
  
  	if ((char *)getenv("SKEYPADFILE") != NULL) {
@@ -55,7 +56,7 @@
  		if (automjr) {
  			cprintf("(using mjr DES padding mode)\n");
  			cprintf("using skeypadfile %s\n",
-@@ -666,17 +678,18 @@
+@@ -666,17 +678,18 @@ int	automjr;
  			if (buf[0] == 'y')
  				desmode = 1;
  		}

security/stel/patches/patch-stel_steld_c

@@ -1,6 +1,7 @@
---- stel/steld.c.orig	Fri Apr 26 12:29:24 1996
-+++ stel/steld.c	Tue Nov 17 13:13:14 1998
-@@ -664,6 +664,11 @@
+$OpenBSD: patch-stel_steld_c,v 1.1 2001/09/29 21:27:50 naddy Exp $
+--- stel/steld.c.orig	Fri Apr 26 18:29:24 1996
++++ stel/steld.c	Sat Sep 29 22:55:22 2001
+@@ -664,6 +664,11 @@ int	usepty, authfh;
  			break;
  		}
  unixauth:
@@ -12,7 +13,7 @@
  		if (!skeyaccess(username, line, fromhost, fromhost)) {
  			syslog(LOGPRI,
  				"UNIX PASSWORDS NOT PERMITTED for %s from %s",
-@@ -671,6 +676,7 @@
+@@ -671,6 +676,7 @@ unixauth:
  			puts("UNIX passwords NOT permitted.");
  			sleepexit(1);
  		}

security/stel/patches/patch-stel_sub_c

@@ -1,6 +1,7 @@
---- stel/sub.c.orig	Fri Apr 26 12:29:26 1996
-+++ stel/sub.c	Mon Nov 16 23:27:07 1998
-@@ -515,10 +515,10 @@
+$OpenBSD: patch-stel_sub_c,v 1.1 2001/09/29 21:27:50 naddy Exp $
+--- stel/sub.c.orig	Fri Apr 26 18:29:26 1996
++++ stel/sub.c	Sat Sep 29 22:55:22 2001
+@@ -515,10 +515,10 @@ unsigned char	*rndstr;
  	memcpy(sessionkeyhash, digest2, 8);
  
  #ifdef DESCORE
@@ -13,7 +14,7 @@
  #endif
  	bzero(tmpsched, sizeof(tmpsched));
  
-@@ -984,17 +984,17 @@
+@@ -984,17 +984,17 @@ char	*authbuf;
  	/* build K_E(sessionkeyhash) */
  	memcpy(cookie, sessionkeyhash, 8);
  #ifdef DESCORE
@@ -35,7 +36,7 @@
  #endif
  
  	if (logging) {
-@@ -1053,17 +1053,17 @@
+@@ -1053,17 +1053,17 @@ char	*authbuf;
  
  	if (side == CLIENT_SIDE) /* decrypt it once */
  #ifdef DESCORE