Remove Merit RADIUS.

12 files changed, 1 insertions, 380 deletions

diff --git a/net/Makefile b/net/Makefile
index 95c3175739c..57f477b06be 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.314 2002/07/10 02:12:55 kim Exp $
+# $NetBSD: Makefile,v 1.315 2002/07/10 12:36:26 kim Exp $
 #
 
 COMMENT=	Networking tools
@@ -187,7 +187,6 @@ SUBDIR+=	py-soaplib
 SUBDIR+=	py-xmlrpclib
 SUBDIR+=	ra-pna-proxy
 SUBDIR+=	ra-rtsp-proxy
-SUBDIR+=	radius
 SUBDIR+=	radiusd-cistron
 SUBDIR+=	rdesktop
 SUBDIR+=	rdist6
diff --git a/net/radius/DESCR b/net/radius/DESCR
deleted file mode 100644
index 95c258ab9b1..00000000000
--- a/net/radius/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-RADIUS is a standard authentication protocol.  The Merit AAA Server is
-an enhanced version which adds proxying using realms.  This package also
-includes enhancements by MR.NET for supporting S/Key passwords, proxying
-requests to an FTP server, restricting the number of simultaneous logins
-for any given account, and for defaulting the authentication realm.
diff --git a/net/radius/MESSAGE b/net/radius/MESSAGE
deleted file mode 100644
index 92f3379c0b8..00000000000
--- a/net/radius/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:58:24 zuntum Exp $
-
-To use the The Merit AAA Server you have to copy the contents of
-the directory "${PREFIX}/share/examples/radius" to "/etc/raddb"
-and to customize it.
-
-======================================================================
diff --git a/net/radius/Makefile b/net/radius/Makefile
deleted file mode 100644
index 921ee81a8a4..00000000000
--- a/net/radius/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2002/06/15 21:20:03 cjep Exp $
-#
-# Tempted to install another radius package?
-#
-#	Please consider e-mailing ${MAINTAINER} first with your concerns.
-#	It would be nice to just fold new extensions into this code, and
-#	avoid a myriad of incompatible radiusd incarnations.
-
-DISTNAME=	radius.3.6B
-PKGNAME=	${DISTNAME:S/./-/}
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.merit.edu/radius/releases/ \
-		http://www.mr.net/~bradley/radius/
-DISTFILES=	${DISTNAME}.basic.tar.gz \
-		${DISTNAME}-skey.tar.gz \
-		${DISTNAME}-ftp.tar \
-		${DISTNAME}-simultd.tar
-
-MAINTAINER=	kim@tac.nyc.ny.us
-HOMEPAGE=	http://www.merit.edu/aaa/
-COMMENT=	Standard authentication protocol server
-
-BROKEN=		Package is vulnerable to remote buffer overflow.
-
-DIST_SUBDIR=	radius
-
-.include "../../mk/bsd.prefs.mk"
-
-CFLAGS+=	-DHAVE_SETVBUF -DNOSHADOW
-
-.if defined(KERBEROS)
-PKG_USE_KERBEROS=	yes
-CFLAGS+=	-DM_KERB -I/usr/include/kerberosIV
-RADLIBS=	-lkrb -ldes
-.endif
-
-DECOMPRESS_CMD=	${GZCAT} -f
-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
-WRKSRC=		${WRKDIR}
-
-pre-patch:
-.for FILE in prediff rad.simult rad.ftp rad.skey
-	@cd ${WRKSRC} && \
-	${SED} -e 's#^--- ${DISTNAME}.patched/#--- #' ${FILE}.diff | \
-	${PATCH} -s
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/radius/PLIST b/net/radius/PLIST
deleted file mode 100644
index e4b35306b60..00000000000
--- a/net/radius/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:25 zuntum Exp $
-man/man5/authfile.5
-man/man5/clients.5
-man/man5/dictionary.5
-man/man5/engine.config.5
-man/man5/radius.fsm.5
-man/man5/users.5
-man/man5/vendors.5
-man/man8/builddbm.8
-man/man8/dnscheck.8
-man/man8/radcheck.8
-man/man8/radiusd.8
-man/man8/radpwtst.8
-sbin/dnscheck
-sbin/radcheck
-sbin/radiusd
-sbin/radpass
-sbin/radpwtst
-share/examples/radius/authfile
-share/examples/radius/clients
-share/examples/radius/conversion.pl
-share/examples/radius/dictionary
-share/examples/radius/engine.config
-share/examples/radius/users
-share/examples/radius/vendors
-share/examples/radius/xas.fsm
-@dirrm share/examples/radius
diff --git a/net/radius/distinfo b/net/radius/distinfo
deleted file mode 100644
index ff6e1a79596..00000000000
--- a/net/radius/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:31 wiz Exp $
-
-SHA1 (radius/radius.3.6B.basic.tar.gz) = b9990edb8413b57c83c614c9de3d9e68807218ed
-Size (radius/radius.3.6B.basic.tar.gz) = 424424 bytes
-SHA1 (radius/radius.3.6B-skey.tar.gz) = b19557d6c2cad7ea77725aae700f0fb3cb07105b
-Size (radius/radius.3.6B-skey.tar.gz) = 232445 bytes
-SHA1 (radius/radius.3.6B-ftp.tar) = 79a76b841b6884a053443da8078ec194eb7ee50c
-Size (radius/radius.3.6B-ftp.tar) = 30720 bytes
-SHA1 (radius/radius.3.6B-simultd.tar) = 7d95d2e53a293fc0e91b72611e6b1ec75cd912cc
-Size (radius/radius.3.6B-simultd.tar) = 40960 bytes
-SHA1 (patch-aa) = aef9f8b41242b8f2adfcb39d91fc4f9f999f75ce
-SHA1 (patch-ab) = 82e976df74631f6659db6f5fa3b65fa9e5106b35
-SHA1 (patch-ac) = 08b5a576f556b6588bccc436d26c7e4f50c96246
-SHA1 (patch-ad) = 73d349c26f8ddf598b121268d5fa71311e8c3942
-SHA1 (patch-ae) = 04310d12b96bcb52139753f5c734b57591ea45dd
-SHA1 (patch-af) = 736c1751f563fbbb26cab2cecf77922f5de9bdac
diff --git a/net/radius/patches/patch-aa b/net/radius/patches/patch-aa
deleted file mode 100644
index 776c82b738f..00000000000
--- a/net/radius/patches/patch-aa
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1999/12/05 22:46:45 tron Exp $
-
---- Makefile.orig	Sun Dec  5 23:41:31 1999
-+++ Makefile	Sun Dec  5 23:43:38 1999
-@@ -51,11 +51,12 @@
- # Where the configuration files live.
- RADDB		= ./raddb
- # Some installation stuff.
--DAEMON_INSDIR	= /usr/private/etc
--BIN_INSDIR	= /usr/private/etc
--MAN_INSDIR	= /usr/local/man
--RADDB_INSDIR	= /usr/private/etc/raddb.new
--RADACCT_INSDIR	= /usr/private/etc/radacct
-+DAEMON_INSDIR	= ${PREFIX}/sbin
-+BIN_INSDIR	= ${PREFIX}/sbin
-+MAN_INSDIR	= ${PREFIX}/man
-+RADDB_INSDIR	= /etc/raddb
-+RADDB_EXDIR	= ${PREFIX}/share/examples/radius
-+RADACCT_INSDIR	= /var/log
- # The server does not need to be owned by root, unless some shadow password
- # scheme needs it.  You might create a user id "radius" for just this purpose.
- # The O G and M macros are for AIX, OSF/1 and HP-UX, see below.
-@@ -63,12 +64,12 @@
- G		= -g
- M		= -m
- RADOWN		= root
--RADGRP		= bin
-+RADGRP		= wheel
- 
- # Define COMPRESS to hold the pathname of your favourite compress program if
- # you need to override the default value of /usr/ucb/compress:
--#COMPRESS	= -DRAD_COMPRESS=\"/usr/local/bin/gzip\"
--#COMPRESS_ARGS	= -DCOMPRESS_ARGS=\"-9\"
-+COMPRESS	= -DRAD_COMPRESS=\"${GNUZIP}\"
-+COMPRESS_ARGS	= -DCOMPRESS_ARGS=\"-nf9\"
- 
- # Define SRV to hold any combination of server names you'd like to override:
- #SRV3	  = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\"
-@@ -78,8 +79,8 @@
- 
- # Define DIRS to hold any combination of directory names you'd like to override:
- #DIRS2	  = -DDEFAULT_DIR=\"../raddb\" -DDEFAULT_DIR2=\"$(RADDB_INSDIR)\"
--#DIRS1	  = -DRADIUS_DIR=\"$(RADDB_INSDIR)\" -DRADACCT_DIR=\"$(RADACCT_INSDIR)\"
--#DIRS	  = $(DIRS1) $(DIRS2)
-+DIRS1	  = -DRADIUS_DIR=\"$(RADDB_INSDIR)\" -DRADACCT_DIR=\"$(RADACCT_INSDIR)\"
-+DIRS	  = $(DIRS1) $(DIRS2)
- 
- # Define CHK_SHELLS to enable /etc/shells checking:
- CHK_SHELLS	= -DCHK_SHELLS
-@@ -90,13 +91,13 @@
- # -DBINARY_FILTERS - support for Ascend binary filters
- # -DIP_ADDR_POOL - support for Ascend IP address pools
- #
--ASCEND	  = -DASCEND -DBINARY_FILTERS
-+ASCEND	  = -DASCEND -DBINARY_FILTERS -DIP_ADDR_POOL
- 
- # Define USR_CCA to enable USR support:
- #USR	  = -DUSR_CCA
- 
- # Define RAD_LOG_FMT to change how the logfile name changes:
--RAD_LOG_FMT	= -DRADIUS_LOG_FMT=\"logfile.%y%m%d\"
-+RAD_LOG_FMT	= -DRADIUS_LOG_FMT=\"radius\"
- 
- STUFF	  = $(DIRS) $(SRV) $(COMPRESS) $(COMPRESS_ARGS) $(CHK_SHELLS) \
- 	$(ASCEND) $(USR)
-@@ -122,10 +123,10 @@
- # radiusd -- the default
- #
- #--------------------------------------------------------------------------
--DEFS	  = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \
--            -DMODVERSION
--RADLIBS	  = ./logdaemon-5.6/skey/libskey.a
--INCS	  = -I./logdaemon-5.6/skey
-+#DEFS	  = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \
-+#            -DMODVERSION
-+#RADLIBS	  = ./logdaemon-5.6/skey/libskey.a
-+#INCS	  = -I./logdaemon-5.6/skey
- 
- #
- # mkerb
-@@ -186,9 +187,9 @@
- 	$(OBJ)/fsm.o $(OBJ)/fwd2nas.o $(OBJ)/nas_reb.o $(OBJ)/res_qry.o       \
- 	$(OBJ)/rf_req.o $(OBJ)/rf_resp.o $(OBJ)/arades.o $(OBJ)/cache.o       \
- 	$(OBJ)/pooladdr.o $(OBJ)/rad.bsd.o                                    \
-+	$(OBJ)/rad.simult.o \
- 	$(OBJ)/rad.skey.o \
--	$(OBJ)/rad.ftp.o \
--	$(OBJ)/modversion.o
-+	$(OBJ)/rad.ftp.o
- 
- LIB_OBJS  = $(OBJ)/des.o $(OBJ)/dict.o $(OBJ)/filters.o $(OBJ)/funcs.o        \
- 	$(OBJ)/md5.o $(OBJ)/sendserver.o $(OBJ)/users.o $(OBJ)/resources.o    \
-@@ -236,12 +237,12 @@
- #
- #--------------------------------------------------------------------------
- 
--CC	  = cc
--CFLAGS	  = -g $(DEFS) $(INCS)
--LDFLAGS	  =
--LIBS	  =
--RANLIB	  = ranlib
--INSTALL	  = /bin/install
-+#CC	  = cc
-+#CFLAGS	  = -g $(DEFS) $(INCS)
-+#LDFLAGS	  =
-+#LIBS	  =
-+#RANLIB	  = ranlib
-+#INSTALL	  = /bin/install
- 
- #
- # Solaris 2.x [[NB: if BIND/named not SMCC, try CFLAGS = ... -DBSD=1 ...]]
-@@ -438,6 +439,8 @@
- 
- # You must un-comment one, and only one, of the above sections!
- 
-+CFLAGS+= ${MERIT} ${STUFF}
-+
- # No modifications are necessary below this line except possibly near line 500.
- 
- all:	notice $(RADIUS) utils
-@@ -696,26 +699,26 @@
- 						$(MAN_INSDIR)/man8/radpwtst.8
- 
- config-install: $(CONFIGS)
--	-if [ ! -d $(RADDB_INSDIR) ] ;\
-+	-if [ ! -d $(RADDB_EXDIR) ] ;\
- 	then \
--		/bin/mkdir -p $(RADDB_INSDIR) ;\
-+		/bin/mkdir -p $(RADDB_EXDIR) ;\
- 	fi
- 	$(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/authfile \
--						$(RADDB_INSDIR)/authfile
-+						$(RADDB_EXDIR)/authfile
- 	$(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/clients \
--						$(RADDB_INSDIR)/clients
-+						$(RADDB_EXDIR)/clients
- 	$(INSTALL) $(M) 755 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/conversion.pl \
--						$(RADDB_INSDIR)/conversion.pl
-+						$(RADDB_EXDIR)/conversion.pl
- 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/dictionary \
--						$(RADDB_INSDIR)/dictionary
-+						$(RADDB_EXDIR)/dictionary
- 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/engine.config \
--						$(RADDB_INSDIR)/engine.config
-+						$(RADDB_EXDIR)/engine.config
- 	$(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/users \
--						$(RADDB_INSDIR)/users
-+						$(RADDB_EXDIR)/users
- 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/vendors \
--						$(RADDB_INSDIR)/vendors
-+						$(RADDB_EXDIR)/vendors
- 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/xas.fsm \
--						$(RADDB_INSDIR)/xas.fsm
-+						$(RADDB_EXDIR)/xas.fsm
- 	-if [ ! -d $(RADACCT_INSDIR) ] ;\
- 	then \
- 		/bin/mkdir -p $(RADACCT_INSDIR) ;\
diff --git a/net/radius/patches/patch-ab b/net/radius/patches/patch-ab
deleted file mode 100644
index 7f0a64ca947..00000000000
--- a/net/radius/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/02/29 01:13:36 kim Exp $
-
---- 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];
- 	static des_key_schedule key_sked;
--	extern unsigned long des_cbc_cksum ();
- 
- 	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 */
diff --git a/net/radius/patches/patch-ac b/net/radius/patches/patch-ac
deleted file mode 100644
index a45429edc5e..00000000000
--- a/net/radius/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $
-
---- src/rad.ftp.c.orig	Sat Oct 10 16:17:47 1998
-+++ src/rad.ftp.c	Sun Mar 21 19:56:35 1999
-@@ -3,6 +3,8 @@
- 
- /* this file still needs to be proof-read for cross-platform compatibility */
- 
-+#include <sys/types.h>
-+
- /* used by ???*/
- #include <sys/ioctl.h>
- 
diff --git a/net/radius/patches/patch-ad b/net/radius/patches/patch-ad
deleted file mode 100644
index c778cba5dd5..00000000000
--- a/net/radius/patches/patch-ad
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/08/06 15:35:10 tron Exp $
-
---- src/rad.skey.c.orig	Sat Oct 10 22:18:08 1998
-+++ src/rad.skey.c	Sun Aug  6 17:32:58 2000
-@@ -2,6 +2,7 @@
- /*   Bradley Urberg Carlson <bradley@mr.net>   */
- 
- #include <stdio.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <syslog.h>
- #include <sys/param.h>
-@@ -75,11 +76,15 @@
- 		*ptr = NULL;
- 	}
- 
-+#ifndef __NetBSD__
- 	/* Check if this user has valid SKEY information and get the challenge. */
- 	if (skeyinfo(&skey, username, challenge) == 0)
- 	{
- 		/* position the pointer in the key for verification */
- 		if (skeylookup (&skey, username) != 0) 
-+#else
-+		if (skeychallenge (&skey, username, challenge, sizeof(challenge)) != 0) 
-+#endif
- 		{
- 			dprintf(2, (LOG_DAEMON, LOG_DEBUG, "%s: skeylookup failed.", func));
- 			return EV_NAK;
-@@ -92,7 +97,9 @@
- 		}
- 		reply_sprintf (0, authreq, "%s", challenge);
- 		return EV_NAK;
-+#ifndef __NetBSD__
- 	}
- 	/* The user has no SKEY information.  Just NAK */
- 	return EV_NAK;
-+#endif
- }
diff --git a/net/radius/patches/patch-ae b/net/radius/patches/patch-ae
deleted file mode 100644
index 763edfffb3e..00000000000
--- a/net/radius/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/04/24 22:40:36 tron Exp $
-
---- src/authenticate.c.orig	Mon Jul  6 19:43:07 1998
-+++ src/authenticate.c	Sun Apr 25 00:33:16 1999
-@@ -880,14 +880,7 @@
- 	{
- 		if (authtype_tv[check_item->lvalue] == (AATV *) NULL)
- 		{
--			logit (LOG_DAEMON, LOG_ERR,
--			 "%s: FATAL: Unsupported authentication type %d for %s",
--				func, check_item->lvalue, namepair->strvalue);
--
--			logit (LOG_DAEMON, LOG_ERR,
--				"%s: CHECK THE MAKEFILE BUILD!", func);
--
--			result = EV_FATAL;
-+			result = EV_NAK;
- 		}
- 		else
- 		{
diff --git a/net/radius/patches/patch-af b/net/radius/patches/patch-af
deleted file mode 100644
index d2e026886df..00000000000
--- a/net/radius/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/08/06 15:35:10 tron Exp $
-
---- src/rad.simult.c.orig	Sun Aug 29 22:45:31 1999
-+++ src/rad.simult.c	Sun Aug  6 17:31:41 2000
-@@ -2,6 +2,7 @@
- /*   Bradley Carlson <bradley@onvoy.com>   */
- 
- #include <stdio.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <syslog.h>
- #include <sys/param.h>