diff options
Diffstat (limited to 'net/radiusd-cistron')
-rw-r--r-- | net/radiusd-cistron/Makefile | 46 | ||||
-rw-r--r-- | net/radiusd-cistron/distinfo | 2 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-Make.inc | 66 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-Makefile.BSD | 37 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-acct.c | 16 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-conf.h | 10 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-dict-install.sh | 23 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-radiusd.c | 18 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-raduse | 54 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-radwho.c | 194 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-sysdep.h | 40 | ||||
-rw-r--r-- | net/radiusd-cistron/files/radiusd-cistron.in | 30 | ||||
-rw-r--r-- | net/radiusd-cistron/files/radrelay-cistron.in | 31 | ||||
-rw-r--r-- | net/radiusd-cistron/pkg-descr | 4 | ||||
-rw-r--r-- | net/radiusd-cistron/pkg-message | 8 | ||||
-rw-r--r-- | net/radiusd-cistron/pkg-plist | 52 |
16 files changed, 0 insertions, 631 deletions
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile deleted file mode 100644 index 0346f5d8253c..000000000000 --- a/net/radiusd-cistron/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# Created by: john@nlc.net.au -# $FreeBSD$ - -PORTNAME= radiusd-cistron -PORTVERSION= 1.6.8 -PORTREVISION= 3 -CATEGORIES= net -MASTER_SITES= ftp://ftp.radius.cistron.nl/pub/radius/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= RADIUS-compliant remote authentication and accounting server - -LICENSE= GPLv2+ - -BROKEN= unfetchable -DEPRECATED= Unfetchable, unmaintained -EXPIRATION_DATE= 2019-10-16 - -CONFLICTS?= freeradius-0.* gnu-radius-1.* openradius-0.* - -USES= shebangfix -SHEBANG_FILES= src/checkrad.pl -MAKEFILE= Makefile.BSD -RADIUS_DIR= ${PREFIX}/etc/raddb -MAKE_ENV= RADIUS_DIR="${RADIUS_DIR}" DESTROOT="${STAGEDIR}" -BUILD_WRKSRC= ${WRKSRC}/src -INSTALL_WRKSRC= ${WRKSRC}/src -MAKE_JOBS_UNSAFE= yes - -USE_RC_SUBR= radiusd-cistron radrelay-cistron -DOCFILES= COPYRIGHT INSTALL doc/ChangeLog doc/README doc/README.Y2K \ - doc/README.cisco doc/README.pam doc/README.proxy \ - doc/README.simul doc/README.usersfile - -OPTIONS_DEFINE= PAM DOCS # PAM is used in pkg-plist -OPTIONS_DEFAULT=PAM -OPTIONS_SUB= yes - -post-install: - @${MKDIR} ${STAGEDIR}/var/log/radacct - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo deleted file mode 100644 index 3cd0340cf591..000000000000 --- a/net/radiusd-cistron/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (radiusd-cistron-1.6.8.tar.gz) = ed08ff8fb3f49ac5a921c2e23b639e9b87db85e3e6105953c5a921b9a2cc6150 -SIZE (radiusd-cistron-1.6.8.tar.gz) = 199459 diff --git a/net/radiusd-cistron/files/patch-Make.inc b/net/radiusd-cistron/files/patch-Make.inc deleted file mode 100644 index d9122a21b818..000000000000 --- a/net/radiusd-cistron/files/patch-Make.inc +++ /dev/null @@ -1,66 +0,0 @@ ---- src/Make.inc.orig 2003-04-10 10:51:47 UTC -+++ src/Make.inc -@@ -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 -@@ -115,35 +115,35 @@ - - install: - # Install the binaries -- $(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 radzap $(BINDIR) -- $(INSTALL) -m 755 -s 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) -+ $(DINSTALL) $(DESTROOT)$(SBINDIR) -+ $(DINSTALL) $(DESTROOT)$(BINDIR) -+ $(DINSTALL) $(DESTROOT)$(RADIUS_DIR) -+ $(INSTALL) -m 755 -s radiusd $(DESTROOT)$(SBINDIR)/radiusd -+ $(INSTALL) -m 755 -s radrelay $(DESTROOT)$(SBINDIR)/radrelay -+ $(INSTALL) -m 755 -s radwho $(DESTROOT)$(BINDIR) -+ $(INSTALL) -m 755 -s radzap $(DESTROOT)$(BINDIR) -+ $(INSTALL) -m 755 -s radclient $(DESTROOT)$(BINDIR) -+ test -z "$(DBM)" || $(INSTALL) -m 755 -s builddbm $(DESTROOT)$(BINDIR) -+ $(INSTALL) -m 755 checkrad.pl $(DESTROOT)$(SBINDIR)/checkrad -+ $(INSTALL) -m 755 radlast $(DESTROOT)$(BINDIR) -+ $(INSTALL) -m 755 radtest $(DESTROOT)$(BINDIR) - # Install the man pages - @for section in 1 5 8; do \ -- $(DINSTALL) $(MANDIR)/man$$section; \ -+ $(DINSTALL) $(DESTROOT)$(MANDIR)/man$$section; \ - for manfile in ../doc/*.$$section*; do \ -- echo $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \ -- $(INSTALL) -m 644 $$manfile $(MANDIR)/man$$section; \ -+ echo $(INSTALL) -m 644 $$manfile $(DESTROOT)$(MANDIR)/man$$section; \ -+ $(INSTALL) -m 644 $$manfile $(DESTROOT)$(MANDIR)/man$$section; \ - done ; \ - done -- test -n "$(DBM)" || rm -f $(MANDIR)/man8/builddbm.8rad -- @if [ -d /etc/pam.d/ ] && [ ! -f /etc/pam.d/radius ]; then \ -- $(INSTALL) -m 644 ../redhat/radiusd-pam /etc/pam.d/radius;\ -+ test -n "$(DBM)" || rm -f $(DESTROOT)$(MANDIR)/man8/builddbm.8rad -+ @if [ -d $(DESTROOT)${PREFIX}/etc/pam.d/ ] && [ ! -f $(DESTROOT)${PREFIX}/etc/pam.d/radius ]; then \ -+ $(INSTALL) -m 644 ../redhat/radiusd-pam $(DESTROOT)${PREFIX}/etc/pam.d/radius;\ - fi - @# Install the config files - @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 $(DESTROOT)$(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-Makefile.BSD b/net/radiusd-cistron/files/patch-Makefile.BSD deleted file mode 100644 index 6d39f0443540..000000000000 --- a/net/radiusd-cistron/files/patch-Makefile.BSD +++ /dev/null @@ -1,37 +0,0 @@ ---- src/Makefile.BSD.orig Thu Apr 10 12:38:23 2003 -+++ src/Makefile.BSD Mon Oct 17 09:48:11 2005 -@@ -3,9 +3,9 @@ - # - # - --CC = gcc --CFLAGS = -Wall -g -DNOSHADOW --LDFLAGS = # -s -+#CC = gcc -+CFLAGS += -DNOSHADOW -DPREFIX=\"$(PREFIX)\" #-Wall -g -DNOSHADOW -+LDFLAGS = -s - LIBS = - LCRYPT = -lcrypt - -@@ -13,15 +13,15 @@ - #DBM = -DUSE_DB1 - #DBMLIB = #-ldb - --#PAM = -DPAM --#PAMLIB = -lpam -+PAM = -DPAM -+PAMLIB = -lpam - - INSTALL = install - DINSTALL = mkdir -p - --BINDIR = /usr/local/bin --SBINDIR = /usr/local/sbin --MANDIR = /usr/local/man --SHAREDIR = /usr/local/share/radius -+BINDIR = $(PREFIX)/bin -+SBINDIR = $(PREFIX)/sbin -+MANDIR = $(PREFIX)/man -+SHAREDIR = ${PREFIX}/share/radius - - .include "Make.inc" diff --git a/net/radiusd-cistron/files/patch-acct.c b/net/radiusd-cistron/files/patch-acct.c deleted file mode 100644 index 1a445f97fee7..000000000000 --- a/net/radiusd-cistron/files/patch-acct.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/acct.c.orig 2006-02-08 18:05:53.000000000 +0100 -+++ src/acct.c 2010-01-27 07:05:49.000000000 +0100 -@@ -167,8 +167,13 @@ - #ifdef __svr4__ - wt->ut_xtime = ut->time; - #else -+#if defined(__FreeBSD__) && __FreeBSD_version > 900007 -+ wt->ut_tv.tv_sec = ut->time; -+ wt->ut_tv.tv_usec = 0; -+#else - wt->ut_time = ut->time; - #endif -+#endif - #ifdef USER_PROCESS - /* - * And we can use the ID field to store diff --git a/net/radiusd-cistron/files/patch-conf.h b/net/radiusd-cistron/files/patch-conf.h deleted file mode 100644 index c48f09178890..000000000000 --- a/net/radiusd-cistron/files/patch-conf.h +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 RADLOG_DIR "/var/log" - - #ifdef aix diff --git a/net/radiusd-cistron/files/patch-dict-install.sh b/net/radiusd-cistron/files/patch-dict-install.sh deleted file mode 100644 index 222009106d07..000000000000 --- a/net/radiusd-cistron/files/patch-dict-install.sh +++ /dev/null @@ -1,23 +0,0 @@ ---- src/dict-install.sh.orig 2003-04-10 16:17:11.000000000 +0200 -+++ src/dict-install.sh 2013-12-01 06:23:00.000000000 +0100 -@@ -31,7 +31,7 @@ - - if [ $NEWTYPE = yes ] - then -- DESTDIR=$SHAREDIR -+ DESTDIR=$DESTROOT$SHAREDIR - else - DESTDIR=$RADDBDIR - fi -@@ -41,9 +41,9 @@ - mkdir -p $DESTDIR - fi - --if [ $NEWTYPE ] && [ ! -f $RADDBDIR/dictionary ] -+if [ $NEWTYPE ] && [ ! -f $DESTROOT$RADDBDIR/dictionary ] - then -- sed -e "s!SHAREDIR!$SHAREDIR!" < dictionary > $RADDBDIR/dictionary -+ sed -e "s!SHAREDIR!$SHAREDIR!" < dictionary > $DESTROOT$RADDBDIR/dictionary - fi - - echo "Creating/updating dictionary files in $DESTDIR" diff --git a/net/radiusd-cistron/files/patch-radiusd.c b/net/radiusd-cistron/files/patch-radiusd.c deleted file mode 100644 index 994559596b0c..000000000000 --- a/net/radiusd-cistron/files/patch-radiusd.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/radiusd.c.orig Thu Mar 31 23:06:51 2005 -+++ src/radiusd.c Mon Dec 25 20:40:17 2006 -@@ -48,6 +48,7 @@ - char *radacct_dir; - int log_stripped_names; - int cache_passwd = 0; -+int radius_pid; - int use_dbm = 0; - int use_wtmp = 1; - int use_utmp = 1; -@@ -74,7 +75,6 @@ - static int acctfd; - static int spawn_flag; - static int acct_pid; --static int radius_pid; - static int need_reload = 0; - static time_t start_time; - static AUTH_REQ *first_request; diff --git a/net/radiusd-cistron/files/patch-raduse b/net/radiusd-cistron/files/patch-raduse deleted file mode 100644 index 609b25f2f432..000000000000 --- a/net/radiusd-cistron/files/patch-raduse +++ /dev/null @@ -1,54 +0,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 @@ - * in memory. Returns -1 on failure, 0 on success. - */ - int buildHashTable(void) { -- FILE *passwd, *shadow; -+ FILE *passwd; -+#if !defined(NOSHADOW) -+ FILE *shadow; -+#endif /* SHADOW */ - char buffer[BUFSIZE]; - char idtmp[10]; - char username[MAXUSERNAME]; ---- src/readusers.c Sat Nov 10 05:41:39 2001 -+++ src/readusers.c Thu Apr 3 09:42:12 2003 -@@ -179,7 +179,7 @@ - char *ptr; - char buffer[256]; - int first = 1; -- int parsecode; -+ int parsecode = 0; - int state = 0; - int c; - ---- 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; -- int operator; -+ int operator = 0; - int rcode; -- int tag; -+ int tag = 0; - int base; - - rcode = USERPARSE_EOS; ---- src/radclient.c Tue Nov 13 05:55:14 2001 -+++ src/radclient.c Thu Apr 3 09:46:58 2003 -@@ -122,10 +122,10 @@ - char *radius_dir; - UINT4 server_ip; - int port; -- int code; -+ int code = 0; - int sockfd; - int salen; -- int result; -+ int result = 0; - int length; - int i; - diff --git a/net/radiusd-cistron/files/patch-radwho.c b/net/radiusd-cistron/files/patch-radwho.c deleted file mode 100644 index d88c41b4da19..000000000000 --- a/net/radiusd-cistron/files/patch-radwho.c +++ /dev/null @@ -1,194 +0,0 @@ ---- src/radwho.c.orig 2003-12-09 01:10:24.000000000 +0900 -+++ src/radwho.c 2011-10-19 10:22:04.000000000 +0900 -@@ -20,6 +20,7 @@ - #include <errno.h> - #include <sys/stat.h> - #include <sys/utsname.h> -+#include <sys/ioctl.h> - #include <time.h> - #include <ctype.h> - #include <netinet/in.h> -@@ -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"; --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"; -+"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 *rfmt1 = "%-16.16s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.*s%s"; -+char *rfmt1r = "%s,%s,%s,%s%u,%s,%s,%*s%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"; --char *rfmt2 = "%-10.10s %s%-5d %-6.6s %-13.13s %-10.10s %-.28s%s"; --char *rfmt2r = "%s,%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,%u,%s,%s,%s,%*s%s"; -+char *rfmt2 = "%-16.16s %s%-5d %-6.6s %-13.13s %-10.10s %-.*s%s"; -+char *rfmt2r = "%s,%s%u,%s,%s,%s,%*s%s"; -+#define FMT2_HOST_SIZE 19 - - char *eol = "\n"; - NAS *naslist; -@@ -307,7 +310,8 @@ - return tmp; - } - if (strncmp(tty, "cu", 2) == 0) { -- return tmp + 2; -+ sprintf(tmp, "%.15s", tty + 2); -+ return tmp; - } - return "??"; - } -@@ -371,6 +375,8 @@ - */ - int main(int argc, char **argv) - { -+ struct winsize ws; -+ int extra_width = 0; - FILE *fp; - struct radutmp rt; - struct utmp ut; -@@ -389,6 +395,11 @@ - char *p, *q, *portind; - int c, portno; - -+ ioctl(0, TIOCGWINSZ, &ws); -+ if (ws.ws_col >= 80) { -+ extra_width = ws.ws_col - 80; -+ } -+ - while((c = getopt(argc, argv, "Dd:flhnsipcru:")) != EOF) switch(c) { - case 'D': - use_dns = 0; -@@ -471,6 +482,55 @@ - if (*p) sys_finger(p); - } - -+#if defined(__FreeBSD__) && __FreeBSD_version > 900007 -+ if (showlocal) { -+ struct utmpx *utx; -+ -+ if (rawoutput == 0) -+ { -+ fputs(showname ? hdr1 : hdr2, stdout); -+ fputs(eol, stdout); -+ } -+ hdrdone = 1; -+ -+ /* -+ * Show the logged in UNIX users. -+ */ -+ gethostname(myname, 128); -+ setutxent(); -+ for (;;) { -+ utx = getutxent(); -+ if (utx == NULL) -+ break; -+ if (utx->ut_user[0] && utx->ut_line[0] && -+ utx->ut_type == USER_PROCESS) { -+ strncpy(inbuf, utx->ut_name, UT_NAMESIZE); -+ inbuf[UT_NAMESIZE] = '\0'; -+ if (showname) -+ printf((rawoutput == 0? ufmt1: ufmt1r), -+ inbuf, -+ fullname(inbuf), -+ "shell", -+ ttyshort(utx->ut_line), -+ dotime(utx->ut_tv.tv_sec), -+ utx->ut_host, -+ (rawoutput == 0 ? FMT1_HOST_SIZE + extra_width : 0), -+ myname, eol); -+ else -+ printf((rawoutput==0? ufmt2:ufmt2r), -+ inbuf, -+ ttyshort(utx->ut_line), -+ "shell", -+ dotime(utx->ut_tv.tv_sec), -+ utx->ut_host, -+ (rawoutput == 0 ? FMT2_HOST_SIZE + extra_width : 0), -+ myname, eol); -+ } -+ -+ } -+ endutxent(); -+ } -+#else - if (showlocal && (fp = fopen(UTMP_FILE, "r"))) { - if (rawoutput == 0) - { -@@ -486,14 +546,17 @@ - while(fread(&ut, sizeof(ut), 1, fp) == 1) { - #ifdef USER_PROCESS - if (ut.ut_user[0] && ut.ut_line[0] && -- ut.ut_type == USER_PROCESS) { -+ ut.ut_type == USER_PROCESS) - #else -- if (ut.ut_user[0] && ut.ut_line[0]) { -+ if (ut.ut_user[0] && ut.ut_line[0]) - #endif -- if (showname) -+ { -+ strncpy(inbuf, ut.ut_name, UT_NAMESIZE); -+ inbuf[UT_NAMESIZE] = '\0'; -+ if (showname) - printf((rawoutput == 0? ufmt1: ufmt1r), -- ut.ut_name, -- fullname(ut.ut_name), -+ inbuf, -+ fullname(inbuf), - "shell", - ttyshort(ut.ut_line), - #ifdef __svr4__ -@@ -502,10 +565,11 @@ - dotime(ut.ut_time), - #endif - ut.ut_host, -+ (rawoutput == 0 ? FMT1_HOST_SIZE + extra_width : 0), - myname, eol); - else - printf((rawoutput==0? ufmt2:ufmt2r), -- ut.ut_name, -+ inbuf, - ttyshort(ut.ut_line), - "shell", - #ifdef __svr4__ -@@ -514,11 +578,13 @@ - dotime(ut.ut_time), - #endif - ut.ut_host, -+ (rawoutput == 0 ? FMT2_HOST_SIZE + extra_width : 0), - myname, eol); - } - } - fclose(fp); - } -+#endif - - /* - * Show the users logged in on the terminal server(s). -@@ -560,6 +626,7 @@ - portind, portno, - dotime(rt.time), - nasname(ntohl(rt.nas_address)), -+ (rawoutput == 0 ? FMT1_HOST_SIZE + extra_width : 0), - hostname(rt.framed_address), eol); - else - printf((rawoutput == 0? rfmt2: rfmt2r), -@@ -568,6 +635,7 @@ - proto(rt.proto, rt.porttype), - dotime(rt.time), - nasname(ntohl(rt.nas_address)), -+ (rawoutput == 0 ? FMT2_HOST_SIZE + extra_width : 0), - hostname(rt.framed_address), eol); - } - } diff --git a/net/radiusd-cistron/files/patch-sysdep.h b/net/radiusd-cistron/files/patch-sysdep.h deleted file mode 100644 index 101d7985fe4b..000000000000 --- a/net/radiusd-cistron/files/patch-sysdep.h +++ /dev/null @@ -1,40 +0,0 @@ ---- src/sysdep.h.orig 2003-06-04 17:45:28.000000000 +0200 -+++ src/sysdep.h 2010-01-27 07:21:57.000000000 +0100 -@@ -50,6 +50,10 @@ - # include <malloc.h> - #endif /* FreeBSD */ - -+#if defined(__FreeBSD__) -+# include <osreldate.h> -+#endif /* FreeBSD */ -+ - #if defined(aix) - #include <sys/select.h> - #include <strings.h> -@@ -67,8 +71,17 @@ - # define UT_LINESIZE 32 - # define UT_HOSTSIZE 257 - #else -+#if __FreeBSD_version >= 900007 -+# include <utmpx.h> -+# define utmp utmpx -+# define UT_NAMESIZE 32 -+# define UT_LINESIZE 16 -+# define UT_HOSTSIZE 128 -+# define ut_name ut_user -+#else - # include <utmp.h> - #endif -+#endif - #ifdef __osf__ - # define UT_NAMESIZE 32 - # define UT_LINESIZE 32 -@@ -83,7 +96,7 @@ - # define __hpux__ - # endif - #endif --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi) -+#if (defined(__FreeBSD__) && __FreeBSD_version < 900007 ) || defined(__NetBSD__) || defined(bsdi) - # ifndef UTMP_FILE - # define UTMP_FILE "/var/run/utmp" - # endif diff --git a/net/radiusd-cistron/files/radiusd-cistron.in b/net/radiusd-cistron/files/radiusd-cistron.in deleted file mode 100644 index eef24ded7508..000000000000 --- a/net/radiusd-cistron/files/radiusd-cistron.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: radiusd-cistron -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# radiusd_enable (bool): Set to NO by default. -# Set it to YES to enable radiusd-cistron. -# - -. /etc/rc.subr - -name="radiusd" -rcvar="radiusd_enable" - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid - -load_rc_config $name - -: ${radiusd_enable="NO"} - -command_args="-y" - -run_rc_command "$1" diff --git a/net/radiusd-cistron/files/radrelay-cistron.in b/net/radiusd-cistron/files/radrelay-cistron.in deleted file mode 100644 index 49d4b5cf1548..000000000000 --- a/net/radiusd-cistron/files/radrelay-cistron.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# PROVIDE: radrelay-cistron -# REQUIRE: LOGIN radiusd-cistron -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# radrelay_enable (bool): Set it to "YES" to enable radrelay. -# Default is "NO". -# radrelay_flags (flags): Set extra flags to radrelay. -# Default is "". see radrelay(1). -# - -. /etc/rc.subr - -name="radrelay" -rcvar="radrelay_enable" - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid - -load_rc_config $name - -: ${radrelay_enable="NO"} -: ${radrelay_flags=""} - -run_rc_command "$1" diff --git a/net/radiusd-cistron/pkg-descr b/net/radiusd-cistron/pkg-descr deleted file mode 100644 index e75cfa5f9134..000000000000 --- a/net/radiusd-cistron/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -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-message b/net/radiusd-cistron/pkg-message deleted file mode 100644 index 9d374e5928e9..000000000000 --- a/net/radiusd-cistron/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <<EOM -To start cistron radiusd automaticall during boot -add radiusd_enable="YES" to /etc/rc.conf -EOM -} -] diff --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist deleted file mode 100644 index 4d8bb945838c..000000000000 --- a/net/radiusd-cistron/pkg-plist +++ /dev/null @@ -1,52 +0,0 @@ -bin/radclient -bin/radlast -bin/radtest -bin/radwho -bin/radzap -%%PAM%%etc/pam.d/radius -etc/raddb/clients.sample -etc/raddb/dictionary -etc/raddb/hints.sample -etc/raddb/huntgroups.sample -etc/raddb/naslist.sample -etc/raddb/naspasswd.sample -etc/raddb/realms.sample -etc/raddb/users.sample -man/man1/radclient.1.gz -man/man1/radlast.1.gz -man/man1/radtest.1.gz -man/man1/radwho.1.gz -man/man1/radzap.1.gz -man/man5/clients.5rad.gz -man/man5/naslist.5rad.gz -man/man8/radiusd.8.gz -man/man8/radrelay.8.gz -man/man8/radwatch.8.gz -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 -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.Y2K -%%PORTDOCS%%%%DOCSDIR%%/README.cisco -%%PORTDOCS%%%%DOCSDIR%%/README.pam -%%PORTDOCS%%%%DOCSDIR%%/README.proxy -%%PORTDOCS%%%%DOCSDIR%%/README.simul -%%PORTDOCS%%%%DOCSDIR%%/README.usersfile -@dir(,,700) /var/log/radacct -@unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone." |