Upgrade to radius-961029

7 files changed, 44 insertions, 58 deletions

diff --git a/net/ascend-radius/Makefile b/net/ascend-radius/Makefile
index 221a6815ea24..ff9d9d10b0b6 100644
--- a/net/ascend-radius/Makefile
+++ b/net/ascend-radius/Makefile
@@ -3,18 +3,22 @@
 # Date created:				August 28th 96
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1996/11/18 11:34:23 asami Exp $
+#   $Id: Makefile,v 1.6 1996/12/01 01:22:40 obrien Exp $
 #
 
-DISTNAME=	radius-961015
-PKGNAME=	ascend-radius-961015
+#DISTNAME=	radius-961029
+PKGNAME=	ascend-radius-961029
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/ \
 		ftp://ftp.ascend.com/pub/Software-Releases/Radius/Archive/
+DISTFILES=	radius-961029.tar.gz \
+		radius-961029.ps \
+		radius-961029.pdf
+EXTRACT_ONLY=	radius-961029.tar.gz
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-WRKPREFIX=	radius-961015/radius-1.16-ascend
+WRKPREFIX=	radius-961029/radius-1.16-ascend
 WRKSRC=		${WRKDIR}/${WRKPREFIX}/ascendd
 
 ALL_TARGET=	all dbm
@@ -33,6 +37,8 @@ do-install:
 		done
 		for file in ChangeLog README README.cexample README.dict; do \
 			${INSTALL_DATA} ${WRKDIR}/${WRKPREFIX}/$$file ${PREFIX}/share/doc/ascend-radius; \
+		${INSTALL_DATA} ${DISTDIR}/radius-961029.ps ${PREFIX}/share/doc/ascend-radius
+		${INSTALL_DATA} ${DISTDIR}/radius-961029.pdf ${PREFIX}/share/doc/ascend-radius
 		done
 .endif
 		@ ${MKDIR} ${PREFIX}/etc/raddb
diff --git a/net/ascend-radius/distinfo b/net/ascend-radius/distinfo
index 85c118ce8d4f..51f21a97933e 100644
--- a/net/ascend-radius/distinfo
+++ b/net/ascend-radius/distinfo
@@ -1 +1,3 @@
-MD5 (radius-961015.tar.gz) = 3b9ba79aa3b859e44c61672f2c19a274
+MD5 (radius-961029.tar.gz) = 2aae8a6884a1e3e9aa1c1e34639f2f0f
+MD5 (radius-961029.ps) = fd02772f5c854fba769d362441166412
+MD5 (radius-961029.pdf) = f51397eadd3d1fd31bed48676e806693
diff --git a/net/ascend-radius/files/patch-aa b/net/ascend-radius/files/patch-aa
index ebd1141e95af..2bdf0f52b602 100644
--- a/net/ascend-radius/files/patch-aa
+++ b/net/ascend-radius/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Oct 15 19:42:16 1996
-+++ Makefile	Fri Oct 18 11:54:35 1996
-@@ -108,8 +108,8 @@
+--- Makefile.orig	Tue Oct 29 14:44:07 1996
++++ Makefile	Fri Jan 24 05:00:19 1997
+@@ -111,8 +111,8 @@
  # Pick your compiler
  #
  #CC=	gcc -ansi -Wall	# set the GCC compiler to ANSI mode and picky
@@ -11,7 +11,7 @@
  #CC=	cc -Xc -v -fd	# set the SUN compiler to full-whine ANSI mode
  #CC=	cc -Xc -v	# set the SUN compiler to partial-whine ANSI mode
  #CC=	cc -Xc		# set the SUN compiler to ANSI mode
-@@ -129,13 +129,15 @@
+@@ -132,7 +132,7 @@
  #	use this for BSDI
  #CFLAGS= -O -DNOSHADOW -DBSDI -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
  #	use this for SunOS
@@ -20,26 +20,31 @@
  #	use this for Solaris 2.1 - 2.4
  #CFLAGS= -O -Dsys5 -DSOLARIS -D_SVID_GETTOD -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
  #	use this for Solaris 2.5
- #CFLAGS= -O -Dsys5 -DSOLARIS -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
+@@ -140,7 +140,7 @@
  #	use this for Linux
  #CFLAGS= -g -Dsys5 -DNOSHADOW -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
-+#	use this for FreeBSD
-+CFLAGS= -O -DNOSHADOW -D_HAVE_PARAM_H -DUSE_NDBM -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
+ #	use this for FreeBSD
+-#CFLAGS= -O -DNOSHADOW -DFreeBSD -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
++CFLAGS= -O -DNOSHADOW -D_HAVE_PARAM_H -DUSE_NDBM -DFreeBSD -DBINARY_FILTERS -DASCEND_SECRET -DASCEND_LOGOUT $(AUTH_SERVERS)
  
  # Pick any load options and the load libraries.  The AUTH_LIBS
  # are selected above
-@@ -145,11 +147,12 @@
+@@ -150,14 +150,14 @@
  # See above for the things you may need to add here
  #
  #LIBS= $(AUTH_LIBS)			# use this for Linux, BSDI and friends
 -LIBS= -lnsl $(AUTH_LIBS)		# use this for SunOS
