From 4770dcb6e87db76e9554ce434d972684f8dfcc88 Mon Sep 17 00:00:00 2001
From: sommerfe <sommerfe@pkgsrc.org>
Date: Thu, 9 Apr 1998 19:49:16 +0000
Subject: Fix zephyr built with kerberosIV

---
 net/zephyr/Makefile         |  6 ++++-
 net/zephyr/patches/patch-ab | 61 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 net/zephyr/patches/patch-ab

diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 66bec4b86b0..5e69cb5280e 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,7 +1,7 @@
 # Makefile for:		zephyr
 # Version required:	2.0.4
 #
-# $NetBSD: Makefile,v 1.5 1998/03/20 06:38:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/09 19:49:16 sommerfe Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
@@ -14,6 +14,10 @@ MAINTAINER=	mycroft@NetBSD.ORG
 CONFIGURE_ARGS+="--with-krb4"
 .endif
 
+.if exists(/usr/include/kerberosIV)
+CONFIGURE_ENV+=CPPFLAGS=-I/usr/include/kerberosIV
+.endif
+
 GNU_CONFIGURE=	yes
 MAN1=		zephyr.1 xzwrite.1 zaway.1 zctl.1 zleave.1 zlocate.1 \
 		zmailnotify.1 znol.1 zwgc.1 zwrite.1
diff --git a/net/zephyr/patches/patch-ab b/net/zephyr/patches/patch-ab
new file mode 100644
index 00000000000..94c1fad9f2a
--- /dev/null
+++ b/net/zephyr/patches/patch-ab
@@ -0,0 +1,61 @@
+*** server/zserver.h.~1~	Tue Jun 18 15:43:02 1996
+--- server/zserver.h	Thu Apr  9 13:26:04 1998
+***************
+*** 209,215 ****
+  void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
+  int krb_set_key __P((char *key, int cvt));
+  int krb_rd_req __P((KTEXT authent, char *service, char *instance,
+! 		    unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn));
+  int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
+  int krb_get_lrealm __P((char *r, int n));
+  #endif
+--- 209,215 ----
+  void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
+  int krb_set_key __P((char *key, int cvt));
+  int krb_rd_req __P((KTEXT authent, char *service, char *instance,
+! 		    KRB_INT32 from_addr, AUTH_DAT *ad, char *fn));
+  int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
+  int krb_get_lrealm __P((char *r, int n));
+  #endif
+*** server/zsrv_conf.h.~1~	Fri Jun 30 18:11:35 1995
+--- server/zsrv_conf.h	Thu Apr  9 13:24:38 1998
+***************
+*** 48,51 ****
+--- 48,53 ----
+  #define SWEEP_INTERVAL  3600		/* Time between sweeps of the ticket
+  					   hash table */
+  
++ #define KRB_INT32 int32_t
++ 
+  #endif /* __ZSRV_CONF_H__ */
+*** lib/zephyr/ZMkAuth.c.~1~	Tue Jun 18 15:44:46 1996
+--- lib/zephyr/ZMkAuth.c	Thu Apr  9 13:31:37 1998
+***************
+*** 44,50 ****
+      char *cstart, *cend;
+      ZChecksum_t checksum;
+      CREDENTIALS cred;
+-     extern unsigned long des_quad_cksum();
+  
+      now = time(0);
+      if (last_authent_time == 0 || (now - last_authent_time > 120)) {
+--- 44,49 ----
+*** server/kopt.c.~1~	Tue Jun 18 15:43:00 1996
+--- server/kopt.c	Thu Apr  9 13:26:24 1998
+***************
+*** 234,240 ****
+      KTEXT authent;			/* The received message */
+      char *service;			/* Service name */
+      char *instance;			/* Service instance */
+!     unsigned KRB_INT32 from_addr;	/* Net address of originating host */
+      AUTH_DAT *ad;			/* Structure to be filled in */
+      char *fn;				/* Filename to get keys from */
+  {
+--- 234,240 ----
+      KTEXT authent;			/* The received message */
+      char *service;			/* Service name */
+      char *instance;			/* Service instance */
+!     KRB_INT32 from_addr;		/* Net address of originating host */
+      AUTH_DAT *ad;			/* Structure to be filled in */
+      char *fn;				/* Filename to get keys from */
+  {
-- 
cgit v1.2.3