7 files changed, 63 insertions, 107 deletions

diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index e5aee999bd3c..ebeaccda0c97 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	radiusd-cistron
-PORTVERSION=	1.6.6
-PORTREVISION=	1
+PORTVERSION=	1.6.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/ \
 		ftp://ftp.freeradius.org/pub/radius/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc2
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A RADIUS-compliant remote authentication and accouting server
@@ -18,8 +18,9 @@ COMMENT=	A RADIUS-compliant remote authentication and accouting server
 MAKEFILE=	Makefile.BSD
 RADIUS_DIR=	${PREFIX}/etc/raddb
 MAKE_ENV+=	RADIUS_DIR="${RADIUS_DIR}"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAN1=		radclient.1 radlast.1 radtest.1 raduse.1 radwho.1 radzap.1
+MAN1=		radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
 MAN5=		clients.5rad naslist.5rad
 MAN8=		radiusd.8 radrelay.8 radwatch.8
 
@@ -44,7 +45,6 @@ do-install:
 .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
diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo
index ef2f151e1935..0251b6580d10 100644
--- a/net/radiusd-cistron/distinfo
+++ b/net/radiusd-cistron/distinfo
@@ -1 +1 @@
-MD5 (radiusd-cistron-1.6.6.tar.gz) = 16084870890fd2ec577dbe183b51a379
+MD5 (radiusd-cistron-1.6.7-rc2.tar.gz) = d419dc80afa87cef7f92ae0e6cde2485
diff --git a/net/radiusd-cistron/files/patch-Make.inc b/net/radiusd-cistron/files/patch-Make.inc
new file mode 100644
index 000000000000..d4bbc8468358
--- /dev/null
+++ b/net/radiusd-cistron/files/patch-Make.inc
@@ -0,0 +1,20 @@
+--- src/Make.inc.orig	Thu Apr 10 12:51:47 2003
++++ src/Make.inc	Wed Jun 25 17:24:21 2003
+@@ -4,7 +4,7 @@
+ #
+ #
+ 
+-RADIUS_DIR    = /etc/raddb
++RADIUS_DIR    = ${PREFIX}/etc/raddb
+ 
+ SERVER_OBJS   = radiusd.o files.o acct.o pam.o version.o proxy.o \
+ 			exec.o auth.o timestr.o cache.o readusers.o
+@@ -143,7 +143,7 @@
+ 	@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; \
+ 	done; true
+ 	@# Install the dictionary files
+ 	@sh dict-install.sh ../raddb $(RADIUS_DIR) $(SHAREDIR)
diff --git a/net/radiusd-cistron/files/patch-ab b/net/radiusd-cistron/files/patch-ab
deleted file mode 100644
index 2f7af57fb214..000000000000
--- a/net/radiusd-cistron/files/patch-ab
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/Make.inc	2002/02/23 11:36:58	1.1
-+++ src/Make.inc	2002/02/23 11:38:44
-@@ -4,7 +4,7 @@
- #
- #
- 
--RADIUS_DIR    = /etc/raddb
-+RADIUS_DIR    = ${PREFIX}/etc/raddb
- 
- SERVER_OBJS   = radiusd.o files.o acct.o pam.o version.o proxy.o \
- 			exec.o auth.o timestr.o cache.o readusers.o
-@@ -121,16 +121,16 @@
- 	$(DINSTALL) $(SBINDIR)
- 	$(DINSTALL) $(BINDIR)
- 	$(DINSTALL) $(RADIUS_DIR)
--	$(INSTALL) -m 755 -s radiusd  $(SBINDIR)/radiusd
--	$(INSTALL) -m 755 -s radrelay $(SBINDIR)/radrelay
--	$(INSTALL) -m 755 -s radwho  $(BINDIR)
--	$(INSTALL) -m 755 -s raduse  $(BINDIR)
--	$(INSTALL) -m 755 -s radzap  $(BINDIR)
--	$(INSTALL) -m 755 -s radclient $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} radiusd  $(SBINDIR)/radiusd
-+	${BSD_INSTALL_PROGRAM} radrelay $(SBINDIR)/radrelay
-+	${BSD_INSTALL_PROGRAM} radwho  $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} raduse  $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} radzap  $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} radclient $(BINDIR)
- 	test -z "$(DBM)" || $(INSTALL) -m 755 -s builddbm $(BINDIR)
--	$(INSTALL) -m 755    checkrad.pl $(SBINDIR)/checkrad
--	$(INSTALL) -m 755    radlast $(BINDIR)
--	$(INSTALL) -m 755    radtest $(BINDIR)
-+	${BSD_INSTALL_SCRIPT} checkrad.pl $(SBINDIR)/checkrad
-+	${BSD_INSTALL_SCRIPT} radlast  $(BINDIR)
-+	${BSD_INSTALL_SCRIPT} radtest $(BINDIR)
- 	# Install the man pages
- 	@for section in 1 5 8; do \
- 		$(DINSTALL) $(MANDIR)/man$$section; \
-@@ -147,7 +147,7 @@
- 	@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; \
- 	done; \
- 	for i in dictionary*; do \
- 		[ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
-@@ -156,10 +156,3 @@
- 			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
--
--
diff --git a/net/radiusd-cistron/files/patch-af b/net/radiusd-cistron/files/patch-af
index 1a504c78d343..a99d3287fd2a 100644
--- a/net/radiusd-cistron/files/patch-af
+++ b/net/radiusd-cistron/files/patch-af
@@ -1,6 +1,6 @@
---- 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	Wed Jun 11 15:32:33 2003
++++ src/radwho.c	Wed Jun 25 17:41:32 2003
+@@ -20,6 +20,7 @@
  #include <errno.h>
  #include <sys/stat.h>
  #include <sys/utsname.h>
@@ -8,35 +8,38 @@
  #include <time.h>
  #include <ctype.h>
  #include <netinet/in.h>
-@@ -34,18 +35,21 @@
+@@ -40,18 +41,20 @@
   *	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";
+-char *ufmt1r = "%s,%s,%s,%s,%s,%s,%s%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 *ufmt1r = "%s,%s,%s,%s,%s,%s,%s%s";
++char *ufmt1r = "%s,%s,%s,%s,%s,%s,%u%s";
 -char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.19s%s";
+-char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%s%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";
++char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%u%s";
 +#define FMT1_HOST_SIZE        13
  
  char *hdr2 = 
 -"Login      Port    What   When          From       Location";
 -char *ufmt2 = "%-10.10s %-6.6d %-7.7s %-13.13s %-10.10s %-.16s%s";
+-char *ufmt2r = "%s,%u,%s,%s,%s,%s%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 *ufmt2r = "%s,%u,%s,%s,%s,%u%s";
 -char *rfmt2 = "%-10.10s %s%-5d  %-6.6s %-13.13s %-10.10s %-.28s%s";
+-char *rfmt2r = "%s,%s%u,%s,%s,%s,%s%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";
++char *rfmt2r = "%s,%s%u,%s,%s,%s,%u%s";
 +#define FMT2_HOST_SIZE        19
-+
  
  char *eol = "\n";
  NAS *naslist;
-@@ -301,7 +305,8 @@
+@@ -307,7 +312,8 @@
  		return tmp;
  	}
  	if (strncmp(tty, "cu", 2) == 0) {
@@ -46,7 +49,7 @@
  	}
  	return "??";
  }
