Upgrade to 1.6.3-stable, this will be replaced by freeradius once they

actually make a release.

6 files changed, 78 insertions, 70 deletions

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 766e251e0707..5a984cc1ba8e 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	radiusd-cistron
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/
-DISTNAME=	radiusd-cistron-1.6.2-stable
+MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/ \
+		ftp://ftp.freeradius.org/pub/radius/
+DISTNAME=	radiusd-cistron-1.6.3-stable
 
 MAINTAINER=	john@nlc.net.au
 
@@ -24,24 +25,7 @@ do-build:
 
 do-install:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install
-	@${MKDIR} -m 700 ${PREFIX}/etc/raddb
 	@${MKDIR} -m 700 /var/log/radacct
-	${INSTALL_DATA} ${WRKSRC}/raddb/clients ${PREFIX}/etc/raddb/clients.sample
-	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary ${PREFIX}/etc/raddb/dictionary.sample
-	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.ascend ${PREFIX}/etc/raddb
-	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.cisco ${PREFIX}/etc/raddb
-	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.compat ${PREFIX}/etc/raddb
-	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.livingston ${PREFIX}/etc/raddb
-	${INSTALL_DATA} ${WRKSRC}/raddb/dictionary.shiva ${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/dictionary.versanet ${PREFIX}/etc/raddb
-	${INSTALL_DATA} ${WRKSRC}/raddb/hints ${PREFIX}/etc/raddb/hints.sample
-	${INSTALL_DATA} ${WRKSRC}/raddb/huntgroups ${PREFIX}/etc/raddb/huntgroups.sample
-	${INSTALL_DATA} ${WRKSRC}/raddb/naslist ${PREFIX}/etc/raddb/naslist.sample
-	${INSTALL_DATA} ${WRKSRC}/raddb/naspasswd ${PREFIX}/etc/raddb/naspasswd.sample
-	${INSTALL_DATA} ${WRKSRC}/raddb/realms ${PREFIX}/etc/raddb/realms.sample
-	${INSTALL_DATA} ${WRKSRC}/raddb/users ${PREFIX}/etc/raddb/users.sample
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/radiusd-cistron
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Cistron ${PREFIX}/share/doc/radiusd-cistron
diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo
index 923bb465e15d..f81c7bfda4ba 100644
--- a/net/radiusd-cistron/distinfo
+++ b/net/radiusd-cistron/distinfo
@@ -1 +1 @@
-MD5 (radiusd-cistron-1.6.2-stable.tar.gz) = d535fc95b7044b47f4f276d8d7ef6b6b
+MD5 (radiusd-cistron-1.6.3-stable.tar.gz) = 3f9231bc4bd1c63878947b5f72aaee30
diff --git a/net/radiusd-cistron/files/patch-ab b/net/radiusd-cistron/files/patch-ab
index 4709d309d632..6c516dd8caf4 100644
--- a/net/radiusd-cistron/files/patch-ab
+++ b/net/radiusd-cistron/files/patch-ab
@@ -1,21 +1,53 @@
---- 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
+--- src/Make.inc.orig	Mon Apr  3 11:00:59 2000
++++ src/Make.inc	Wed May  3 18:56:35 2000
+@@ -4,7 +4,7 @@
+ #
+ #
+ 
+-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 @@
  
  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_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)
- 
++	${BSD_INSTALL_PROGRAM} radtest $(BINDIR)
++	${BSD_INSTALL_SCRIPT} ../scripts/radwatch ${SBINDIR}/radwatch
++	${BSD_INSTALL_SCRIPT} checkrad.pl $(SBINDIR)/checkrad
++	${BSD_INSTALL_SCRIPT} radlast $(BINDIR)
+ 	# Install the config files
+ 	@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; \
+ 	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; \
+-	done; \
+-	if [ "$$nt" ]; then \
+-		echo "** The samples in ../raddb are newer than these files";\
+-		echo "** Please investigate and copy manually if appropriate";\
+-	fi
++	done;
diff --git a/net/radiusd-cistron/files/patch-ac b/net/radiusd-cistron/files/patch-ac
index 0a3d1db894e9..c48f09178890 100644
--- a/net/radiusd-cistron/files/patch-ac
+++ b/net/radiusd-cistron/files/patch-ac
@@ -1,19 +1,10 @@
---- src/conf.h.orig	Mon Oct  5 23:51:13 1998
-+++ src/conf.h	Fri Oct 23 13:32:58 1998
+--- 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 */
  
 -#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"
+ #ifdef aix
diff --git a/net/radiusd-cistron/files/patch-af b/net/radiusd-cistron/files/patch-af
index 7e424edaa90f..226c7f855507 100644
--- a/net/radiusd-cistron/files/patch-af
+++ b/net/radiusd-cistron/files/patch-af
@@ -1,5 +1,5 @@
---- src/radwho.c.orig	Wed Oct  6 23:13:29 1999
-+++ src/radwho.c	Fri Mar 10 23:06:27 2000
+--- src/radwho.c.orig	Fri Feb 25 05:47:53 2000
++++ src/radwho.c	Wed May  3 18:43:24 2000
 @@ -16,6 +16,7 @@
  #include <errno.h>
  #include <sys/stat.h>
@@ -8,34 +8,35 @@
  #include <time.h>
  #include <ctype.h>
  #include <netinet/in.h>
-@@ -34,18 +35,20 @@
+@@ -34,18 +35,21 @@
   *	Header above output and format.
   */
  char *hdr1 = 
 -"Login      Name              What  TTY  When      From      Location";
 -char *ufmt1 = "%-10.10s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.16s%s";
 +"Login            Name              What  TTY  When      From      Location";
