diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-03-02 20:35:02 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-03-02 20:35:02 +0000 |
commit | 400729503874358bb416a8f4d92581572f3f7712 (patch) | |
tree | 86065f290afa17a89838b97b99fd8a0b6aee45a3 /net | |
parent | 2f60a7bfc4715014c42d67985f77c26158e97c3c (diff) | |
download | ports-400729503874358bb416a8f4d92581572f3f7712.tar.gz ports-400729503874358bb416a8f4d92581572f3f7712.zip |
Juha Ylitalo writes:
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.
Commited after timout, no response from Maintainer.
PR: 34713
Notes
Notes:
svn path=/head/; revision=55414
Diffstat (limited to 'net')
-rw-r--r-- | net/radiusd-cistron/Makefile | 13 | ||||
-rw-r--r-- | net/radiusd-cistron/distinfo | 2 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-aa | 32 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-ab | 66 | ||||
-rw-r--r-- | net/radiusd-cistron/files/patch-af | 2 | ||||
-rw-r--r-- | net/radiusd-cistron/pkg-plist | 7 |
6 files changed, 66 insertions, 56 deletions
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index 318615ff47f5..0363797c3eb5 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -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 @@ do-install: @${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 --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo index b590f8696fe4..ef2f151e1935 100644 --- a/net/radiusd-cistron/distinfo +++ b/net/radiusd-cistron/distinfo @@ -1 +1 @@ -MD5 (radiusd-cistron-1.6.4.tar.gz) = a76babebdd64bc289d5d814dbc2f2c10 +MD5 (radiusd-cistron-1.6.6.tar.gz) = 16084870890fd2ec577dbe183b51a379 diff --git a/net/radiusd-cistron/files/patch-aa b/net/radiusd-cistron/files/patch-aa index 58b1ef9bb2e0..5052ac7ef4b8 100644 --- a/net/radiusd-cistron/files/patch-aa +++ b/net/radiusd-cistron/files/patch-aa @@ -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 --git a/net/radiusd-cistron/files/patch-ab b/net/radiusd-cistron/files/patch-ab index 6c516dd8caf4..2f7af57fb214 100644 --- a/net/radiusd-cistron/files/patch-ab +++ b/net/radiusd-cistron/files/patch-ab @@ -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 --git a/net/radiusd-cistron/files/patch-af b/net/radiusd-cistron/files/patch-af index 02ec8e6cc0cf..1a504c78d343 100644 --- a/net/radiusd-cistron/files/patch-af +++ b/net/radiusd-cistron/files/patch-af @@ -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 --git a/net/radiusd-cistron/pkg-plist b/net/radiusd-cistron/pkg-plist index ec14c0a7e6ea..ce9a74812122 100644 --- a/net/radiusd-cistron/pkg-plist +++ b/net/radiusd-cistron/pkg-plist @@ -5,7 +5,7 @@ bin/radwho 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/naslist.sample 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 |