summaryrefslogtreecommitdiff
path: root/net/ascend-radius
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-01-04 04:56:48 +0000
committerSteve Price <steve@FreeBSD.org>1999-01-04 04:56:48 +0000
commitead4ead456535c41346b6feaa317c1a7cdbd3c99 (patch)
tree555b39380872d3219908343f2ae6387ad2cf1570 /net/ascend-radius
parentFix for monitoring of disk I/O in -current. (diff)
Update to the June 18, 1998 version.
PR: 4405 Submitted by: Yukihiro Nakai <nakai@TokyoNet.AD.JP>
Diffstat (limited to 'net/ascend-radius')
-rw-r--r--net/ascend-radius/Makefile22
-rw-r--r--net/ascend-radius/distinfo6
-rw-r--r--net/ascend-radius/files/patch-af34
-rw-r--r--net/ascend-radius/files/patch-ag24
-rw-r--r--net/ascend-radius/pkg-comment2
5 files changed, 44 insertions, 44 deletions
diff --git a/net/ascend-radius/Makefile b/net/ascend-radius/Makefile
index 610162f2e7a1..ace54e3cf754 100644
--- a/net/ascend-radius/Makefile
+++ b/net/ascend-radius/Makefile
@@ -1,28 +1,28 @@
# New ports collection makefile for: ascend-radius
-# Version required: 970424 (v1.16)
+# Version required: 980618 (v1.16)
# Date created: August 28th 96
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
-# $Id: Makefile,v 1.8 1997/01/24 12:10:10 asami Exp $
+# $Id: Makefile,v 1.9 1997/06/27 02:26:43 jfitz Exp $
#
-#DISTNAME= radius-970424
-PKGNAME= ascend-radius-970424
+#DISTNAME= radius-980618
+PKGNAME= ascend-radius-980618
CATEGORIES= net
MASTER_SITES= ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/ \
ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/doc/ \
ftp://ftp.ascend.com/pub/Software-Releases/Radius/Archive/ \
ftp://ftp.ascend.com/pub/Software-Releases/Radius/Archive/doc/
-DISTFILES= radius-970424.tar.gz \
+DISTFILES= radius-980618.tar.gz \
radius.ps \
radius.pdf \
- rradius.ps \
- rradius.pdf
-EXTRACT_ONLY= radius-970424.tar.gz
+ 980618.ps \
+ 980618.pdf
+EXTRACT_ONLY= radius-980618.tar.gz
MAINTAINER= jfitz@FreeBSD.ORG
-WRKPREFIX= radius-970424/radius-ascend/radius-1.16-ascend
+WRKPREFIX= radius-980618/radius-1.16-ascend
WRKSRC= ${WRKDIR}/${WRKPREFIX}/ascendd
ALL_TARGET= all dbm
@@ -44,8 +44,8 @@ do-install:
done
${INSTALL_DATA} ${DISTDIR}/radius.ps ${PREFIX}/share/doc/ascend-radius
${INSTALL_DATA} ${DISTDIR}/radius.pdf ${PREFIX}/share/doc/ascend-radius
- ${INSTALL_DATA} ${DISTDIR}/rradius.ps ${PREFIX}/share/doc/ascend-radius
- ${INSTALL_DATA} ${DISTDIR}/rradius.pdf ${PREFIX}/share/doc/ascend-radius
+ ${INSTALL_DATA} ${DISTDIR}/980618.ps ${PREFIX}/share/doc/ascend-radius
+ ${INSTALL_DATA} ${DISTDIR}/980618.pdf ${PREFIX}/share/doc/ascend-radius
.endif
@ ${MKDIR} ${PREFIX}/etc/raddb
@ chown root.wheel ${PREFIX}/etc/raddb
diff --git a/net/ascend-radius/distinfo b/net/ascend-radius/distinfo
index bec61a4ef169..3a2c8763851f 100644
--- a/net/ascend-radius/distinfo
+++ b/net/ascend-radius/distinfo
@@ -1,5 +1,5 @@
-MD5 (radius-970424.tar.gz) = 3e7de1fd9cd3bb69fdf4d3a3ef228cbb
+MD5 (radius-980618.tar.gz) = 770058923f51ab2392c5b90ad27799bb
MD5 (radius.ps) = ca2a732ba76c912e37affa35e2b725d6
MD5 (radius.pdf) = 3fd800184323d0cd1fb9be2018d676a8
-MD5 (rradius.ps) = 358ac1cafc1fd9ea0b40878399f43d02
-MD5 (rradius.pdf) = eebcf3565e5e5fe041ff842188d78c95
+MD5 (980618.ps) = 2ff4fa9d8bedfa6ce3ddbf67fb6e4f2a
+MD5 (980618.pdf) = 8ac2d94e92e600347133119eab19a6de
diff --git a/net/ascend-radius/files/patch-af b/net/ascend-radius/files/patch-af
index a5d2ca238c2c..2aafc32f94e5 100644
--- a/net/ascend-radius/files/patch-af
+++ b/net/ascend-radius/files/patch-af
@@ -1,6 +1,6 @@
---- users.c.orig Thu Sep 19 20:04:29 1996
-+++ users.c Mon Sep 23 21:44:51 1996
-@@ -30,6 +30,10 @@
+--- users.c.orig Fri Jun 19 05:27:37 1998
++++ users.c Thu Dec 3 13:27:15 1998
+@@ -32,6 +32,10 @@
static char sccsid[] =
"@(#)users.c 1.12 Copyright 1992 Livingston Enterprises Inc";
@@ -11,7 +11,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
-@@ -48,18 +52,30 @@
+@@ -50,18 +54,30 @@
# if defined(SOLARIS)
# include </usr/ucbinclude/dbm.h>
# else
@@ -41,11 +41,11 @@
+
static int parse_record P__((char *name, char *linep,
VALUE_PAIR **check_first, VALUE_PAIR **reply_first));
- extern int user_read P__((FILE **userfd, char *name, char *content));
-@@ -97,7 +113,15 @@
+ extern int user_read P__((FILE **userfp_p, char *name, char *content));
+@@ -99,7 +115,15 @@
{
#if defined(DBM_MODE)
- (void)userfd;
+ (void)userfp_p;
+#if defined(USE_NDBM)
+ if(!(dbp=dbm_open(infoname, O_RDONLY, NULL))) {
+ return(-1);
@@ -56,21 +56,21 @@
return dbminit(infoname);
+#endif
#else
- *userfd = fopen(infoname, "r");
- return *userfd == (FILE *)NULL;
-@@ -120,7 +144,11 @@
+ *userfp_p = fopen(infoname, "r");
+ return *userfp_p == (FILE *)NULL;
+@@ -122,7 +146,11 @@
{
#if defined(DBM_MODE)
- (void)userfd;
+ (void)userfp;
+#if defined(USE_NDBM)
+ dbm_close(dbp);
+#else
dbmclose();
+#endif
#else
- fclose(userfd);
- #endif
-@@ -210,7 +238,11 @@
+ DEBUG("userinfo_close: fclosing fp=%p\n", userfp );
+ fclose(userfp);
+@@ -219,7 +247,11 @@
#ifdef DBM_MODE
named.dptr = name;
named.dsize = strlen(name)+1;
@@ -81,8 +81,8 @@
+#endif
if(contentd.dsize != 0) { /* name found */
*user_data = contentd.dptr;
- userinfo_close(userfd);
-@@ -219,7 +251,11 @@
+ userinfo_close(userfp);
+@@ -228,7 +260,11 @@
named.dptr = "DEFAULT";
named.dsize = sizeof("DEFAULT");
@@ -93,4 +93,4 @@
+#endif
if(contentd.dsize != 0) { /* DEFAULT found */
*user_data = contentd.dptr;
- userinfo_close(userfd);
+ userinfo_close(userfp);
diff --git a/net/ascend-radius/files/patch-ag b/net/ascend-radius/files/patch-ag
index 45c7b7d4499a..88679b3feafe 100644
--- a/net/ascend-radius/files/patch-ag
+++ b/net/ascend-radius/files/patch-ag
@@ -1,6 +1,6 @@
---- builddbm.c.orig Wed May 22 20:30:36 1996
-+++ builddbm.c Mon Sep 23 21:48:02 1996
-@@ -30,6 +30,10 @@
+--- builddbm.c.orig Tue Jun 2 09:32:29 1998
++++ builddbm.c Thu Dec 3 13:18:30 1998
+@@ -32,6 +32,10 @@
static char sccsid[] =
"@(#)builddbm.c 1.4 Copyright 1992 Livingston Enterprises Inc";
@@ -11,7 +11,7 @@
#if defined(SOLARIS)
# include <sys/uio.h>
# include <unistd.h>
-@@ -37,7 +41,11 @@
+@@ -39,7 +43,11 @@
# include <fcntl.h>
# include </usr/ucbinclude/dbm.h>
#else
@@ -23,7 +23,7 @@
#endif /* SOLARIS */
#include <sys/types.h>
-@@ -59,8 +67,13 @@
+@@ -61,8 +69,13 @@
char *progname;
char *radius_dir;
char *radius_users;
@@ -35,9 +35,9 @@
char dirfile[256];
+#endif
char dbmname[256];
- FILE *userfd;
+ FILE *userfp;
FILE *errf;
-@@ -124,6 +137,20 @@
+@@ -126,6 +139,20 @@
}
}
@@ -58,16 +58,16 @@
sprintf(pagfile, "%s/%s.pag", radius_dir, radius_users);
if((fd = open(pagfile, O_WRONLY | O_CREAT | O_TRUNC, 0600)) < 0) {
fprintf(errf, "%s: Couldn't open %s for writing\n",
-@@ -143,7 +170,7 @@
+@@ -145,7 +172,7 @@
fprintf(errf, "%s: Couldn't dbminit(%s)\n", progname, dbmname);
exit(-1);
}
-
+#endif
- userfd = (FILE *)NULL;
+ userfp = (FILE *)NULL;
curParseLine = 0;
- while(user_read(&userfd, name, content) == 0) {
-@@ -153,7 +180,11 @@
+ while(user_read(&userfp, name, content) == 0) {
+@@ -155,7 +182,11 @@
}
named.dptr = name;
named.dsize = strlen(name)+1;
@@ -79,7 +79,7 @@
if(contentd.dsize != 0) { /* name found */
warn("Skipping duplicate record\n\tfor user '%s'", name);
continue;
-@@ -162,13 +193,21 @@
+@@ -164,13 +195,21 @@
named.dsize = strlen(name)+1;
contentd.dptr = content;
contentd.dsize = strlen(content)+1;
diff --git a/net/ascend-radius/pkg-comment b/net/ascend-radius/pkg-comment
index 2ec1e09d044b..cf8276fd340f 100644
--- a/net/ascend-radius/pkg-comment
+++ b/net/ascend-radius/pkg-comment
@@ -1 +1 @@
-The Ascend modified Radius Daemon \ No newline at end of file
+The Ascend modified Radius Daemon