9 files changed, 97 insertions, 66 deletions

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 5f6390859364..b37b5592cddd 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,12 +1,13 @@
 # New ports collection makefile for:	radiusd-cistron
-# Version required:	cistron radiusd 1.5.4.2
-# Date created:		19 Apr 1998
+# Version required:	cistron radiusd 1.5.4.3 (beta14)
+# Date created:		15 Jan 1999
 # Whom:			john@nlc.net.au
 #
 # $Id$
 #
 
-DISTNAME=	radiusd-cistron-1.5.4.2
+DISTNAME=	radiusd-cistron-1.5.4.3-beta14
+PKGNAME=	radiusd-cistron-1.5.4.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/
 
@@ -14,8 +15,11 @@ MAINTAINER=	john@nlc.net.au
 
 MAKEFILE=	Makefile.BSD
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
+MAN1=		radlast.1 radtest.1 raduse.1 radwho.1 radzap.1
 MAN5=		clients.5rad naslist.5rad
-MAN8=		radiusd.8
+MAN8=		radiusd.8 radwatch.8
 
 do-build:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE}
@@ -28,31 +32,42 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary ${PREFIX}/etc/raddb
 	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.ascend ${PREFIX}/etc/raddb
 	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.compat ${PREFIX}/etc/raddb
-	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.merit ${PREFIX}/etc/raddb
+	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.livingston ${PREFIX}/etc/raddb
+	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.tunnel ${PREFIX}/etc/raddb
+	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.usr ${PREFIX}/etc/raddb
 	${INSTALL_DATA} ${WRKSRC}/raddb/hints ${PREFIX}/etc/raddb
 	${INSTALL_DATA} ${WRKSRC}/raddb/huntgroups ${PREFIX}/etc/raddb
 	${INSTALL_DATA} ${WRKSRC}/raddb/naslist ${PREFIX}/etc/raddb
+	${INSTALL_DATA} ${WRKSRC}/raddb/naspasswd ${PREFIX}/etc/raddb
+	${INSTALL_DATA} ${WRKSRC}/raddb/realms ${PREFIX}/etc/raddb
 	${INSTALL_DATA} ${WRKSRC}/raddb/users ${PREFIX}/etc/raddb
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/COPYRIGHT ${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}/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.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.simul ${PREFIX}/share/doc/radiusd-cistron
-	${INSTALL_DATA} ${WRKSRC}/doc/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron
+	${INSTALL_DATA} ${WRKSRC}/doc/README.usersfile ${PREFIX}/share/doc/radiusd-cistron
 .endif