-+char *ufmt1  = "%-16.16s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.*s%s";
++char *ufmt1 = "%-16.16s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.*s%s";
  char *ufmt1r = "%s,%s,%s,%s,%s,%s,%s%s";
--char *rfmt1 = "%-10.10s %-17.17s %-5.5s S%-3d %-9.9s %-9.9s %-.19s%s";
-+char *rfmt1  = "%-16.16s %-17.17s %-5.5s S%-3d %-9.9s %-9.9s %-.*s%s";
- char *rfmt1r = "%s,%s,%s,S%d,%s,%s,%s%s";
-+#define FMT1_HOST_SIZE	13
+-char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.19s%s";
++char *rfmt1 = "%-16.16s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.*s%s";
+ char *rfmt1r = "%s,%s,%s,%s%d,%s,%s,%s%s";
++#define FMT1_HOST_SIZE        13
  
  char *hdr2 = 
--"Login      Port    What      When          From       Location";
--char *ufmt2 = "%-10.10s %-7.7d %-9.9s %-13.13s %-10.10s %-.16s%s";
-+"Login            Port    What      When          From       Location";
-+char *ufmt2  = "%-16.16s %-7.7s %-9.9s %-13.13s %-10.10s %-.*s%s";
+-"Login      Port    What   When          From       Location";
+-char *ufmt2 = "%-10.10s %-6.6d %-7.7s %-13.13s %-10.10s %-.16s%s";
++"Login           Port    What   When          From       Location";
++char *ufmt2 = "%-16.16s %-6.6d %-7.7s %-13.13s %-10.10s %-.*s%s";
  char *ufmt2r = "%s,%d,%s,%s,%s,%s%s";
--char *rfmt2 = "%-10.10s S%-5d  %-9.9s %-13.13s %-10.10s %-.28s%s";
-+char *rfmt2  = "%-16.16s S%-6d %-9.9s %-13.13s %-10.10s %-.*s%s";
- char *rfmt2r = "%s,S%d,%s,%s,%s,%s%s";
-+#define FMT2_HOST_SIZE	19
+-char *rfmt2 = "%-10.10s %s%-5d  %-6.6s %-13.13s %-10.10s %-.28s%s";
++char *rfmt2 = "%-16.16s %s%-5d  %-6.6s %-13.13s %-10.10s %-.*s%s";
+ char *rfmt2r = "%s,%s%d,%s,%s,%s,%s%s";
++#define FMT2_HOST_SIZE        19
++
  
  char *eol = "\n";
  NAS *naslist;
-@@ -301,7 +304,8 @@
+@@ -301,7 +305,8 @@
  		return tmp;
  	}
  	if (strncmp(tty, "cu", 2) == 0) {
@@ -45,7 +46,7 @@
  	}
  	return "??";
  }
-@@ -363,6 +367,8 @@
+@@ -363,6 +368,8 @@
   */
  int main(int argc, char **argv)
  {
@@ -54,9 +55,9 @@
  	FILE *fp;
  	struct radutmp rt;
  	struct utmp ut;
-@@ -378,6 +384,11 @@
- 	char *p, *q;
- 	int c;
+@@ -378,6 +385,11 @@
+ 	char *p, *q, *portind;
+ 	int c, portno;
  
 +	ioctl(0, TIOCGWINSZ, &ws);
 +	if (ws.ws_col >= 80) {
@@ -66,7 +67,7 @@
  	while((c = getopt(argc, argv, "flhnsipcr")) != EOF) switch(c) {
  		case 'f':
  			fingerd++;
-@@ -465,14 +476,17 @@
+@@ -465,14 +477,17 @@
  		while(fread(&ut, sizeof(ut), 1, fp) == 1) {
  #ifdef USER_PROCESS
  			if (ut.ut_user[0] && ut.ut_line[0] &&
@@ -89,7 +90,7 @@
  					"shell",
  					ttyshort(ut.ut_line),
  #ifdef __svr4__
-@@ -481,10 +495,11 @@
+@@ -481,10 +496,11 @@
  					dotime(ut.ut_time),
  #endif
  					ut.ut_host,
@@ -102,7 +103,7 @@
  					ttyshort(ut.ut_line),
  					"shell",
  #ifdef __svr4__
-@@ -493,6 +508,7 @@
+@@ -493,6 +509,7 @@
  					dotime(ut.ut_time),
  #endif
  					ut.ut_host,
@@ -110,15 +111,15 @@
  					myname, eol);
  			}
  		}
-@@ -530,6 +546,7 @@
- 				rt.nas_port,
+@@ -537,6 +554,7 @@
+ 				portind, portno,
  				dotime(rt.time),
  				nasname(ntohl(rt.nas_address)),
 +				FMT1_HOST_SIZE + extra_width,
  				hostname(rt.framed_address), eol);
  			else
  			    printf((rawoutput == 0? rfmt2: rfmt2r),
-@@ -538,6 +555,7 @@
+@@ -545,6 +563,7 @@
  				proto(rt.proto, rt.porttype),
  				dotime(rt.time),
  				nasname(ntohl(rt.nas_address)),
diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist
index 01c3a7c03b80..ec14c0a7e6ea 100644
--- a/net/radiusd-cistron/pkg-plist
+++ b/net/radiusd-cistron/pkg-plist
@@ -7,7 +7,7 @@ sbin/checkrad
 sbin/radiusd
 sbin/radwatch
 etc/raddb/clients.sample
-etc/raddb/dictionary.sample
+etc/raddb/dictionary
 etc/raddb/dictionary.ascend
 etc/raddb/dictionary.cisco
 etc/raddb/dictionary.compat