-@@ -363,6 +368,8 @@
+@@ -371,6 +377,8 @@
   */
  int main(int argc, char **argv)
  {
@@ -55,7 +58,7 @@
  	FILE *fp;
  	struct radutmp rt;
  	struct utmp ut;
-@@ -378,6 +385,11 @@
+@@ -389,6 +397,11 @@
  	char *p, *q, *portind;
  	int c, portno;
  
@@ -67,7 +70,7 @@
  	while((c = getopt(argc, argv, "Dd:flhnsipcru:")) != EOF) switch(c) {
  		case 'D':
  			use_dns = 0;
-@@ -469,14 +481,17 @@
+@@ -486,14 +499,17 @@
  		while(fread(&ut, sizeof(ut), 1, fp) == 1) {
  #ifdef USER_PROCESS
  			if (ut.ut_user[0] && ut.ut_line[0] &&
@@ -90,7 +93,7 @@
  					"shell",
  					ttyshort(ut.ut_line),
  #ifdef __svr4__
-@@ -485,10 +500,11 @@
+@@ -502,10 +518,11 @@
  					dotime(ut.ut_time),
  #endif
  					ut.ut_host,
@@ -103,7 +106,7 @@
  					ttyshort(ut.ut_line),
  					"shell",
  #ifdef __svr4__
-@@ -497,6 +513,7 @@
+@@ -514,6 +531,7 @@
  					dotime(ut.ut_time),
  #endif
  					ut.ut_host,
@@ -111,7 +114,7 @@
  					myname, eol);
  			}
  		}
-@@ -541,6 +558,7 @@
+@@ -560,6 +578,7 @@
  				portind, portno,
  				dotime(rt.time),
  				nasname(ntohl(rt.nas_address)),
@@ -119,7 +122,7 @@
  				hostname(rt.framed_address), eol);
  			else
  			    printf((rawoutput == 0? rfmt2: rfmt2r),
-@@ -549,6 +567,7 @@
+@@ -568,6 +587,7 @@
  				proto(rt.proto, rt.porttype),
  				dotime(rt.time),
  				nasname(ntohl(rt.nas_address)),
diff --git a/net/radiusd-cistron/files/patch-raduse b/net/radiusd-cistron/files/patch-raduse
index bc60ed5ab729..609b25f2f432 100644
--- a/net/radiusd-cistron/files/patch-raduse
+++ b/net/radiusd-cistron/files/patch-raduse
@@ -1,14 +1,3 @@
---- src/raduse.c	Mon May  7 14:33:45 2001
-+++ src/raduse.c	Thu Apr  3 09:25:17 2003
-@@ -271,7 +271,7 @@
- 
- int main(int argc, char **argv)
- {
--  char *radwtmp_path;
-+  char *radwtmp_path = RADWTMP;
-   int wide = 0;
-   int c;
-   int offset = 0;
 --- src/cache.c	Mon May  7 14:33:45 2001
 +++ src/cache.c	Thu Apr  3 09:39:09 2003
 @@ -51,7 +51,10 @@
@@ -34,9 +23,9 @@
  	int		state = 0;
  	int		c;
  
---- src/pair.c	Mon Nov 26 14:51:59 2001
-+++ src/pair.c	Thu Apr  3 09:44:46 2003
-@@ -429,9 +429,9 @@
+--- src/pair.c.orig	Wed Jun  4 17:45:28 2003
++++ src/pair.c	Wed Jun 25 17:45:01 2003
+@@ -444,9 +444,9 @@
  	VALUE_PAIR	*pair;
  	struct tm	*tm;
  	time_t		timeval;
@@ -45,9 +34,9 @@
  	int		rcode;
 -	int		tag;
 +	int		tag = 0;
+ 	int		base;
  
  	rcode = USERPARSE_EOS;
- 	mode = PARSE_MODE_NAME;
 --- src/radclient.c	Tue Nov 13 05:55:14 2001
 +++ src/radclient.c	Thu Apr  3 09:46:58 2003
 @@ -122,10 +122,10 @@
diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist
index f349c66d1b63..165e8ca38b75 100644
--- a/net/radiusd-cistron/pkg-plist
+++ b/net/radiusd-cistron/pkg-plist
@@ -1,23 +1,10 @@
 bin/radclient
 bin/radlast
 bin/radtest
-bin/raduse
 bin/radwho
 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
-etc/raddb/dictionary.versanet
 etc/raddb/hints.sample
 etc/raddb/huntgroups.sample
 etc/raddb/naslist.sample
@@ -28,6 +15,19 @@ etc/rc.d/radiusd.sh
 sbin/checkrad
 sbin/radiusd
 sbin/radrelay
+share/radius/dictionary.ascend
+share/radius/dictionary.bay
+share/radius/dictionary.cisco
+share/radius/dictionary.cistron
+share/radius/dictionary.compat
+share/radius/dictionary.erx
+share/radius/dictionary.livingston
+share/radius/dictionary.redback
+share/radius/dictionary.shiva
+share/radius/dictionary.standard
+share/radius/dictionary.tunnel
+share/radius/dictionary.usr
+share/radius/dictionary.versanet
 share/doc/radiusd-cistron/COPYRIGHT
 share/doc/radiusd-cistron/ChangeLog
 share/doc/radiusd-cistron/INSTALL
@@ -40,6 +40,7 @@ share/doc/radiusd-cistron/README.simul
 share/doc/radiusd-cistron/README.usersfile
 @dirrm etc/raddb
 @dirrm share/doc/radiusd-cistron
+@dirrm share/radius
 @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."