Security update

5 files changed, 60 insertions, 2 deletions

diff --git a/net-ftp/atftp/ChangeLog b/net-ftp/atftp/ChangeLog
index d1acedf472a7..2fe578405c4d 100644
--- a/net-ftp/atftp/ChangeLog
+++ b/net-ftp/atftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/atftp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.4 2003/02/12 07:57:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.5 2003/06/08 18:15:13 aliz Exp $
+
+*atftp-0.6-r2 (08 Jun 2003)
+
+  08 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
 
 *atftp-0.6-r1 (29 Oct 2002)
 
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 3f2e2f5f80fb..ae78c50fdaf3 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -1,5 +1,8 @@
-MD5 bf7b0369ce1c1518fdf0104cf144e928 ChangeLog 557
+MD5 56d595492543dab22a6bf99366205961 ChangeLog 656
 MD5 012a9872f3a23e36b38d026603860494 atftp-0.6-r1.ebuild 867
 MD5 d0d92fe2366bef6deb301fa6608a2b28 atftp-0.6.ebuild 758
+MD5 4dbc1deb09b03f9341fd1e55aeda155e atftp-0.6-r2.ebuild 964
 MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6 61
 MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6-r1 61
+MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6-r2 61
+MD5 056d61425e87567ddcedc6188e7b99fa files/atftp-6.0-security.patch 442
diff --git a/net-ftp/atftp/atftp-0.6-r2.ebuild b/net-ftp/atftp/atftp-0.6-r2.ebuild
new file mode 100644
index 000000000000..39404d2471ab
--- /dev/null
+++ b/net-ftp/atftp/atftp-0.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.6-r2.ebuild,v 1.1 2003/06/08 18:15:13 aliz Exp $
+
+inherit eutils
+
+DESCRIPTION="Advanced TFTP implementation client/server"
+HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/"
+LICENSE="GPL-2"
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+SLOT="0"
+KEYWORDS="x86"
+SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz"
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-security.patch
+}
+
+src_compile () {
+	myconf=""
+	use tcpd && myconf="${myconf} --enable-libwrap" \
+		|| myconf="${myconf} --disable-libwrap"
+
+	econf ${myconf} || die "./configure failed"
+
+	cp Makefile Makefile.orig
+	sed "s:CFLAGS = -g -Wall -D_REENTRANT -O2:CFLAGS = -g -Wall -D_REENTRANT ${CFLAGS}:" Makefile.orig >Makefile
+
+	emake || die
+}
+
+src_install () {
+	einstall || die "Installation failed"
+}
+
diff --git a/net-ftp/atftp/files/atftp-0.6-security.patch b/net-ftp/atftp/files/atftp-0.6-security.patch
new file mode 100644
index 000000000000..1646018ca9d3
--- /dev/null
+++ b/net-ftp/atftp/files/atftp-0.6-security.patch
@@ -0,0 +1,12 @@
+--- tftpd_file.c	Tue Mar 12 05:26:18 2002
++++ tftpd_file_diff.c	Thu Jun  5 20:31:06 2003
+@@ -357,7 +357,8 @@
+      else
+      {
+           strcpy(filename, directory);
+-          strncat(filename, data->tftp_options[OPT_FILENAME].value, VAL_SIZE);
++          strncat(filename, data->tftp_options[OPT_FILENAME].value, 
++		VAL_SIZE - strlen( directory ) - 1 );
+      }
+ 
+      /* If the filename contain /../ sequences, we forbid the access */
diff --git a/net-ftp/atftp/files/digest-atftp-0.6-r2 b/net-ftp/atftp/files/digest-atftp-0.6-r2
new file mode 100644
index 000000000000..5cfcb463e4a5
--- /dev/null
+++ b/net-ftp/atftp/files/digest-atftp-0.6-r2
@@ -0,0 +1 @@
+MD5 fcbc9118b02fa2090046be987b1e1aec atftp-0.6.tar.gz 119898