security update

5 files changed, 110 insertions, 2 deletions

diff --git a/net-dialup/cistronradius/ChangeLog b/net-dialup/cistronradius/ChangeLog
index 6a50a4572315..3bd13ef0f65b 100644
--- a/net-dialup/cistronradius/ChangeLog
+++ b/net-dialup/cistronradius/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/cistronradius
 # Copyright 1999-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/ChangeLog,v 1.1 2003/07/04 02:54:13 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/ChangeLog,v 1.2 2003/07/11 13:03:47 aliz Exp $
+
+*cistronradius-1.6.6-r1 (11 Jul 2003)
+
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> cistronradius-1.6.6-r1.ebuild :
+  Security update. Added patch from Debian.
 
 *cistronradius-1.6.6 (03 Jul 2003)
 
diff --git a/net-dialup/cistronradius/Manifest b/net-dialup/cistronradius/Manifest
index f18a51002df9..8fb0191a05f0 100644
--- a/net-dialup/cistronradius/Manifest
+++ b/net-dialup/cistronradius/Manifest
@@ -1,4 +1,7 @@
-MD5 1c66f95a57c2112bd9d6daa44d79d4ec cistronradius-1.6.6.ebuild 1301
 MD5 d38a9da7adaf4002fd09fcc31ec5b416 ChangeLog 346
+MD5 1c66f95a57c2112bd9d6daa44d79d4ec cistronradius-1.6.6.ebuild 1301
+MD5 49c89d648876443f86ff6431b310b819 cistronradius-1.6.6-r1.ebuild 1367
 MD5 a4069a15c4864c13bfb0595bbe431206 files/cistronradius.rc 734
 MD5 3dd71fd3a3d624e0c3c7e3488bb91c7d files/digest-cistronradius-1.6.6 73
+MD5 1bd8538733d3d9a27a9dfed9caeebf6e files/cistronradius-1.6.6-security.patch 1131
+MD5 3dd71fd3a3d624e0c3c7e3488bb91c7d files/digest-cistronradius-1.6.6-r1 73
diff --git a/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild b/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..eb698d13f7c0
--- /dev/null
+++ b/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild,v 1.1 2003/07/11 13:03:48 aliz Exp $
+
+IUSE=""
+
+S="${WORKDIR}/radiusd-cistron-${PV}/src"
+DESCRIPTION="An authentication and accounting server for terminal servers that speak the RADIUS protocol."
+SRC_URI="ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-${PV}.tar.gz"
+HOMEPAGE="http://www.radius.cistron.nl/"
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="sys-devel/gcc
+	>=sys-apps/sed-4"
+RDEPEND=${DEPEND}
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-security.patch
+
+	sed -i -e "s:/usr/local:/usr:g" \
+	-e "s:-Wall -g:${CFLAGS}:g" \
+	Makefile || die
+	mv checkrad.pl checkrad
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+#	cd ${S}
+	dodir /usr/sbin
+	exeinto /usr/sbin
+	doexe ${S}/checkrad
+	doexe ${S}/radiusd
+	doexe ${S}/radrelay
+	dodir /usr/bin
+	exeinto /usr/bin
+	doexe ${S}/radclient
+	doexe ${S}/radlast
+	doexe ${S}/radtest
+	doexe ${S}/raduse
+	doexe ${S}/radwho
+	doexe ${S}/radzap
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/cistronradius.rc cistronradius
+	cd ${S}/..
+	dodir /etc/raddb
+	insinto /etc/raddb
+	doins raddb/*
+	dodoc COPYRIGHT INSTALL README doc/{ChangeLog,FAQ.txt,README*}
+	doman doc/{*.1,*.8,*.5rad,*.8rad}
+}
diff --git a/net-dialup/cistronradius/files/cistronradius-1.6.6-security.patch b/net-dialup/cistronradius/files/cistronradius-1.6.6-security.patch
new file mode 100644
index 000000000000..be9e24b54d7b
--- /dev/null
+++ b/net-dialup/cistronradius/files/cistronradius-1.6.6-security.patch
@@ -0,0 +1,42 @@
+--- radiusd-cistron-1.6.6.orig/src/acct.c
++++ radiusd-cistron-1.6.6/src/acct.c
+@@ -119,9 +119,10 @@
+  */
+ static void make_wtmp(struct radutmp *ut, struct utmp *wt, int status)
+ {
+-	char		buf[32];
++	char		buf[48];
+ 	NAS		*cl;
+ 	char		*s;
++	int		len;
+ 
+ 	/*
+ 	 *	Fill out the UTMP struct for the radwtmp file.
+@@ -143,11 +144,13 @@
+ 		s = cl->shortname;
+ 	if (s == NULL || s[0] == 0) s = uue(&(ut->nas_address));
+ #if UT_LINESIZE > 9
+-	sprintf(buf, "%03d:%.20s", ut->nas_port, s);
++	sprintf(buf, "%03u:%.20s", ut->nas_port, s);
+ #else
+-	sprintf(buf, "%02d%.20s", ut->nas_port, s);
++	sprintf(buf, "%02u%.20s", ut->nas_port, s);
+ #endif
+-	strncpy(wt->ut_line, buf, UT_LINESIZE);
++	len = UT_LINESIZE;
++	if (len > sizeof(buf)) len = sizeof(buf);
++	strncpy(wt->ut_line, buf, len);
+ 
+ 	/*
+ 	 *	We store the dynamic IP address in the hostname field.
+@@ -155,7 +158,9 @@
+ #ifdef UT_HOSTSIZE
+ 	if (ut->framed_address) {
+ 		ipaddr2str(buf, ntohl(ut->framed_address));
+-		strncpy(wt->ut_host, buf, UT_HOSTSIZE);
++		len = UT_HOSTSIZE;
++		if (len > sizeof(buf)) len = sizeof(buf);
++		strncpy(wt->ut_host, buf, len);
+ 	}
+ #endif
+ #ifdef __svr4__
diff --git a/net-dialup/cistronradius/files/digest-cistronradius-1.6.6-r1 b/net-dialup/cistronradius/files/digest-cistronradius-1.6.6-r1
new file mode 100644
index 000000000000..894e581b50c0
--- /dev/null
+++ b/net-dialup/cistronradius/files/digest-cistronradius-1.6.6-r1
@@ -0,0 +1 @@
+MD5 16084870890fd2ec577dbe183b51a379 radiusd-cistron-1.6.6.tar.gz 194154