Make this package work on 1.5E/i386.

5 files changed, 66 insertions, 2 deletions

diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index edb8dbe8226..2f7f31f5a2f 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/18 22:46:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:24:07 wiz Exp $
 #
 
 DISTNAME=		srp-1.4.4
@@ -32,6 +32,17 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 .if exists(/usr/lib/libkrb.a)
 CONFIGURE_ARGS+=	--with-krb4
+
+post-patch:
+	for FILE in ftp/ftp/Makefile.in ftp/ftpd/Makefile.in		\
+		telnet/configure telnet/configure.in;			\
+	do								\
+		cd ${WRKSRC} &&						\
+		${SED}  -e "s,include/kerberos,include/kerberosIV,"	\
+			-e "s,-ldes,-ldes -lroken -lcom_err,"		\
+			$$FILE > $$FILE.patched &&			\
+		${MV} $$FILE.patched $$FILE;				\
+	done
 .endif
 
 do-install:
diff --git a/security/srp_client/files/patch-sum b/security/srp_client/files/patch-sum
index 5e198ebc483..8eabd07196d 100644
--- a/security/srp_client/files/patch-sum
+++ b/security/srp_client/files/patch-sum
@@ -1,6 +1,9 @@
-$NetBSD: patch-sum,v 1.1 2000/02/05 06:00:36 wiz Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/23 23:24:08 wiz Exp $
 
 MD5 (patch-aa) = 580062ab453b62709d94e6719b13d5a7
 MD5 (patch-ab) = ea792e20de0ae32d9f61cc23b475264a
 MD5 (patch-ac) = 129d511d0ee27247f8805bc88dbb319c
 MD5 (patch-ad) = 264a5557c9b4f9fdd59dd43223640576
+MD5 (patch-ae) = ebf427e1d675bbe7cf63c3f6946bcf2e
+MD5 (patch-af) = b1f9ba02d55ec830b9ffc9116c556b2c
+MD5 (patch-ag) = f6dd7ac5f273fd549fdeadfcf011e16f
diff --git a/security/srp_client/patches/patch-ae b/security/srp_client/patches/patch-ae
new file mode 100644
index 00000000000..8eb762a13b0
--- /dev/null
+++ b/security/srp_client/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2000/08/23 23:26:46 wiz Exp $
+
+--- telnet/aclocal.m4.orig	Fri Dec 11 01:03:43 1998
++++ telnet/aclocal.m4
+@@ -10,7 +10,7 @@
+ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+ 
+ AC_DEFUN(AM_INIT_AUTOMAKE,
+-[AC_REQUIRE([AM_PROG_INSTALL])
++[AC_REQUIRE([AC_PROG_INSTALL])
+ PACKAGE=[$1]
+ AC_SUBST(PACKAGE)
+ VERSION=[$2]
+@@ -36,7 +36,7 @@
+ 
+ # serial 1
+ 
+-AC_DEFUN(AM_PROG_INSTALL,
++AC_DEFUN(AC_PROG_INSTALL,
+ [AC_REQUIRE([AC_PROG_INSTALL])
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ AC_SUBST(INSTALL_SCRIPT)dnl
diff --git a/security/srp_client/patches/patch-af b/security/srp_client/patches/patch-af
new file mode 100644
index 00000000000..862ccc833ac
--- /dev/null
+++ b/security/srp_client/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2000/08/23 23:26:46 wiz Exp $
+
+--- telnet/libtelnet/enc-proto.h.orig	Thu Dec 10 02:44:43 1998
++++ telnet/libtelnet/enc-proto.h
+@@ -163,10 +163,4 @@
+ #define des_set_random_generator_seed des_random_seed
+ #endif
+ 
+-int  des_new_random_key P((Block));
+-void des_set_random_generator_seed P((Block));
+-int des_key_sched P((Block, Schedule));
+-void des_ecb_encrypt P((Block, Block, Schedule, int));
+-int  des_string_to_key P((char *, Block));
+-void des_fixup_key_parity P((Block));
+ #endif	/* ENCRYPTION */
diff --git a/security/srp_client/patches/patch-ag b/security/srp_client/patches/patch-ag
new file mode 100644
index 00000000000..8c2dab56ed1
--- /dev/null
+++ b/security/srp_client/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2000/08/23 23:26:46 wiz Exp $
+
+--- telnet/libtelnet/kerberos.c.orig	Thu Dec 10 02:44:43 1998
++++ telnet/libtelnet/kerberos.c
+@@ -75,8 +75,6 @@
+ #include "misc.h"
+ 
+ int kerberos4_cksum P((unsigned char *, int));
+-int krb_mk_req P((KTEXT, char *, char *, char *, u_long));
+-int krb_rd_req P((KTEXT, char *, char *, u_long, AUTH_DAT *, char *));
+ int krb_kntoln P((AUTH_DAT *, char *));
+ int krb_get_cred P((char *, char *, char *, CREDENTIALS *));
+ int krb_get_lrealm P((char *, int));