-+LIBS= $(AUTH_LIBS) -lcrypt		# use this for FreeBSD
 +#LIBS= -lnsl $(AUTH_LIBS)		# use this for SunOS
  #LIBS= -lnsl -lsocket $(AUTH_LIBS)	# use this for Solaris 2.x
+-#LIBS= -lcrypt $(AUTH_LIBS)		# use this for FreeBSD
++LIBS= -lcrypt $(AUTH_LIBS)		# use this for FreeBSD
  
- #       use this for SunOs. Linux, BSDI
+ #       use this for SunOs. Linux, BSDI, FreeBSD
 -DBMLIBS= -ldbm
-+DBMLIBS=
++#DBMLIBS= -ldbm
  #       use this for Solaris
- #DBMLIBS=
+-#DBMLIBS=
++DBMLIBS=
  
+ CMN_OBJS=radiusd.o dict.o util.o md5.o attrprint.o filters.o \
+ 	 usr_read.o cache.o des.o radipa.o strerror.o
diff --git a/net/ascend-radius/files/patch-ab b/net/ascend-radius/files/patch-ab
index af3ff7bb60ac..ae43b7bf59c0 100644
--- a/net/ascend-radius/files/patch-ab
+++ b/net/ascend-radius/files/patch-ab
@@ -1,6 +1,6 @@
---- cache.c.orig	Sun Sep  1 02:31:42 1996
-+++ cache.c	Mon Sep 23 21:38:20 1996
-@@ -12,13 +12,21 @@
+--- cache.c.orig	Tue Oct 29 14:41:54 1996
++++ cache.c	Fri Jan 24 05:02:11 1997
+@@ -12,6 +12,10 @@
   *	FOR A PARTICULAR PURPOSE.
   */
  
@@ -10,15 +10,4 @@
 +
  #include	<sys/types.h>
  #include	<ctype.h>
- #if defined(BSDI)
- #	include	<memory.h>
- #	include	<stdlib.h>
- #else
-+#if defined(__FreeBSD__)
-+#	include <stdlib.h>
-+#else
- #	include	<malloc.h>
-+#endif
- #endif
- #include	<string.h>
- #include	<sys/time.h>
+ #if defined(BSDI) || defined(FreeBSD)
diff --git a/net/ascend-radius/files/patch-ac b/net/ascend-radius/files/patch-ac
index 606cf37bb3d1..98b8203fd0b2 100644
--- a/net/ascend-radius/files/patch-ac
+++ b/net/ascend-radius/files/patch-ac
@@ -1,5 +1,5 @@
---- conf.h.orig	Thu Sep 19 20:04:29 1996
-+++ conf.h	Mon Sep 23 21:40:25 1996
+--- conf.h.orig	Tue Oct 29 14:41:54 1996
++++ conf.h	Fri Jan 24 05:02:40 1997
 @@ -27,6 +27,10 @@
   *
   */
@@ -11,19 +11,3 @@
  #ifndef _conf_h_
  #define _conf_h_
  
-@@ -56,11 +60,14 @@
- #endif
- #endif  /* unixware */
- 
-+#if (defined(BSD) && (BSD >= 199306))
-+#include        <stdlib.h>
-+#include	<sys/types.h>
- #if defined(BSDI)
- #include        <sys/types.h>
- #include        <machine/inline.h>
- #include        <machine/endian.h>
--#include        <stdlib.h>
-+#endif
- #else	/* BSDI */
- #include        <malloc.h>
- #endif	/* BSDI */
diff --git a/net/ascend-radius/files/patch-ae b/net/ascend-radius/files/patch-ae
index eda8f670b9aa..eb3e1348aca8 100644
--- a/net/ascend-radius/files/patch-ae
+++ b/net/ascend-radius/files/patch-ae
@@ -1,13 +1,11 @@
---- radius.h.orig	Mon Oct 14 22:21:17 1996
-+++ radius.h	Fri Oct 18 11:54:51 1996
-@@ -224,8 +224,8 @@
+--- radius.h.orig	Tue Oct 29 14:41:54 1996
++++ radius.h	Fri Jan 24 05:05:08 1997
+@@ -224,7 +224,7 @@
  
  /* Default Database File Names */
  
 -#define RADIUS_DIR		"/etc/raddb"
--#define RADACCT_DIR		"/usr/adm/radacct"
 +#define RADIUS_DIR		"@@PREFIX@@/etc/raddb"
-+#define RADACCT_DIR		"/var/log/radacct"
- 
- #define RADIUS_DICTIONARY	"dictionary"
- #define RADIUS_CLIENTS		"clients"
+ #ifdef FreeBSD
+ #define RADACCT_DIR		"/var/log/radacct"
+ #else
diff --git a/net/ascend-radius/pkg-plist b/net/ascend-radius/pkg-plist
index d93671970fca..c0684181ecdb 100644
--- a/net/ascend-radius/pkg-plist
+++ b/net/ascend-radius/pkg-plist
@@ -11,6 +11,8 @@ share/doc/ascend-radius/ChangeLog
 share/doc/ascend-radius/README
 share/doc/ascend-radius/README.cexample
 share/doc/ascend-radius/README.dict
+share/doc/radius-961029.ps
+share/doc/radius-9651029.pdf
 etc/raddb/clients.example
 etc/raddb/dictionary
 etc/raddb/users.example