summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/radius/Makefile23
-rw-r--r--net/radius/files/patch-sum4
-rw-r--r--net/radius/patches/patch-ab24
3 files changed, 35 insertions, 16 deletions
diff --git a/net/radius/Makefile b/net/radius/Makefile
index 415ab9090a8..5638fde120f 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/12/05 22:46:42 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/02/29 01:13:35 kim Exp $
#
# Tempted to install another radius package?
#
@@ -21,24 +21,25 @@ HOMEPAGE= http://www.merit.edu/aaa/
DIST_SUBDIR= radius
+.include "../../mk/bsd.prefs.mk"
+
CFLAGS+= -DHAVE_SETVBUF -DNOSHADOW
+
+.if defined(KERBEROS) && ${KERBEROS} == 4
+USE_KERBEROS= yes
+CFLAGS+= -DM_KERB -I/usr/include/kerberosIV
+RADLIBS= -lkrb -ldes
+.endif
+
DECOMPRESS_CMD= ${GZCAT} -f
-INSTALL_TARGET= man-install install util-install config-install
MAKE_ENV+= RADLIBS="${RADLIBS} -lskey" LIBS=-lcrypt \
GNUZIP="`${ECHO} ${GZIP_CMD} | ${AWK} '{print $$1}'`" \
INSTALL="${INSTALL} -c"
+
+INSTALL_TARGET= man-install install util-install config-install
MESSAGE_FILE= ${WRKDIR}/MESSAGE
WRKSRC= ${WRKDIR}
-# XXX Kerberos IV support is known to be broken.
-#.if defined(KERBEROS) && ${KERBEROS} == 4
-#USE_KERBEROS= yes
-#CFLAGS+= -DM_KERB -I/usr/include/kerberosIV
-#RADLIBS= -lkrb -ldes
-#.endif
-
-.include "../../mk/bsd.prefs.mk"
-
pre-patch:
.for FILE in prediff rad.simult rad.ftp rad.skey
@cd ${WRKSRC} && \
diff --git a/net/radius/files/patch-sum b/net/radius/files/patch-sum
index deff21962a9..bcc45365b5f 100644
--- a/net/radius/files/patch-sum
+++ b/net/radius/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.2 1999/12/05 22:46:45 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/02/29 01:13:36 kim Exp $
MD5 (patch-aa) = 5df18b1c6c2502cf9a3e97263d3e8146
-MD5 (patch-ab) = a2269194a11069fbe29ad2c16410f42a
+MD5 (patch-ab) = 9bca4101fcda26534adbe8f5808a21c5
MD5 (patch-ac) = 5a9588d4690d4ef121e72d3e6bd4c47c
MD5 (patch-ad) = c392b80190ad6c4dec2b5e82c6d5f5db
MD5 (patch-ae) = 5c658d4511a7b9dc4e52b764b64784d1
diff --git a/net/radius/patches/patch-ab b/net/radius/patches/patch-ab
index d1a09a14d06..7f0a64ca947 100644
--- a/net/radius/patches/patch-ab
+++ b/net/radius/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $
+$NetBSD: patch-ab,v 1.2 2000/02/29 01:13:36 kim Exp $
---- src/mit_stringtokey.c.orig Tue May 12 15:37:17 1998
-+++ src/mit_stringtokey.c Fri Mar 19 21:14:12 1999
+--- src/mit_stringtokey.c.orig Tue May 12 22:37:17 1998
++++ src/mit_stringtokey.c Tue Feb 29 03:04:46 2000
+@@ -47,7 +47,7 @@
+ * convert an arbitrary length string to a DES key
+ */
+ int
+-mit_string_to_key (str, key)
++mit_stringtokey (str, key)
+
+ char *str;
+ register des_cblock *key;
@@ -63,7 +63,6 @@
register char *p_char;
static char k_char[64];
@@ -10,3 +19,12 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $
in_str = str;
forward = 1;
+@@ -129,7 +128,7 @@
+ C_Block key;
+
+ {
+- mit_string_to_key (passwd, key);
++ mit_stringtokey (passwd, key);
+ return (0);
+ }
+ #endif /* #ifdef M_KERB */