+	${INSTALL_MAN} ${WRKSRC}/doc/radlast.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/radtest.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/raduse.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/radwho.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/radzap.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/clients.5rad ${MANPREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/doc/naslist.5rad ${MANPREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${MANPREFIX}/man/man8
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/radiusd.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/radiusd.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/radiusd.sh; \
-		${ECHO} "[ -x ${PREFIX}/sbin/radiusd ] && ${PREFIX}/sbin/radiusd && echo -n ' radiusd'" >> ${PREFIX}/etc/rc.d/radiusd.sh; \
-		chmod 751 ${PREFIX}/etc/rc.d/radiusd.sh; \
-	fi
+	@${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/radiusd.sh.tmpl \
+		> ${PREFIX}/etc/rc.d/radiusd.sh
+	@chmod 555 ${PREFIX}/etc/rc.d/radiusd.sh
+	@chown root.wheel ${PREFIX}/etc/rc.d/radiusd.sh
 
 .include <bsd.port.mk>
diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo
index 23cdcef10368..8570e363d843 100644
--- a/net/radiusd-cistron/distinfo
+++ b/net/radiusd-cistron/distinfo
@@ -1 +1 @@
-MD5 (radiusd-cistron-1.5.4.2.tar.gz) = 9adb155d00faaade1fc303fa2ebd8ce0
+MD5 (radiusd-cistron-1.5.4.3-beta14.tar.gz) = 5af9e097ef93adac7e67636095f364a3
diff --git a/net/radiusd-cistron/files/patch-aa b/net/radiusd-cistron/files/patch-aa
index 5f80efbd42f0..45297b7a8937 100644
--- a/net/radiusd-cistron/files/patch-aa
+++ b/net/radiusd-cistron/files/patch-aa
@@ -1,13 +1,13 @@
---- src/Makefile.BSD.orig	Sat Nov 22 09:40:03 1997
-+++ src/Makefile.BSD	Fri Apr 24 09:21:12 1998
+--- 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 @@
  #
  #
  
 -CC	= gcc
--CFLAGS	= -g -DNOSHADOW
+-CFLAGS	= -Wall -g -DNOSHADOW
 -LDFLAGS	= # -s #tatic
-+#CC	= cc
++#CC	= gcc
 +CFLAGS	+= -DNOSHADOW -DPREFIX=\"$(PREFIX)\"
 +LDFLAGS	= -s #tatic
  LIBS	=
@@ -22,4 +22,4 @@
 +BINDIR  = $(PREFIX)/bin
 +SBINDIR = $(PREFIX)/sbin
  
- include Make.inc
+ .include "Make.inc"
diff --git a/net/radiusd-cistron/files/patch-ab b/net/radiusd-cistron/files/patch-ab
index 0d08eb8edbe2..4709d309d632 100644
--- a/net/radiusd-cistron/files/patch-ab
+++ b/net/radiusd-cistron/files/patch-ab
@@ -1,32 +1,21 @@
-diff -u --recursive src/conf.h.orig src/conf.h
---- src/conf.h.orig	Wed Sep 17 06:48:11 1997
-+++ src/conf.h	Fri Apr 10 23:02:03 1998
-@@ -1,6 +1,6 @@
- /* Default Database File Names */
+--- src/Make.inc.orig	Sun Dec 20 05:52:48 1998
++++ src/Make.inc	Mon Dec 21 16:48:37 1998
+@@ -102,10 +102,12 @@
+ 	rm -f ../build ../debian/substvars ../debian/files
  
--#define RADIUS_DIR		"/etc/raddb"
-+#define RADIUS_DIR		PREFIX "/etc/raddb"
- #define RADACCT_DIR		"/var/log/radacct"
- #define RADLOG_DIR		"/var/log"
+ install:
+-	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    checkrad.pl $(SBINDIR)/checkrad
+-	install -m 755    radlast $(BINDIR)
++	${BSD_INSTALL_PROGRAM} radiusd $(SBINDIR)/radiusd
++	${BSD_INSTALL_SCRIPT}  checkrad.pl $(SBINDIR)/checkrad
++	${BSD_INSTALL_SCRIPT}  ../scripts/radwatch $(SBINDIR)/radwatch
++	${BSD_INSTALL_SCRIPT}  radlast $(BINDIR)
++	${BSD_INSTALL_PROGRAM} radtest  $(BINDIR)
++	${BSD_INSTALL_PROGRAM} radwho  $(BINDIR)
++	${BSD_INSTALL_PROGRAM} raduse  $(BINDIR)
++	${BSD_INSTALL_PROGRAM} radzap  $(BINDIR)
  
-@@ -13,7 +13,7 @@
- #define RADIUS_HINTS		"hints"
- #define RADIUS_HUNTGROUPS	"huntgroups"
- 
--#define RADUTMP			"/var/log/radutmp"
-+#define RADUTMP			"/var/run/radutmp"
- #define RADWTMP			"/var/log/radwtmp"
- 
- #define RADIUS_PID		"/var/run/radiusd.pid"
-diff -u --recursive src/radutmp.h.orig src/radutmp.h
---- src/radutmp.h.orig	Tue Dec 23 08:30:31 1997
-+++ src/radutmp.h	Fri Apr 10 23:02:47 1998
-@@ -7,7 +7,7 @@
- #ifndef _RADUTMP_H
- #define _RADUTMP_H
- 
--#define RADUTMP "/var/log/radutmp"
-+#define RADUTMP "/var/run/radutmp"
- #define RADWTMP "/var/log/radwtmp"
- 
- /*
diff --git a/net/radiusd-cistron/files/patch-ac b/net/radiusd-cistron/files/patch-ac
index aa5bc65af060..0a3d1db894e9 100644
--- a/net/radiusd-cistron/files/patch-ac
+++ b/net/radiusd-cistron/files/patch-ac
@@ -1,11 +1,19 @@
-diff -u --recursive src/log.c.orig src/log.c
---- src/log.c.orig	Tue Feb 11 02:50:28 1997
-+++ src/log.c	Fri Apr 10 22:38:39 1998
-@@ -10,6 +10,7 @@
- #include	<stdlib.h>
- #include	<unistd.h>
- #include	<stdarg.h>
-+#include	<time.h>
- #include	"radiusd.h"
- 
- extern char	*radlog_dir;
+--- src/conf.h.orig	Mon Oct  5 23:51:13 1998
++++ src/conf.h	Fri Oct 23 13:32:58 1998
+@@ -1,6 +1,6 @@
+ /* Default Database File Names */
+ 
+-#define RADIUS_DIR		"/etc/raddb"
++#define RADIUS_DIR		PREFIX "/etc/raddb"
+ #define RADACCT_DIR		"/var/log/radacct"
+ #define RADLOG_DIR		"/var/log"
+ 
+@@ -14,7 +14,7 @@
+ #define RADIUS_HUNTGROUPS	"huntgroups"
+ #define RADIUS_REALMS		"realms"
+ 
+-#define RADUTMP			"/var/log/radutmp"
++#define RADUTMP			"/var/run/radutmp"
+ #define RADWTMP			"/var/log/radwtmp"
+ 
+ #define RADIUS_PID		"/var/run/radiusd.pid"
diff --git a/net/radiusd-cistron/files/radiusd.sh.tmpl b/net/radiusd-cistron/files/radiusd.sh.tmpl
new file mode 100644
index 000000000000..e616665f8e66
--- /dev/null
+++ b/net/radiusd-cistron/files/radiusd.sh.tmpl
@@ -0,0 +1,5 @@
+#!/bin/sh
+case "$1" in
+stop) killall radiusd;;
+*) [ -x !!PREFIX!!/sbin/radiusd ] && !!PREFIX!!/sbin/radiusd -y && echo -n ' radiusd';;
+esac
diff --git a/net/radiusd-cistron/pkg-comment b/net/radiusd-cistron/pkg-comment
index c30e6275fd10..16d50c2283cd 100644
--- a/net/radiusd-cistron/pkg-comment
+++ b/net/radiusd-cistron/pkg-comment
@@ -1 +1,4 @@
-A remote authentication server (radius daemon).
+Cistron RADIUS daemon. A remote authentication and accouting server.
+
+NOTE: This version of radiusd-cistron is in BETA, although it appears
+to work reliably.
diff --git a/net/radiusd-cistron/pkg-descr b/net/radiusd-cistron/pkg-descr
index f8c0184282b5..e75cfa5f9134 100644
--- a/net/radiusd-cistron/pkg-descr
+++ b/net/radiusd-cistron/pkg-descr
@@ -1,4 +1,4 @@
-This is the cistron radiusd server. radiusd is a server that handles
-access-requests for user authentication from radius clients. These
+This is the Cistron RADIUS daemon. Radiusd is a daemon that handles
+remote authentication requests and accounting for RADIUS clients. The
 clients may be terminal servers, Network Access Servers or other
 RADIUS servers.
diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist
index 8fbcc1e5e640..1fef720e7ca3 100644
--- a/net/radiusd-cistron/pkg-plist
+++ b/net/radiusd-cistron/pkg-plist
@@ -1,26 +1,37 @@
 bin/radlast
+bin/radtest
 bin/raduse
 bin/radwho
 bin/radzap
 sbin/checkrad
 sbin/radiusd
+sbin/radwatch
 etc/raddb/clients
 etc/raddb/dictionary
 etc/raddb/dictionary.ascend
 etc/raddb/dictionary.compat
-etc/raddb/dictionary.merit
+etc/raddb/dictionary.livingston
+etc/raddb/dictionary.tunnel
+etc/raddb/dictionary.usr
 etc/raddb/hints
 etc/raddb/huntgroups
 etc/raddb/naslist
+etc/raddb/naspasswd
+etc/raddb/realms
 etc/raddb/users
-share/doc/radiusd-cistron/COPYRIGHT
+share/doc/radiusd-cistron/COPYRIGHT.Cistron
+share/doc/radiusd-cistron/COPYRIGHT.Livingston
 share/doc/radiusd-cistron/ChangeLog
 share/doc/radiusd-cistron/INSTALL.OLD
 share/doc/radiusd-cistron/README
+share/doc/radiusd-cistron/README.cisco
 share/doc/radiusd-cistron/README.pam
+share/doc/radiusd-cistron/README.proxy
 share/doc/radiusd-cistron/README.simul
+share/doc/radiusd-cistron/README.usersfile
 etc/rc.d/radiusd.sh
 @dirrm etc/raddb
 @dirrm share/doc/radiusd-cistron
-@unexec rm -rf /var/log/radacct
 @unexec rm -f /var/log/radius.log
+@unexec rm -f /var/run/radiusd.pid
+@unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone."