From 81c90fadaa1973c18755f01580b7fba025080887 Mon Sep 17 00:00:00 2001 From: kuriyama Date: Thu, 8 Oct 1998 14:49:28 +0000 Subject: I've checked and make changes from submittion as following patch. (1) PKGNAME satisfies handbook rule. (2) @dirrm lib/radius fails when lib/radius/acct exists. Submitted by: Stefan Esser ----- diff -urN -x CVS merit/Makefile radius/Makefile --- merit/Makefile Fri Sep 18 02:00:05 1998 +++ radius/Makefile Wed Oct 7 23:54:43 1998 @@ -7,7 +7,7 @@ # DISTNAME= radius.3.6B.basic -PKGNAME= radius-3.6B.basic +PKGNAME= radius-basic-3.6B CATEGORIES= net MASTER_SITES= ftp://ftp.merit.edu/radius/releases/ diff -urN -x CVS merit/pkg/PLIST radius/pkg/PLIST --- merit/pkg/PLIST Fri Sep 18 01:58:28 1998 +++ radius/pkg/PLIST Wed Oct 7 23:51:47 1998 @@ -12,4 +12,5 @@ lib/radius/db/engine.config.sample lib/radius/db/vendors.sample @dirrm lib/radius/db +@dirrm lib/radius/acct @dirrm lib/radius ----- --- net/radius/Makefile | 12 +++++------ net/radius/distinfo | 3 ++- net/radius/files/patch-aa | 55 ++++++++++++++++++++++------------------------- net/radius/files/patch-ab | 8 +++---- net/radius/files/patch-ac | 30 +++++++++++--------------- net/radius/files/patch-ad | 43 ++++++++++++++++-------------------- net/radius/pkg-plist | 6 ++++-- 7 files changed, 74 insertions(+), 83 deletions(-) (limited to 'net/radius') diff --git a/net/radius/Makefile b/net/radius/Makefile index 33553cf..041ec8a 100644 --- a/net/radius/Makefile +++ b/net/radius/Makefile @@ -3,14 +3,13 @@ # Date created: 4. July 1996 # Whom: torstenb@FreeBSD.ORG # -# $Id: Makefile,v 1.8 1998/07/24 18:43:57 asami Exp $ +# $Id: Makefile,v 1.9 1998/09/16 21:27:59 torstenb Exp $ # -DISTNAME= radius.2.4.23 -PKGNAME= radius-2.4.23 +DISTNAME= radius.3.6B.basic +PKGNAME= radius-basic-3.6B CATEGORIES= net MASTER_SITES= ftp://ftp.merit.edu/radius/releases/ -DISTFILES= radius.23c.basic.tar.gz MAINTAINER= ports@FreeBSD.org @@ -21,8 +20,9 @@ NO_CDROM= not allowed to charge fee for redistribution NO_WRKSUBDIR= yes INSTALL_TARGET= install-all MAKE-FLAGS+= -DPREFIX=${PREFIX} -MAN5= dictionary.5 users.5 radius.fsm.5 authfile.5 clients.5 -MAN8= builddbm.8 radcheck.8 radiusd.8 radpwtst.8 +MAN5= authfile.5 clients.5 dictionary.5 engine.config.5 \ + radius.fsm.5 users.5 vendors.5 +MAN8= builddbm.8 dnscheck.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 75b6a72..ee6727a 100644 --- a/net/radius/distinfo +++ b/net/radius/distinfo @@ -1 +1,2 @@ -MD5 (radius.23c.basic.tar.gz) = b428ce959558fc2055a375d6ec6b30fa +MD5 (radius.3.6B.basic.tar.gz) = 13dcc8f99cf4fa3cc421c47aaf48172b +SIZE (radius.3.6B.basic.tar.gz) = 424424 diff --git a/net/radius/files/patch-aa b/net/radius/files/patch-aa index 95bc814..4d54d6f 100644 --- a/net/radius/files/patch-aa +++ b/net/radius/files/patch-aa @@ -1,6 +1,5 @@ -diff -ru orig/Makefile ./Makefile ---- orig/Makefile Sun Sep 22 14:00:16 1996 -+++ Makefile Mon Jul 28 11:07:04 1997 +--- Makefile~ Mon Jul 13 17:19:54 1998 ++++ Makefile Thu Sep 17 18:27:41 1998 @@ -51,11 +51,11 @@ # Where the configuration files live. RADDB = ./raddb @@ -8,7 +7,7 @@ diff -ru orig/Makefile ./Makefile -DAEMON_INSDIR = /usr/private/etc -BIN_INSDIR = /usr/private/etc -MAN_INSDIR = /usr/local/man --RADDB_INSDIR = /usr/private/etc/raddb +-RADDB_INSDIR = /usr/private/etc/raddb.new -RADACCT_INSDIR = /usr/private/etc/radacct +DAEMON_INSDIR = ${PREFIX}/sbin +BIN_INSDIR = ${PREFIX}/bin @@ -18,21 +17,23 @@ diff -ru orig/Makefile ./Makefile # 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 +@@ -67,8 +67,8 @@ - # 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 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=\"/usr/bin/gzip\" ++COMPRESS_ARGS = -DCOMPRESS_ARGS=\"-9\" # Define SRV to hold any combination of server names you'd like to override: #SRV3 = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\" -@@ -110,17 +110,22 @@ +@@ -122,17 +122,22 @@ # radiusd -- the default # #-------------------------------------------------------------------------- +.if !defined(MAKE_EBONES) - DEFS = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) + DEFS = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) RADLIBS = INCS = +.endif @@ -48,12 +49,12 @@ diff -ru orig/Makefile ./Makefile +DEFS = -DHAVE_SETVBUF -DM_KERB -DKRB_INSTANCE=\"$(KRB_INSTANCE)\" \ + -DNOSHADOW $(MERIT) $(STUFF) +RADLIBS = -lkrb -ldes -+INCS = -I/usr/include/kerberosIV ++INCS = -I/usr/include +.endif # # akerb -@@ -219,12 +224,12 @@ +@@ -228,12 +233,12 @@ # #-------------------------------------------------------------------------- @@ -71,8 +72,8 @@ diff -ru orig/Makefile ./Makefile +#INSTALL = /bin/install # - # Solaris 2.x -@@ -304,14 +309,17 @@ + # Solaris 2.x [[NB: if BIND/named not SMCC, try CFLAGS = ... -DBSD=1 ...]] +@@ -316,14 +321,17 @@ # #-------------------------------------------------------------------------- @@ -80,7 +81,7 @@ diff -ru orig/Makefile ./Makefile -#CFLAGS = -O $(DEFS) $(INCS) -#LDFLAGS = -#LIBS = -lcrypt -lcompat --#MOSTUTIL = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK) +-#UTILS = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK) -#RANLIB = ranlib -#INSTALL = /usr/bin/install - @@ -91,23 +92,14 @@ diff -ru orig/Makefile ./Makefile + $(DEFS) $(INCS) +LDFLAGS = +LIBS = -lcrypt -lcompat -+MOSTUTIL = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK) ++UTILS = $(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 +612,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 +631,17 @@ + # May need '-qchars=signed' added to CFLAGS below to fix bug in wait status. +@@ -684,21 +692,21 @@ /bin/mkdir -p $(RADDB_INSDIR) ;\ fi $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/authfile \ @@ -122,13 +114,18 @@ diff -ru orig/Makefile ./Makefile $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/dictionary \ - $(RADDB_INSDIR)/dictionary + $(RADDB_INSDIR)/dictionary.sample + $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/engine.config \ +- $(RADDB_INSDIR)/engine.config ++ $(RADDB_INSDIR)/engine.config.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)/vendors \ +- $(RADDB_INSDIR)/vendors ++ $(RADDB_INSDIR)/vendors.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 8fb1f21..8254dfa 100644 --- a/net/radius/files/patch-ab +++ b/net/radius/files/patch-ab @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/radiusd.c~ Mon Jul 27 22:52:37 1998 ++++ src/radiusd.c Thu Sep 17 18:31:50 1998 +@@ -793,6 +793,19 @@ sigaction (SIGIOT, &action, NULL); /* Perhaps also known as SIGABRT ! */ sigaction (SIGFPE, &action, NULL); @@ -20,7 +20,7 @@ #ifdef _SC_OPEN_MAX if ((dtablesize = sysconf (_SC_OPEN_MAX)) == -1) { -@@ -709,6 +722,7 @@ +@@ -802,6 +815,7 @@ #else /* Assume BSD */ dtablesize = getdtablesize (); #endif /* _SC_OPEN_MAX */ diff --git a/net/radius/files/patch-ac b/net/radius/files/patch-ac index dfc58bf..e8412b8 100644 --- a/net/radius/files/patch-ac +++ b/net/radius/files/patch-ac @@ -1,7 +1,6 @@ -diff -ru orig/src/krb_conf.h ./src/krb_conf.h ---- orig/src/krb_conf.h Tue Jul 18 15:00:20 1995 -+++ src/krb_conf.h Tue Jun 17 16:09:47 1997 -@@ -22,7 +22,7 @@ +--- src/krb_conf.h~ Tue May 12 21:37:13 1998 ++++ src/krb_conf.h Thu Sep 17 18:33:35 1998 +@@ -20,7 +20,7 @@ #ifndef KRB_CONF_DEFS #define KRB_CONF_DEFS @@ -10,10 +9,9 @@ diff -ru orig/src/krb_conf.h ./src/krb_conf.h /* Byte ordering */ extern int krbONE; -diff -ru orig/src/krb_get_in_tkt.c ./src/krb_get_in_tkt.c ---- orig/src/krb_get_in_tkt.c Tue Jul 18 15:01:05 1995 -+++ src/krb_get_in_tkt.c Tue Jun 17 16:09:47 1997 -@@ -16,7 +16,7 @@ +--- src/krb_get_in_tkt.c.orig Tue May 12 21:37:16 1998 ++++ src/krb_get_in_tkt.c Thu Sep 17 18:33:35 1998 +@@ -13,7 +13,7 @@ #endif /* lint */ @@ -22,22 +20,20 @@ diff -ru orig/src/krb_get_in_tkt.c ./src/krb_get_in_tkt.c #include #include -diff -ru orig/src/mit_stringtokey.c ./src/mit_stringtokey.c ---- orig/src/mit_stringtokey.c Tue Jul 18 15:01:02 1995 -+++ src/mit_stringtokey.c Tue Jun 17 16:10:20 1997 -@@ -30,7 +30,7 @@ +--- src/mit_stringtokey.c.orig Tue May 12 21:37:17 1998 ++++ src/mit_stringtokey.c Thu Sep 17 18:33:35 1998 +@@ -29,7 +29,7 @@ #endif /* lint */ -#include +/* #include */ #include + #include #include - /*#include "des_internal.h"*/ -diff -ru orig/src/prot.h ./src/prot.h ---- orig/src/prot.h Wed May 22 09:53:11 1996 -+++ src/prot.h Tue Jun 17 16:09:47 1997 -@@ -13,7 +13,7 @@ +--- src/prot.h.orig Tue May 12 21:37:13 1998 ++++ src/prot.h Thu Sep 17 18:33:35 1998 +@@ -11,7 +11,7 @@ * Include file with authentication protocol information. */ diff --git a/net/radius/files/patch-ad b/net/radius/files/patch-ad index 2517a61..d6fe8e66 100644 --- a/net/radius/files/patch-ad +++ b/net/radius/files/patch-ad @@ -1,28 +1,23 @@ ---- src/rad.kerberos.c.orig Wed Sep 18 17:34:21 1996 -+++ src/rad.kerberos.c Tue Aug 26 12:57:28 1997 -@@ -84,7 +84,7 @@ - extern int mit_passwd_to_key (); - extern int afs_passwd_to_key (); +--- src/rad.kerberos.c~ Fri Jun 26 00:40:50 1998 ++++ src/rad.kerberos.c Thu Sep 17 18:50:28 1998 +@@ -80,8 +80,8 @@ --static int krb_pass PROTO((AUTH_REQ *, int, char *)); -+static int krb_pass (AUTH_REQ *, int, char *); + #include - #if defined(A_KERB) - static AATV akrb_aatv = -@@ -177,7 +177,8 @@ - #if defined(M_KERB) - if (strcmp (authreq->direct_aatv->id, "MKERB") == 0) - { -- krbval = krb_get_in_tkt (userid, "", realm, "krbtgt", realm, -+ krbval = krb_get_in_tkt (userid, KRB_INSTANCE, realm, "krbtgt", -+ realm, - DEFAULT_TKT_LIFE, mit_passwd_to_key, - NULL, passwd); - } -@@ -192,6 +193,12 @@ - } - #endif /* A_KERB */ +-static int krb_pass PROTO((AUTH_REQ *, int, char *, +- int (*) (AUTH_REQ *, int, char *))); ++static int krb_pass (AUTH_REQ *, int, char *, ++ int (*) (AUTH_REQ *, int, char *)); + + extern int debug_flag; + +@@ -225,8 +225,14 @@ + krbval = INTK_BADPW; /* Fail if type is bad somehow */ + /* get the ticket */ +- krbval = krb_get_in_tkt (userid, "", realm, "krbtgt", realm, ++ krbval = krb_get_in_tkt (userid, KRB_INSTANCE, realm, "krbtgt", realm, + DEFAULT_TKT_LIFE, passwd_to_key, NULL, passwd); + /* + * XXX + * This can be spoofed fairly easily... Should attempt to authenticate @@ -32,8 +27,8 @@ switch (krbval) { case INTK_OK: -@@ -207,6 +214,37 @@ - func, krbval); +@@ -294,6 +300,37 @@ + krbval, userid, realm); break; } +#ifdef M_KERB diff --git a/net/radius/pkg-plist b/net/radius/pkg-plist index 143c701..8857c9b 100644 --- a/net/radius/pkg-plist +++ b/net/radius/pkg-plist @@ -1,6 +1,7 @@ +sbin/radiusd +bin/radpass bin/radcheck bin/radpwtst -bin/radpass bin/dnscheck lib/radius/db/authfile.sample lib/radius/db/clients.sample @@ -8,7 +9,8 @@ lib/radius/db/conversion.pl.sample lib/radius/db/dictionary.sample lib/radius/db/users.sample lib/radius/db/xas.fsm.sample -sbin/radiusd +lib/radius/db/engine.config.sample +lib/radius/db/vendors.sample @dirrm lib/radius/db @dirrm lib/radius/acct @dirrm lib/radius -- cgit v1.1