summaryrefslogtreecommitdiff
path: root/net/radiusd-cistron
diff options
context:
space:
mode:
authormartti <martti>2001-12-20 10:05:49 +0000
committermartti <martti>2001-12-20 10:05:49 +0000
commit9fde9ca41fd76654ed7004fc70e229cad3396848 (patch)
treee08539a640852e6875cb48e544e9f23bc4fed895 /net/radiusd-cistron
parentb77096eaf4bbc4ebb9bdd6017b8095ed827f43ae (diff)
downloadpkgsrc-9fde9ca41fd76654ed7004fc70e229cad3396848.tar.gz
Updated to 1.6.5.
* Bug fixes * Clean up BSD password file support again * Fixed bug in auth.c wrt decoding of short password attributes. * Server now replies to Status-Server inquiries. * Add "-v" switch to radzap (suggested by Dan Harkless). * Add "-Z" switch to radiusd, prevents logging of passwords for -y (suggested by Dan Harkless). * Change "duplicate detected" message to actually show _what_ authentication packet causes the duplicate * Wrote manualpages for radlast,radzap, radwho, radclient, radtest, radwatch and raduse. Yes, documentation! * Added -P pidfile option to radiusd and radrelay See the doc/ChangeLog file for a comple list of changes!
Diffstat (limited to 'net/radiusd-cistron')
-rw-r--r--net/radiusd-cistron/Makefile13
-rw-r--r--net/radiusd-cistron/PLIST20
-rw-r--r--net/radiusd-cistron/distinfo14
-rw-r--r--net/radiusd-cistron/patches/patch-aa23
-rw-r--r--net/radiusd-cistron/patches/patch-ab76
-rw-r--r--net/radiusd-cistron/patches/patch-ac11
-rw-r--r--net/radiusd-cistron/patches/patch-af28
7 files changed, 104 insertions, 81 deletions
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 960807dbcb6..19c4688f476 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/12/05 15:00:48 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/20 10:05:49 martti Exp $
-DISTNAME= radiusd-cistron-1.6.4
+DISTNAME= radiusd-cistron-1.6.5
CATEGORIES= net
MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/ \
ftp://ftp.freeradius.org/pub/radius/
@@ -18,17 +18,19 @@ do-install:
cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install
@${MKDIR} -m 700 /var/log/radacct
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiusd-cistron
- ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Cistron ${PREFIX}/share/doc/radiusd-cistron
- ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Livingston ${PREFIX}/share/doc/radiusd-cistron
+ ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog ${PREFIX}/share/doc/radiusd-cistron
- ${INSTALL_DATA} ${WRKSRC}/doc/INSTALL.OLD ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/radiusd-cistron
+ ${INSTALL_DATA} ${WRKSRC}/doc/README.CVX ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/README.Y2K ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/README.cisco ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/README.pam ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/README.proxy ${PREFIX}/share/doc/radiusd-cistron
+ ${INSTALL_DATA} ${WRKSRC}/doc/README.radrelay ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/README.simul ${PREFIX}/share/doc/radiusd-cistron
+ ${INSTALL_DATA} ${WRKSRC}/doc/README.tunnel ${PREFIX}/share/doc/radiusd-cistron
${INSTALL_DATA} ${WRKSRC}/doc/README.usersfile ${PREFIX}/share/doc/radiusd-cistron
+ ${INSTALL_MAN} ${WRKSRC}/doc/radclient.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/radlast.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/radtest.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/raduse.1 ${PREFIX}/man/man1
@@ -37,6 +39,7 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/doc/clients.5rad ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/naslist.5rad ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${PREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/doc/radrelay.8 ${PREFIX}/man/man8
${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${PREFIX}/man/man8
post-install:
diff --git a/net/radiusd-cistron/PLIST b/net/radiusd-cistron/PLIST
index 59761078f75..74953f48f7b 100644
--- a/net/radiusd-cistron/PLIST
+++ b/net/radiusd-cistron/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:27 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/20 10:05:49 martti Exp $
+bin/radclient
bin/radlast
bin/radtest
bin/raduse
@@ -7,9 +8,13 @@ bin/radzap
etc/raddb/clients.sample
etc/raddb/dictionary
etc/raddb/dictionary.ascend
+etc/raddb/dictionary.bay
etc/raddb/dictionary.cisco
+etc/raddb/dictionary.cistron
etc/raddb/dictionary.compat
+etc/raddb/dictionary.erx
etc/raddb/dictionary.livingston
+etc/raddb/dictionary.redback
etc/raddb/dictionary.shiva
etc/raddb/dictionary.tunnel
etc/raddb/dictionary.usr
@@ -20,6 +25,8 @@ etc/raddb/naslist.sample
etc/raddb/naspasswd.sample
etc/raddb/realms.sample
etc/raddb/users.sample
+etc/rc.d/radiusd.sh
+man/man1/radclient.1
man/man1/radlast.1
man/man1/radtest.1
man/man1/raduse.1
@@ -28,22 +35,23 @@ man/man1/radzap.1
man/man5/clients.5rad
man/man5/naslist.5rad
man/man8/radiusd.8
+man/man8/radrelay.8
man/man8/radwatch.8
sbin/checkrad
sbin/radiusd
-sbin/radwatch
-share/doc/radiusd-cistron/COPYRIGHT.Cistron
-share/doc/radiusd-cistron/COPYRIGHT.Livingston
+sbin/radrelay
+share/doc/radiusd-cistron/COPYRIGHT
share/doc/radiusd-cistron/ChangeLog
-share/doc/radiusd-cistron/INSTALL.OLD
share/doc/radiusd-cistron/README
+share/doc/radiusd-cistron/README.CVX
share/doc/radiusd-cistron/README.Y2K
share/doc/radiusd-cistron/README.cisco
share/doc/radiusd-cistron/README.pam
share/doc/radiusd-cistron/README.proxy
+share/doc/radiusd-cistron/README.radrelay
share/doc/radiusd-cistron/README.simul
+share/doc/radiusd-cistron/README.tunnel
share/doc/radiusd-cistron/README.usersfile
-etc/rc.d/radiusd.sh
@dirrm etc/raddb
@dirrm share/doc/radiusd-cistron
@unexec rm -f /var/log/radius.log
diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo
index 30c1e4f63c3..f7154bc29d4 100644
--- a/net/radiusd-cistron/distinfo
+++ b/net/radiusd-cistron/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2001/10/11 09:57:20 martti Exp $
+$NetBSD: distinfo,v 1.2 2001/12/20 10:05:49 martti Exp $
-SHA1 (radiusd-cistron-1.6.4.tar.gz) = df2b8790c09d077218685d1811dae0126cf0d2b9
-Size (radiusd-cistron-1.6.4.tar.gz) = 144054 bytes
-SHA1 (patch-aa) = 39ad1c632a8f4757acd2a45fcbd8302abf23d25f
-SHA1 (patch-ab) = ee7534f09d3a4391bf8e2e25abe57f18fcf61a0e
-SHA1 (patch-ac) = b5666314e0e049bf43e8ab96955fb565e9fc282d
-SHA1 (patch-af) = fac15b8bafe774eef0fb6cc3ffc9e5d143e20495
+SHA1 (radiusd-cistron-1.6.5.tar.gz) = 7887099977230db5e17a572a55a85747fdc0c8ca
+Size (radiusd-cistron-1.6.5.tar.gz) = 192854 bytes
+SHA1 (patch-aa) = 75e1c68a1732f9c9a4e4f81fba37c5823518cf4a
+SHA1 (patch-ab) = f0dc1a30b20c8057f56f3797b3252ea3a0f79f2b
+SHA1 (patch-ac) = 333090fb0d089774f59039215984962a4ffcce8a
+SHA1 (patch-af) = 4d9721cb866c98be64b8aca8675e1f192bca74d2
diff --git a/net/radiusd-cistron/patches/patch-aa b/net/radiusd-cistron/patches/patch-aa
index 45110adf23a..ae534863a16 100644
--- a/net/radiusd-cistron/patches/patch-aa
+++ b/net/radiusd-cistron/patches/patch-aa
@@ -1,27 +1,32 @@
-$NetBSD: patch-aa,v 1.1 2001/10/11 09:57:21 martti Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/20 10:05:50 martti Exp $
---- src/Makefile.BSD.orig Fri Jun 26 06:00:17 1998
-+++ src/Makefile.BSD Fri Oct 23 13:32:18 1998
-@@ -3,9 +3,9 @@
+--- src/Makefile.BSD.orig Fri Nov 9 17:03:23 2001
++++ src/Makefile.BSD Thu Dec 20 10:46:40 2001
+@@ -3,9 +3,8 @@
#
#
-CC = gcc
-CFLAGS = -Wall -g -DNOSHADOW
--LDFLAGS = # -s #tatic
-+#CC = gcc
-+CFLAGS += -DNOSHADOW -DPREFIX=\"$(PREFIX)\"
-+LDFLAGS = -s #tatic
+-LDFLAGS = # -s
++CFLAGS = -DNOSHADOW -DPREFIX=\"$(PREFIX)\"
++LDFLAGS = -s
LIBS =
LCRYPT = -lcrypt
-@@ -15,7 +15,7 @@
+@@ -16,11 +15,11 @@
#PAM = -DPAM
#PAMLIB = -lpam
+-INSTALL = install
+-DINSTALL = mkdir -p
++INSTALL = install -c
++DINSTALL= install -d
+
-BINDIR = /usr/local/bin
-SBINDIR = /usr/local/sbin
+BINDIR = $(PREFIX)/bin
+SBINDIR = $(PREFIX)/sbin
+ MANDIR = /usr/local/man
.include "Make.inc"
diff --git a/net/radiusd-cistron/patches/patch-ab b/net/radiusd-cistron/patches/patch-ab
index b8ee42b123d..2b6b0ef9ee9 100644
--- a/net/radiusd-cistron/patches/patch-ab
+++ b/net/radiusd-cistron/patches/patch-ab
@@ -1,55 +1,61 @@
-$NetBSD: patch-ab,v 1.1 2001/10/11 09:57:21 martti Exp $
+$NetBSD: patch-ab,v 1.2 2001/12/20 10:05:50 martti Exp $
---- src/Make.inc.orig Mon Apr 3 11:00:59 2000
-+++ src/Make.inc Wed May 3 18:56:35 2000
+--- src/Make.inc.orig Thu Dec 20 10:52:00 2001
++++ src/Make.inc Thu Dec 20 10:52:06 2001
@@ -4,7 +4,7 @@
#
#
--RADIUS_DIR = /etc/raddb
-+RADIUS_DIR = ${PREFIX}/etc/raddb
+-RADIUS_DIR = /etc/raddb
++RADIUS_DIR = ${PREFIX}/etc/raddb
- SERVER_OBJS = radiusd.o dict.o files.o util.o md5.o attrprint.o \
- acct.o radius.o pam.o log.o version.o proxy.o \
-@@ -111,21 +111,20 @@
+ SERVER_OBJS = radiusd.o files.o acct.o pam.o version.o proxy.o \
+ exec.o auth.o timestr.o cache.o readusers.o
+@@ -118,8 +118,6 @@
install:
# Install the binaries
-- install -d $(SBINDIR)
-- install -d $(BINDIR)
-- install -d $(RADIUS_DIR)
-- install -m 755 -s radiusd $(SBINDIR)/radiusd
-- install -m 755 -s radwho $(BINDIR)
-- install -m 755 -s raduse $(BINDIR)
-- install -m 755 -s radzap $(BINDIR)
-- install -m 755 -s radtest $(BINDIR)
-- install -m 755 checkrad.pl $(SBINDIR)/checkrad
-- install -m 755 radlast $(BINDIR)
-+ ${INSTALL} -d $(RADIUS_DIR)
-+ ${BSD_INSTALL_PROGRAM} radiusd $(SBINDIR)/radiusd
-+ ${BSD_INSTALL_PROGRAM} radwho $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} raduse $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} radzap $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} radtest $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} ../scripts/radwatch ${SBINDIR}/radwatch
-+ ${BSD_INSTALL_SCRIPT} checkrad.pl $(SBINDIR)/checkrad
-+ ${BSD_INSTALL_SCRIPT} radlast $(BINDIR)
+- $(DINSTALL) $(SBINDIR)
+- $(DINSTALL) $(BINDIR)
+ $(DINSTALL) $(RADIUS_DIR)
+ $(INSTALL) -m 755 -s radiusd $(SBINDIR)/radiusd
+ $(INSTALL) -m 755 -s radrelay $(SBINDIR)/radrelay
+@@ -131,35 +129,12 @@
+ $(INSTALL) -m 755 checkrad.pl $(SBINDIR)/checkrad
+ $(INSTALL) -m 755 radlast $(BINDIR)
+ $(INSTALL) -m 755 radtest $(BINDIR)
+- # Install the man pages
+- @for section in 1 5 8; do \
+- $(DINSTALL) $(MANDIR)/man$$section; \
+- for manfile in ../doc/*.$$section*; do \
+- echo $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \
+- $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \
+- done ; \
+- done
+- test -n "$(DBM)" || rm -f $(MANDIR)/man8/builddbm.8rad
+- @if [ -d /etc/pam.d/ ] && [ ! -f /etc/pam.d/radius ]; then \
+- $(INSTALL) -m 644 ../redhat/radiusd-pam /etc/pam.d/radius;\
+- fi
# Install the config files
- @echo "Creating/updating files in $(RADIUS_DIR)"; \
+ @echo; echo "Creating/updating files in $(RADIUS_DIR)"; \
cd ../raddb; \
for i in [a-c]* [e-z]*; do \
- [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
-+ [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i.sample; \
++ $(INSTALL) -m 444 $$i $(RADIUS_DIR)/$$i.sample; \
done; \
for i in dictionary*; do \
- [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
-@@ -133,8 +132,4 @@
- echo "** $(RADIUS_DIR)/$$i"; \
- nt=1; \
- fi; \
+- [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
+- if [ "`find $$i -newer $(RADIUS_DIR)/$$i`" ]; then \
+- echo "** $(RADIUS_DIR)/$$i"; \
+- nt=1; \
+- fi; \
- done; \
- if [ "$$nt" ]; then \
- echo "** The samples in ../raddb are newer than these files";\
- echo "** Please investigate and copy manually if appropriate";\
+- echo ;\
- fi
-+ done;
+-
+-
++ $(INSTALL) -m 444 $$i $(RADIUS_DIR)/$$i; \
++ done
diff --git a/net/radiusd-cistron/patches/patch-ac b/net/radiusd-cistron/patches/patch-ac
index 7e032a4fffe..d72e9e1ac05 100644
--- a/net/radiusd-cistron/patches/patch-ac
+++ b/net/radiusd-cistron/patches/patch-ac
@@ -1,10 +1,11 @@
-$NetBSD: patch-ac,v 1.1 2001/10/11 09:57:21 martti Exp $
+$NetBSD: patch-ac,v 1.2 2001/12/20 10:05:50 martti Exp $
---- src/conf.h.orig Thu Mar 30 10:24:59 2000
-+++ src/conf.h Wed May 3 18:37:57 2000
-@@ -1,6 +1,6 @@
- /* Default Database File Names */
+--- src/conf.h.orig Mon Nov 26 22:51:59 2001
++++ src/conf.h Thu Dec 20 09:36:45 2001
+@@ -6,7 +6,7 @@
+ */
+ /* Default Database File Names */
-#define RADIUS_DIR "/etc/raddb"
+#define RADIUS_DIR PREFIX "/etc/raddb"
#define RADLOG_DIR "/var/log"
diff --git a/net/radiusd-cistron/patches/patch-af b/net/radiusd-cistron/patches/patch-af
index 26513648e6e..89d520bc028 100644
--- a/net/radiusd-cistron/patches/patch-af
+++ b/net/radiusd-cistron/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
+$NetBSD: patch-af,v 1.2 2001/12/20 10:05:50 martti Exp $
---- src/radwho.c.orig Wed Jul 5 12:53:20 2000
-+++ src/radwho.c Wed Jan 10 23:55:49 2001
-@@ -16,6 +16,7 @@
+--- src/radwho.c.orig Mon May 7 22:33:45 2001
++++ src/radwho.c Thu Dec 20 09:38:25 2001
+@@ -20,6 +20,7 @@
#include <errno.h>
#include <sys/stat.h>
#include <sys/utsname.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
#include <time.h>
#include <ctype.h>
#include <netinet/in.h>
-@@ -34,18 +35,21 @@
+@@ -40,18 +41,21 @@
* Header above output and format.
*/
char *hdr1 =
@@ -38,7 +38,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
char *eol = "\n";
NAS *naslist;
-@@ -301,7 +305,8 @@
+@@ -307,7 +311,8 @@
return tmp;
}
if (strncmp(tty, "cu", 2) == 0) {
@@ -48,7 +48,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
}
return "??";
}
-@@ -363,6 +368,8 @@
+@@ -371,6 +376,8 @@
*/
int main(int argc, char **argv)
{
@@ -57,7 +57,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
FILE *fp;
struct radutmp rt;
struct utmp ut;
-@@ -378,6 +385,11 @@
+@@ -388,6 +395,11 @@
char *p, *q, *portind;
int c, portno;
@@ -66,10 +66,10 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
+ extra_width = ws.ws_col - 80;
+ }
+
- while((c = getopt(argc, argv, "Dflhnsipcr")) != EOF) switch(c) {
+ while((c = getopt(argc, argv, "Dd:flhnsipcru:")) != EOF) switch(c) {
case 'D':
use_dns = 0;
-@@ -469,14 +481,17 @@
+@@ -485,14 +497,17 @@
while(fread(&ut, sizeof(ut), 1, fp) == 1) {
#ifdef USER_PROCESS
if (ut.ut_user[0] && ut.ut_line[0] &&
@@ -92,7 +92,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
"shell",
ttyshort(ut.ut_line),
#ifdef __svr4__
-@@ -485,10 +500,11 @@
+@@ -501,10 +516,11 @@
dotime(ut.ut_time),
#endif
ut.ut_host,
@@ -105,7 +105,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
ttyshort(ut.ut_line),
"shell",
#ifdef __svr4__
-@@ -497,6 +513,7 @@
+@@ -513,6 +529,7 @@
dotime(ut.ut_time),
#endif
ut.ut_host,
@@ -113,7 +113,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
myname, eol);
}
}
-@@ -541,6 +558,7 @@
+@@ -557,6 +574,7 @@
portind, portno,
dotime(rt.time),
nasname(ntohl(rt.nas_address)),
@@ -121,7 +121,7 @@ $NetBSD: patch-af,v 1.1 2001/10/11 09:57:21 martti Exp $
hostname(rt.framed_address), eol);
else
printf((rawoutput == 0? rfmt2: rfmt2r),
-@@ -549,6 +567,7 @@
+@@ -565,6 +583,7 @@
proto(rt.proto, rt.porttype),
dotime(rt.time),
nasname(ntohl(rt.nas_address)),