From b58ffc5ef8c799a33b95612ee9fba779d4e747d1 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Wed, 20 Nov 1996 21:22:06 +0000 Subject: Upgrade to version 2.4.23. The master site does not even have the tarball for 2.4.21 anymore. --- net/radius/Makefile | 16 ++- net/radius/distinfo | 2 +- net/radius/files/patch-aa | 242 ++++++++++++++++++++-------------------------- net/radius/files/patch-ab | 64 ++++++------ net/radius/pkg-descr | 2 +- net/radius/pkg-plist | 9 +- 6 files changed, 150 insertions(+), 185 deletions(-) (limited to 'net/radius') diff --git a/net/radius/Makefile b/net/radius/Makefile index f61a2158cacd..78a815419308 100644 --- a/net/radius/Makefile +++ b/net/radius/Makefile @@ -1,23 +1,21 @@ # New ports collection makefile for: radius -# Version required: merit radius 2.4.21 +# Version required: merit radius 2.4.23 # Date created: 4. July 1996 # Whom: torstenb@FreeBSD.ORG # -# $Id: Makefile,v 1.3 1996/07/12 10:53:34 asami Exp $ +# $Id: Makefile,v 1.4 1996/11/18 11:35:48 asami Exp $ # -DISTNAME= radius.2.4.21 -PKGNAME= radius-2.4.21 +DISTNAME= radius.2.4.23 +PKGNAME= radius-2.4.23 CATEGORIES= net MASTER_SITES= ftp://ftp.merit.edu/radius/releases/ - -# Restrictive copyright in src/rlmadmin.c -RESTRICTED= "use for non-profit, non-commercial purposes on a shareware basis" +DISTFILES= radius.23c.basic.tar.gz NO_WRKSUBDIR= yes INSTALL_TARGET= install-all -MAN5= authfile.5 clients.5 dictionary.5 users.5 -MAN8= builddbm.8 radcheck.8 radiusd.8 radpwtst.8 rlmadmin.8 +MAN5= dictionary.5 users.5 radius.fsm.5 authfile.5 clients.5 +MAN8= builddbm.8 radcheck.8 radiusd.8 radpwtst.8 pre-install: ${MKDIR} ${PREFIX}/lib/radius/db ${PREFIX}/lib/radius/acct diff --git a/net/radius/distinfo b/net/radius/distinfo index c88557b4c723..75b6a72aacdb 100644 --- a/net/radius/distinfo +++ b/net/radius/distinfo @@ -1 +1 @@ -MD5 (radius.2.4.21.tar.gz) = 26e3e310ffdeb9e174e87a59494c86a8 +MD5 (radius.23c.basic.tar.gz) = b428ce959558fc2055a375d6ec6b30fa diff --git a/net/radius/files/patch-aa b/net/radius/files/patch-aa index caf9a39a3bad..7fdc511acc38 100644 --- a/net/radius/files/patch-aa +++ b/net/radius/files/patch-aa @@ -1,136 +1,106 @@ -*** Makefile.orig Thu Feb 22 20:14:50 1996 ---- Makefile Thu Jul 4 22:24:34 1996 -*************** -*** 49,59 **** - # 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 -! RADACCT_INSDIR = /usr/private/etc/radacct - # 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 macro is for OSF/1 and HP-UX, see below. ---- 49,59 ---- - # Where the configuration files live. - RADDB = ./raddb - # Some installation stuff. -! DAEMON_INSDIR = ${PREFIX}/sbin -! BIN_INSDIR = ${PREFIX}/bin -! MAN_INSDIR = ${PREFIX}/man -! RADDB_INSDIR = ${PREFIX}/lib/radius/db -! RADACCT_INSDIR = ${PREFIX}/lib/radius/acct - # 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 macro is for OSF/1 and HP-UX, see below. -*************** -*** 62,68 **** - RADGRP = bin - - # Define COMPRESS to hold the name of your favourite compress program: -! #COMPRESS = -DRADIUS_COMPRESS=\"/usr/local/bin/gzip\" - - # Define SRV to hold any combination of server names you'd like to override: - #SRV3 = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\" ---- 62,68 ---- - RADGRP = bin - - # Define COMPRESS to hold the name of your favourite compress program: -! COMPRESS = -DRADIUS_COMPRESS=\"/usr/bin/gzip\" - - # Define SRV to hold any combination of server names you'd like to override: - #SRV3 = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\" -*************** -*** 211,222 **** - # - #-------------------------------------------------------------------------- - -! CC = cc -! CFLAGS = -g -! LDFLAGS = -! LIBS = -! RANLIB = ranlib -! INSTALL = /bin/install - - # - # Solaris 2.x ---- 211,222 ---- - # - #-------------------------------------------------------------------------- - -! #CC = cc -! #CFLAGS = -g -! #LDFLAGS = -! #LIBS = -! #RANLIB = ranlib -! #INSTALL = /bin/install - - # - # Solaris 2.x -*************** -*** 298,308 **** - - #CC = cc - #CFLAGS = -O -! #LDFLAGS = -! #LIBS = -lcrypt -lcompat -! #MOSTUTIL = $(RADCHECK) $(RADPWTST) $(RADPASS) -! #RANLIB = ranlib -! #INSTALL = /usr/bin/install - - # - # AIX 3.2.5 (if using xlc(1) add -D_ALL_SOURCE to CFLAGS below) ---- 298,311 ---- - - #CC = cc - #CFLAGS = -O -! CFLAGS += -DRADIUS_DIR=\"${PREFIX}/lib/radius/db\" \ -! -DRADACCT_DIR=\"${PREFIX}/lib/radius/acct\" \ -! -DRADIUS_COMPRESS=\"/usr/bin/gzip\" -! LDFLAGS = -! LIBS = -lcrypt -lcompat -! MOSTUTIL = $(RADCHECK) $(RADPWTST) $(RADPASS) -! RANLIB = ranlib -! INSTALL = /usr/bin/install -c - - # - # AIX 3.2.5 (if using xlc(1) add -D_ALL_SOURCE to CFLAGS below) -*************** -*** 607,623 **** - /bin/mkdir $(RADDB_INSDIR) ;\ - fi - $(INSTALL) -m 660 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/authfile \ -! $(RADDB_INSDIR)/authfile - $(INSTALL) -m 660 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/clients \ -! $(RADDB_INSDIR)/clients - $(INSTALL) -m 644 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/dictionary \ -! $(RADDB_INSDIR)/dictionary - $(INSTALL) -m 644 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/rlmadmin.help \ -! $(RADDB_INSDIR)/rlmadmin.help - $(INSTALL) -m 660 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/users \ -! $(RADDB_INSDIR)/users - $(INSTALL) -m 4755 $(O) root -g $(RADGRP) $(SPECIAL) \ -! $(RADDB_INSDIR)/rlmadmin - -if [ ! -d $(RADACCT_INSDIR) ] ;\ - then \ - /bin/mkdir $(RADACCT_INSDIR) ;\ ---- 610,626 ---- - /bin/mkdir $(RADDB_INSDIR) ;\ - fi - $(INSTALL) -m 660 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/authfile \ -! $(RADDB_INSDIR)/authfile.sample - $(INSTALL) -m 660 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/clients \ -! $(RADDB_INSDIR)/clients.sample - $(INSTALL) -m 644 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/dictionary \ -! $(RADDB_INSDIR)/dictionary.sample - $(INSTALL) -m 644 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/rlmadmin.help \ -! $(RADDB_INSDIR)/rlmadmin.help.sample - $(INSTALL) -m 660 $(O) $(RADOWN) -g $(RADGRP) $(RADDB)/users \ -! $(RADDB_INSDIR)/users.sample - $(INSTALL) -m 4755 $(O) root -g $(RADGRP) $(SPECIAL) \ -! $(RADDB_INSDIR)/rlmadmin.sample - -if [ ! -d $(RADACCT_INSDIR) ] ;\ - then \ - /bin/mkdir $(RADACCT_INSDIR) ;\ +--- Makefile.ORG Sun Sep 22 20:00:16 1996 ++++ Makefile Wed Nov 20 23:03:00 1996 +@@ -51,11 +51,11 @@ + # 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 +-RADACCT_INSDIR = /usr/private/etc/radacct ++DAEMON_INSDIR = ${PREFIX}/sbin ++BIN_INSDIR = ${PREFIX}/bin ++MAN_INSDIR = ${PREFIX}/man ++RADDB_INSDIR = ${PREFIX}/lib/radius/db ++RADACCT_INSDIR = ${PREFIX}/lib/radius/acct + # 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. +@@ -66,7 +66,7 @@ + RADGRP = bin + + # Define COMPRESS to hold the name of your favourite compress program: +-#COMPRESS = -DRADIUS_COMPRESS=\"/usr/local/bin/gzip\" ++COMPRESS = -DRADIUS_COMPRESS=\"/usr/bin/gzip\" + + # Define SRV to hold any combination of server names you'd like to override: + #SRV3 = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\" +@@ -219,12 +219,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 +@@ -304,14 +304,17 @@ + # + #-------------------------------------------------------------------------- + +-#CC = cc +-#CFLAGS = -O $(DEFS) $(INCS) +-#LDFLAGS = +-#LIBS = -lcrypt -lcompat +-#MOSTUTIL = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK) +-#RANLIB = ranlib +-#INSTALL = /usr/bin/install +- ++CC = cc ++CFLAGS += -DRADIUS_DIR=\"${PREFIX}/lib/radius/db\" \ ++ -DRADACCT_DIR=\"${PREFIX}/lib/radius/acct\" \ ++ -DRADIUS_COMPRESS=\"/usr/bin/gzip\" \ ++ $(DEFS) ++LDFLAGS = ++LIBS = -lcrypt -lcompat ++MOSTUTIL = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK) ++RANLIB = ranlib ++INSTALL = /usr/bin/install -c ++ + # + # AIX 3.2.5 (if using xlc(1) add -D_ALL_SOURCE to CFLAGS below) + # +@@ -604,8 +607,6 @@ + $(MAN_INSDIR)/man5/clients.5 + $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/dictionary.5 \ + $(MAN_INSDIR)/man5/dictionary.5 +- $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/radbnr.conf.5 \ +- $(MAN_INSDIR)/man5/radbnr.conf.5 + $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/radius.fsm.5 \ + $(MAN_INSDIR)/man5/radius.fsm.5 + $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/users.5 \ +@@ -625,17 +626,17 @@ + /bin/mkdir -p $(RADDB_INSDIR) ;\ + fi + $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/authfile \ +- $(RADDB_INSDIR)/authfile ++ $(RADDB_INSDIR)/authfile.sample + $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/clients \ +- $(RADDB_INSDIR)/clients ++ $(RADDB_INSDIR)/clients.sample + $(INSTALL) $(M) 755 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/conversion.pl \ +- $(RADDB_INSDIR)/conversion.pl ++ $(RADDB_INSDIR)/conversion.pl.sample + $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/dictionary \ +- $(RADDB_INSDIR)/dictionary ++ $(RADDB_INSDIR)/dictionary.sample + $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/users \ +- $(RADDB_INSDIR)/users ++ $(RADDB_INSDIR)/users.sample + $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/xas.fsm \ +- $(RADDB_INSDIR)/xas.fsm ++ $(RADDB_INSDIR)/xas.fsm.sample + -if [ ! -d $(RADACCT_INSDIR) ] ;\ + then \ + /bin/mkdir -p $(RADACCT_INSDIR) ;\ diff --git a/net/radius/files/patch-ab b/net/radius/files/patch-ab index 58d69470e9cc..8fb1f2122e93 100644 --- a/net/radius/files/patch-ab +++ b/net/radius/files/patch-ab @@ -1,34 +1,30 @@ -*** src/radiusd.c.orig Thu Jul 4 12:26:45 1996 ---- src/radiusd.c Thu Jul 4 12:27:13 1996 -*************** -*** 477,482 **** ---- 477,495 ---- - sigaction (SIGIOT, &action, NULL); /* Perhaps also known as SIGABRT ! */ - sigaction (SIGFPE, &action, NULL); - -+ /* the max number of open files should never be used as an argument -+ * for select(). On systems that support more than 256 open files -+ * select() is not able to handle that many fd's. -+ * In this case the max. number of fd's for select should not be -+ * set to the maximum number of descriptors. -+ * Since I'm too lazy to correct the code I set dtablesize to -+ * FD_SETSIZE. This is the only portable way to use select() on -+ * all descriptors. See also "Advanced Programming in the Unix -+ * Environment" (from W. Richard Stevens) and the BSD 4.4 manpage for -+ * select(2). -+ */ -+ dtablesize = FD_SETSIZE; -+ #ifdef BOGUS_CODE - #ifdef _SC_OPEN_MAX - if ((dtablesize = sysconf (_SC_OPEN_MAX)) == -1) - { -*************** -*** 486,491 **** ---- 499,505 ---- - #else /* Assume BSD */ - dtablesize = getdtablesize (); - #endif /* _SC_OPEN_MAX */ -+ #endif /* BOGUS_CODE */ - - for (j = dtablesize; j >= 3; j--) - { +--- src/radiusd.c.ORG Thu Sep 19 20:19:35 1996 ++++ src/radiusd.c Wed Nov 20 22:41:39 1996 +@@ -700,6 +700,19 @@ + sigaction (SIGIOT, &action, NULL); /* Perhaps also known as SIGABRT ! */ + sigaction (SIGFPE, &action, NULL); + ++ /* the max number of open files should never be used as an argument ++ * for select(). On systems that support more than 256 open files ++ * select() is not able to handle that many fd's. ++ * In this case the max. number of fd's for select should not be ++ * set to the maximum number of descriptors. ++ * Since I'm too lazy to correct the code I set dtablesize to ++ * FD_SETSIZE. This is the only portable way to use select() on ++ * all descriptors. See also "Advanced Programming in the Unix ++ * Environment" (from W. Richard Stevens) and the BSD 4.4 manpage for ++ * select(2). ++ */ ++ dtablesize = FD_SETSIZE; ++#ifdef BOGUS_CODE + #ifdef _SC_OPEN_MAX + if ((dtablesize = sysconf (_SC_OPEN_MAX)) == -1) + { +@@ -709,6 +722,7 @@ + #else /* Assume BSD */ + dtablesize = getdtablesize (); + #endif /* _SC_OPEN_MAX */ ++#endif /* BOGUS_CODE */ + + for (j = dtablesize; j >= 3; j--) + { diff --git a/net/radius/pkg-descr b/net/radius/pkg-descr index b6798b7070d2..16bb3e68e43d 100644 --- a/net/radius/pkg-descr +++ b/net/radius/pkg-descr @@ -1,3 +1,3 @@ -radiusd is a server that handels access-requests for user authentication +radiusd is a server that handles access-requests for user authentication from radius clients. These clients may be terminal servers, Network Access Servers or other RADIUS servers. diff --git a/net/radius/pkg-plist b/net/radius/pkg-plist index 82cb757c6b90..ea0693172eff 100644 --- a/net/radius/pkg-plist +++ b/net/radius/pkg-plist @@ -1,19 +1,20 @@ bin/radcheck bin/radpwtst bin/radpass -sbin/radiusd +bin/dnscheck lib/radius/db/authfile.sample lib/radius/db/clients.sample +lib/radius/db/conversion.pl.sample lib/radius/db/dictionary.sample -lib/radius/db/rlmadmin.help.sample lib/radius/db/users.sample -lib/radius/db/rlmadmin.sample +lib/radius/db/xas.fsm.sample man/man5/dictionary.5.gz man/man5/users.5.gz +man/man5/radius.fsm.5.gz man/man5/authfile.5.gz man/man5/clients.5.gz man/man8/radiusd.8.gz man/man8/radpwtst.8.gz -man/man8/rlmadmin.8.gz man/man8/builddbm.8.gz man/man8/radcheck.8.gz +sbin/radiusd -- cgit v1.2.3