From jylitalo@jylitalo.2y.net Thu Feb 7 13:43:25 2002 Return-Path: Received: from fep02-app.kolumbus.fi (fep02-0.kolumbus.fi [193.229.0.44]) by hub.freebsd.org (Postfix) with ESMTP id C43E637B42C for ; Thu, 7 Feb 2002 13:43:01 -0800 (PST) Received: from coat.st-paul ([212.54.23.71]) by fep02-app.kolumbus.fi (InterMail vM.5.01.03.15 201-253-122-118-115-20011108) with ESMTP id <20020207214257.NVCG1068.fep02-app.kolumbus.fi@coat.st-paul> for ; Thu, 7 Feb 2002 23:42:57 +0200 Received: from shoes.st-paul (shoes.st-paul [10.10.10.10]) by coat.st-paul (8.11.6/8.11.6) with ESMTP id g17Kabu10609 for ; Thu, 7 Feb 2002 22:36:37 +0200 (EET) (envelope-from jylitalo@shoes.st-paul) Received: (from root@localhost) by shoes.st-paul (8.11.6/8.11.6) id g17Kabv20870; Thu, 7 Feb 2002 22:36:37 +0200 (EET) (envelope-from jylitalo) Message-Id: <200202072036.g17Kabv20870@shoes.st-paul> Date: Thu, 7 Feb 2002 22:36:37 +0200 (EET) From: Juha Ylitalo Reply-To: Juha Ylitalo To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: Non-maintainer update to net/radiusd-cistron port X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 34713 >Category: ports >Synopsis: Non-maintainer update to net/radiusd-cistron port >Confidential: no >Severity: critical >Priority: high >Responsible: dinoex >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 07 13:50:01 PST 2002 >Closed-Date: Sat Mar 2 12:34:15 PST 2002 >Last-Modified: Sun Jul 07 01:42:52 PDT 2002 >Originator: Juha Ylitalo >Release: FreeBSD 4.5-RELEASE i386 >Organization: >Environment: System: FreeBSD shoes.st-paul 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Thu Jan 31 15:00:06 EET 2002 root@shoes.st-paul:/usr/obj/usr/src/sys/SHOES i386 >Description: Current net/radiusd-cistron port (version 1.6.4) has been marked as broken due to buffer overflow. This bug has been reported to be fixed in version 1.6.5 and newer versions (according to securityfocus.com and Changelog also says about memory leak fixes). Fix section has shar `find net/radiusd-cistron` from what came out, when I upgraded 1.6.4 port to version 1.6.6. It has been tested by running radtest against radius in localhost. >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # net/radiusd-cistron # net/radiusd-cistron/Makefile # net/radiusd-cistron/distinfo # net/radiusd-cistron/pkg-comment # net/radiusd-cistron/pkg-descr # net/radiusd-cistron/pkg-plist # net/radiusd-cistron/files # net/radiusd-cistron/files/patch-conf.h # net/radiusd-cistron/files/radiusd.sh.tmpl # echo c - net/radiusd-cistron mkdir -p net/radiusd-cistron > /dev/null 2>&1 echo x - net/radiusd-cistron/Makefile sed 's/^X//' >net/radiusd-cistron/Makefile << 'END-of-net/radiusd-cistron/Makefile' X# New ports collection makefile for: radiusd-cistron X# Date created: 15 Jan 1999 X# Whom: john@nlc.net.au X# X# $FreeBSD: ports/net/radiusd-cistron/Makefile,v 1.15 2002/01/29 15:56:57 nectar Exp $ X# X XPORTNAME= radiusd-cistron XPORTVERSION= 1.6.6 XCATEGORIES= net XMASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/ \ X ftp://ftp.freeradius.org/pub/radius/ X XMAINTAINER= john@nlc.net.au X X# FORBIDDEN= "Remotely exploitable buffer overflow" X XMAKEFILE= Makefile.BSD XRADIUS_DIR= ${PREFIX}/etc/raddb X XMAN1= radlast.1 radtest.1 raduse.1 radwho.1 radzap.1 XMAN5= clients.5rad naslist.5rad XMAN8= radiusd.8 radwatch.8 X Xdo-build: X cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} RADIUS_DIR=${RADIUS_DIR} X Xdo-install: X cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} RADIUS_DIR=${RADIUS_DIR} install X ${CP} ${RADIUS_DIR}/clients ${RADIUS_DIR}/clients.sample X ${CP} ${RADIUS_DIR}/hints ${RADIUS_DIR}/hints.sample X ${CP} ${RADIUS_DIR}/huntgroups ${RADIUS_DIR}/huntgroups.sample X ${CP} ${RADIUS_DIR}/naslist ${RADIUS_DIR}/naslist.sample X ${CP} ${RADIUS_DIR}/naspasswd ${RADIUS_DIR}/naspasswd.sample X ${CP} ${RADIUS_DIR}/realms ${RADIUS_DIR}/realms.sample X ${CP} ${RADIUS_DIR}/users ${RADIUS_DIR}/users.sample X @${MKDIR} -m 700 /var/log/radacct X.if !defined(NOPORTDOCS) X @${MKDIR} ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/README.Y2K ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/README.cisco ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/README.pam ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/README.proxy ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/README.simul ${PREFIX}/share/doc/radiusd-cistron X ${INSTALL_DATA} ${WRKSRC}/doc/README.usersfile ${PREFIX}/share/doc/radiusd-cistron X.endif X ${INSTALL_MAN} ${WRKSRC}/doc/radlast.1 ${MANPREFIX}/man/man1 X ${INSTALL_MAN} ${WRKSRC}/doc/radtest.1 ${MANPREFIX}/man/man1 X ${INSTALL_MAN} ${WRKSRC}/doc/raduse.1 ${MANPREFIX}/man/man1 X ${INSTALL_MAN} ${WRKSRC}/doc/radwho.1 ${MANPREFIX}/man/man1 X ${INSTALL_MAN} ${WRKSRC}/doc/radzap.1 ${MANPREFIX}/man/man1 X ${INSTALL_MAN} ${WRKSRC}/doc/clients.5rad ${MANPREFIX}/man/man5 X ${INSTALL_MAN} ${WRKSRC}/doc/naslist.5rad ${MANPREFIX}/man/man5 X ${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8 X ${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${MANPREFIX}/man/man8 X Xpost-install: X @${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/radiusd.sh.tmpl \ X > ${PREFIX}/etc/rc.d/radiusd.sh X @${CHMOD} 555 ${PREFIX}/etc/rc.d/radiusd.sh X @${CHOWN} root:wheel ${PREFIX}/etc/rc.d/radiusd.sh X X.include END-of-net/radiusd-cistron/Makefile echo x - net/radiusd-cistron/distinfo sed 's/^X//' >net/radiusd-cistron/distinfo << 'END-of-net/radiusd-cistron/distinfo' XMD5 (radiusd-cistron-1.6.6.tar.gz) = 16084870890fd2ec577dbe183b51a379 END-of-net/radiusd-cistron/distinfo echo x - net/radiusd-cistron/pkg-comment sed 's/^X//' >net/radiusd-cistron/pkg-comment << 'END-of-net/radiusd-cistron/pkg-comment' XA RADIUS-compliant remote authentication and accouting server END-of-net/radiusd-cistron/pkg-comment echo x - net/radiusd-cistron/pkg-descr sed 's/^X//' >net/radiusd-cistron/pkg-descr << 'END-of-net/radiusd-cistron/pkg-descr' XThis is the Cistron RADIUS daemon. Radiusd is a daemon that handles Xremote authentication requests and accounting for RADIUS clients. The Xclients may be terminal servers, Network Access Servers or other XRADIUS servers. END-of-net/radiusd-cistron/pkg-descr echo x - net/radiusd-cistron/pkg-plist sed 's/^X//' >net/radiusd-cistron/pkg-plist << 'END-of-net/radiusd-cistron/pkg-plist' Xbin/radlast Xbin/radtest Xbin/raduse Xbin/radwho Xbin/radzap Xsbin/checkrad Xsbin/radiusd Xsbin/radrelay Xetc/raddb/clients.sample Xetc/raddb/dictionary Xetc/raddb/dictionary.ascend Xetc/raddb/dictionary.cisco Xetc/raddb/dictionary.compat Xetc/raddb/dictionary.livingston Xetc/raddb/dictionary.shiva Xetc/raddb/dictionary.tunnel Xetc/raddb/dictionary.usr Xetc/raddb/dictionary.versanet Xetc/raddb/hints.sample Xetc/raddb/huntgroups.sample Xetc/raddb/naslist.sample Xetc/raddb/naspasswd.sample Xetc/raddb/realms.sample Xetc/raddb/users.sample Xshare/doc/radiusd-cistron/COPYRIGHT Xshare/doc/radiusd-cistron/ChangeLog Xshare/doc/radiusd-cistron/INSTALL Xshare/doc/radiusd-cistron/README Xshare/doc/radiusd-cistron/README.Y2K Xshare/doc/radiusd-cistron/README.cisco Xshare/doc/radiusd-cistron/README.pam Xshare/doc/radiusd-cistron/README.proxy Xshare/doc/radiusd-cistron/README.simul Xshare/doc/radiusd-cistron/README.usersfile Xetc/rc.d/radiusd.sh X@dirrm etc/raddb X@dirrm share/doc/radiusd-cistron X@unexec rm -f /var/log/radius.log X@unexec rm -f /var/run/radiusd.pid X@unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone." END-of-net/radiusd-cistron/pkg-plist echo c - net/radiusd-cistron/files mkdir -p net/radiusd-cistron/files > /dev/null 2>&1 echo x - net/radiusd-cistron/files/patch-conf.h sed 's/^X//' >net/radiusd-cistron/files/patch-conf.h << 'END-of-net/radiusd-cistron/files/patch-conf.h' X--- src/conf.h 2002/02/07 19:39:25 1.1 X+++ src/conf.h 2002/02/07 19:39:50 X@@ -6,7 +6,7 @@ X */ X X /* Default Database File Names */ X-#define RADIUS_DIR "/etc/raddb" X+#define RADIUS_DIR "/usr/local/etc/raddb" X #define RADLOG_DIR "/var/log" X X #ifdef aix END-of-net/radiusd-cistron/files/patch-conf.h echo x - net/radiusd-cistron/files/radiusd.sh.tmpl sed 's/^X//' >net/radiusd-cistron/files/radiusd.sh.tmpl << 'END-of-net/radiusd-cistron/files/radiusd.sh.tmpl' X#!/bin/sh Xcase "$1" in Xstop) killall radiusd;; X*) [ -x !!PREFIX!!/sbin/radiusd ] && !!PREFIX!!/sbin/radiusd -y && echo -n ' radiusd';; Xesac END-of-net/radiusd-cistron/files/radiusd.sh.tmpl exit >Release-Note: >Audit-Trail: From: dirk.meyer@dinoex.sub.org (Dirk Meyer) To: freebsd-gnats-submit@FreeBSD.org, juha.ylitalo@iki.fi Cc: Subject: Re: ports/34713: Non-maintainer update to net/radiusd-cistron port Date: Fri, 22 Feb 2002 15:02:46 +0100 Please modify your patches .... - Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany - [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org] 1) I think it in not commit ready, the old "radiusd-cistron/files/patch-ac" is better then "patch-conf.h" 2) Consider to use: MAKE_ENV+= RADIUS_DIR="${RADIUS_DIR}" 3) Your modifications as patch: removed files: radiusd-cistron/files/patch-aa radiusd-cistron/files/patch-ab radiusd-cistron/files/patch-af diff radiusd-cistron/Makefile radiusd-cistron/Makefile --- radiusd-cistron/Makefile Tue Jan 29 20:39:28 2002 +++ radiusd-cistron/Makefile Fri Feb 22 13:22:07 2002 @@ -6,33 +6,40 @@ # PORTNAME= radiusd-cistron -PORTVERSION= 1.6.4 +PORTVERSION= 1.6.6 CATEGORIES= net MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/ \ ftp://ftp.freeradius.org/pub/radius/ -FORBIDDEN= "Remotely exploitable buffer overflow" - MAINTAINER= john@nlc.net.au +# FORBIDDEN= "Remotely exploitable buffer overflow" + MAKEFILE= Makefile.BSD +RADIUS_DIR= ${PREFIX}/etc/raddb MAN1= radlast.1 radtest.1 raduse.1 radwho.1 radzap.1 MAN5= clients.5rad naslist.5rad MAN8= radiusd.8 radwatch.8 do-build: - cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} + cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} RADIUS_DIR=${RADIUS_DIR} do-install: - cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install + cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} RADIUS_DIR=${RADIUS_DIR} install + ${CP} ${RADIUS_DIR}/clients ${RADIUS_DIR}/clients.sample + ${CP} ${RADIUS_DIR}/hints ${RADIUS_DIR}/hints.sample + ${CP} ${RADIUS_DIR}/huntgroups ${RADIUS_DIR}/huntgroups.sample + ${CP} ${RADIUS_DIR}/naslist ${RADIUS_DIR}/naslist.sample + ${CP} ${RADIUS_DIR}/naspasswd ${RADIUS_DIR}/naspasswd.sample + ${CP} ${RADIUS_DIR}/realms ${RADIUS_DIR}/realms.sample + ${CP} ${RADIUS_DIR}/users ${RADIUS_DIR}/users.sample @${MKDIR} -m 700 /var/log/radacct .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/radiusd-cistron - ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Cistron ${PREFIX}/share/doc/radiusd-cistron - ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Livingston ${PREFIX}/share/doc/radiusd-cistron + ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog ${PREFIX}/share/doc/radiusd-cistron - ${INSTALL_DATA} ${WRKSRC}/doc/INSTALL.OLD ${PREFIX}/share/doc/radiusd-cistron + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/README.Y2K ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/README.cisco ${PREFIX}/share/doc/radiusd-cistron diff radiusd-cistron/distinfo radiusd-cistron/distinfo --- radiusd-cistron/distinfo Thu Jan 11 08:59:54 2001 +++ radiusd-cistron/distinfo Fri Feb 22 13:22:07 2002 @@ -1 +1 @@ -MD5 (radiusd-cistron-1.6.4.tar.gz) = a76babebdd64bc289d5d814dbc2f2c10 +MD5 (radiusd-cistron-1.6.6.tar.gz) = 16084870890fd2ec577dbe183b51a379 diff radiusd-cistron/files/patch-ac radiusd-cistron/files/patch-ac --- radiusd-cistron/files/patch-ac Thu May 4 01:04:48 2000 +++ radiusd-cistron/files/patch-ac Fri Feb 22 13:22:07 2002 @@ -1,10 +1,11 @@ ---- 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 */ +--- src/conf.h 2002/02/07 19:39:25 1.1 ++++ src/conf.h 2002/02/07 19:39:50 +@@ -6,7 +6,7 @@ + */ + /* Default Database File Names */ -#define RADIUS_DIR "/etc/raddb" -+#define RADIUS_DIR PREFIX "/etc/raddb" ++#define RADIUS_DIR "/usr/local/etc/raddb" #define RADLOG_DIR "/var/log" #ifdef aix diff radiusd-cistron/pkg-plist radiusd-cistron/pkg-plist --- radiusd-cistron/pkg-plist Thu May 4 01:04:49 2000 +++ radiusd-cistron/pkg-plist Fri Feb 22 13:22:07 2002 @@ -5,7 +5,7 @@ bin/radzap sbin/checkrad sbin/radiusd -sbin/radwatch +sbin/radrelay etc/raddb/clients.sample etc/raddb/dictionary etc/raddb/dictionary.ascend @@ -22,10 +22,9 @@ etc/raddb/naspasswd.sample etc/raddb/realms.sample etc/raddb/users.sample -share/doc/radiusd-cistron/COPYRIGHT.Cistron -share/doc/radiusd-cistron/COPYRIGHT.Livingston +share/doc/radiusd-cistron/COPYRIGHT share/doc/radiusd-cistron/ChangeLog -share/doc/radiusd-cistron/INSTALL.OLD +share/doc/radiusd-cistron/INSTALL share/doc/radiusd-cistron/README share/doc/radiusd-cistron/README.Y2K share/doc/radiusd-cistron/README.cisco From: Juha Ylitalo To: freebsd-gnats-submit@FreeBSD.org Cc: dirk.meyer@dinoex.sub.org (Dirk Meyer) Subject: Re: ports/34713: Update to net/radiusd-cistron port Date: 23 Feb 2002 14:06:36 +0200 I went through radiusd-cistron 1.6.4 patches one more time and fixed them so that they will patch nicely against v1.6.6 source. (points 1 and 3 in Dirk's mail) I also took point 2 into use. Here is new diff between old (1.6.4) and new port (1.6.6): diff -r -u radiusd-cistron.old/Makefile radiusd-cistron/Makefile --- radiusd-cistron.old/Makefile Tue Jan 29 17:56:57 2002 +++ radiusd-cistron/Makefile Sat Feb 23 13:44:12 2002 @@ -6,16 +6,18 @@ # PORTNAME= radiusd-cistron -PORTVERSION= 1.6.4 +PORTVERSION= 1.6.6 CATEGORIES= net MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/ \ ftp://ftp.freeradius.org/pub/radius/ -FORBIDDEN= "Remotely exploitable buffer overflow" - MAINTAINER= john@nlc.net.au +# FORBIDDEN= "Remotely exploitable buffer overflow" + MAKEFILE= Makefile.BSD +RADIUS_DIR= ${PREFIX}/etc/raddb +MAKE_ENV+= RADIUS_DIR="${RADIUS_DIR}" MAN1= radlast.1 radtest.1 raduse.1 radwho.1 radzap.1 MAN5= clients.5rad naslist.5rad @@ -29,10 +31,9 @@ @${MKDIR} -m 700 /var/log/radacct .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/radiusd-cistron - ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Cistron ${PREFIX}/share/doc/radiusd-cistron - ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Livingston ${PREFIX}/share/doc/radiusd-cistron + ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog ${PREFIX}/share/doc/radiusd-cistron - ${INSTALL_DATA} ${WRKSRC}/doc/INSTALL.OLD ${PREFIX}/share/doc/radiusd-cistron + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/README.Y2K ${PREFIX}/share/doc/radiusd-cistron ${INSTALL_DATA} ${WRKSRC}/doc/README.cisco ${PREFIX}/share/doc/radiusd-cistron diff -r -u radiusd-cistron.old/distinfo radiusd-cistron/distinfo --- radiusd-cistron.old/distinfo Thu Jan 11 09:59:54 2001 +++ radiusd-cistron/distinfo Sat Feb 23 12:53:11 2002 @@ -1 +1 @@ -MD5 (radiusd-cistron-1.6.4.tar.gz) = a76babebdd64bc289d5d814dbc2f2c10 +MD5 (radiusd-cistron-1.6.6.tar.gz) = 16084870890fd2ec577dbe183b51a379 diff -r -u radiusd-cistron.old/files/patch-aa radiusd-cistron/files/patch-aa --- radiusd-cistron.old/files/patch-aa Sun Dec 9 05:20:14 2001 +++ radiusd-cistron/files/patch-aa Sat Feb 23 13:13:26 2002 @@ -1,29 +1,35 @@ ---- src/Makefile.BSD.orig Sun Sep 19 08:10:41 1999 -+++ src/Makefile.BSD Sat Jul 21 18:48:00 2001 -@@ -3,19 +3,19 @@ +--- src/Makefile.BSD 2002/02/23 11:10:14 1.1 ++++ src/Makefile.BSD 2002/02/23 11:11:54 +@@ -3,9 +3,9 @@ # # - + -CC = gcc -CFLAGS = -Wall -g -DNOSHADOW --LDFLAGS = # -s #tatic +-LDFLAGS = # -s +#CC = gcc -+CFLAGS += -DNOSHADOW -DPREFIX=\"$(PREFIX)\" -+LDFLAGS = -s #tatic ++CFLAGS += -DNOSHADOW -DPREFIX=\"$(PREFIX)\" #-Wall -g -DNOSHADOW ++LDFLAGS = -s LIBS = LCRYPT = -lcrypt - - DBM = -DNDBM - DBMLIB = #-ldb - + +@@ -13,14 +13,14 @@ + #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 +BINDIR = $(PREFIX)/bin +SBINDIR = $(PREFIX)/sbin - ++MANDIR = $(PREFIX)/man + .include "Make.inc" diff -r -u radiusd-cistron.old/files/patch-ab radiusd-cistron/files/patch-ab --- radiusd-cistron.old/files/patch-ab Thu May 4 02:04:48 2000 +++ radiusd-cistron/files/patch-ab Sat Feb 23 13:39:50 2002 @@ -1,39 +1,42 @@ ---- src/Make.inc.orig Mon Apr 3 11:00:59 2000 -+++ src/Make.inc Wed May 3 18:56:35 2000 +--- 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 +-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 + 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} radtest $(BINDIR) -+ ${BSD_INSTALL_SCRIPT} ../scripts/radwatch ${SBINDIR}/radwatch ++ ${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) - # Install the config files - @echo "Creating/updating files in $(RADIUS_DIR)"; \ ++ ${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; \ @@ -41,13 +44,14 @@ done; \ for i in dictionary*; do \ [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \ -@@ -133,8 +132,4 @@ - echo "** $(RADIUS_DIR)/$$i"; \ +@@ -156,10 +156,3 @@ nt=1; \ fi; \ -- done; \ + done; \ - if [ "$$nt" ]; then \ - echo "** The samples in ../raddb are newer than these files";\ - echo "** Please investigate and copy manually if appropriate";\ +- echo ;\ - fi -+ done; +- +- diff -r -u radiusd-cistron.old/files/patch-af radiusd-cistron/files/patch-af --- radiusd-cistron.old/files/patch-af Thu Jan 11 09:59:56 2001 +++ radiusd-cistron/files/patch-af Sat Feb 23 13:28:27 2002 @@ -64,7 +64,7 @@ + extra_width = ws.ws_col - 80; + } + - while((c = getopt(argc, argv, "Dflhnsipcr")) != EOF) switch(c) { + while((c = getopt(argc, argv, "Dd:flhnsipcru:")) != EOF) switch(c) { case 'D': use_dns = 0; @@ -469,14 +481,17 @@ diff -r -u radiusd-cistron.old/pkg-plist radiusd-cistron/pkg-plist --- radiusd-cistron.old/pkg-plist Thu May 4 02:04:49 2000 +++ radiusd-cistron/pkg-plist Sat Feb 23 12:53:11 2002 @@ -5,7 +5,7 @@ bin/radzap sbin/checkrad sbin/radiusd -sbin/radwatch +sbin/radrelay etc/raddb/clients.sample etc/raddb/dictionary etc/raddb/dictionary.ascend @@ -22,10 +22,9 @@ etc/raddb/naspasswd.sample etc/raddb/realms.sample etc/raddb/users.sample -share/doc/radiusd-cistron/COPYRIGHT.Cistron -share/doc/radiusd-cistron/COPYRIGHT.Livingston +share/doc/radiusd-cistron/COPYRIGHT share/doc/radiusd-cistron/ChangeLog -share/doc/radiusd-cistron/INSTALL.OLD +share/doc/radiusd-cistron/INSTALL share/doc/radiusd-cistron/README share/doc/radiusd-cistron/README.Y2K share/doc/radiusd-cistron/README.cisco State-Changed-From-To: open->closed State-Changed-By: dinoex State-Changed-When: Sat Mar 2 12:34:15 PST 2002 State-Changed-Why: Commited after timeout, no response from Maintainer. http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34713 >Unformatted: