ver bump for security #64809

5 files changed, 37 insertions, 7 deletions

diff --git a/net-ftp/glftpd/ChangeLog b/net-ftp/glftpd/ChangeLog
index 16d7d1093cba..61c32f6983aa 100644
--- a/net-ftp/glftpd/ChangeLog
+++ b/net-ftp/glftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/glftpd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.9 2004/06/24 22:45:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.10 2004/09/21 01:59:46 vapier Exp $
+
+*glftpd-1.32-r1 (20 Sep 2004)
+
+  20 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/1.32-stack-overflow.patch, +glftpd-1.32-r1.ebuild:
+  Version bump to fix stack overflow #64809.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> glftpd-1.32.ebuild:
   Fix use invocation, trusting SpanKY to clean up yesno ;-)
diff --git a/net-ftp/glftpd/Manifest b/net-ftp/glftpd/Manifest
index c29578b30c75..c6ebb8fb2a1b 100644
--- a/net-ftp/glftpd/Manifest
+++ b/net-ftp/glftpd/Manifest
@@ -1,6 +1,17 @@
-MD5 64389b03537304b64cb4db0cd4e9d802 glftpd-1.32.ebuild 2767
-MD5 f58d5217a490e9fa5e93106c95cd71a8 ChangeLog 775
-MD5 421ebf4ff7a3d7618578fa291d8bef23 files/digest-glftpd-1.32 65
-MD5 6399dbb185314c6017b02b3df2cdf5ea files/glftpd.xinetd.d 384
-MD5 81335a6d3e45dc6d3d00f1b30eedd849 files/glftpd.env.d 26
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 78b5f0b1caeb66a743083e78ca60ad24 ChangeLog 961
+MD5 2b647d0a96e8b30705782d2b79bec1e8 glftpd-1.32-r1.ebuild 2815
 MD5 4acdfa97d781bcecd8107b66a882ada8 files/1.32-install.patch 1432
+MD5 81335a6d3e45dc6d3d00f1b30eedd849 files/glftpd.env.d 26
+MD5 6399dbb185314c6017b02b3df2cdf5ea files/glftpd.xinetd.d 384
+MD5 421ebf4ff7a3d7618578fa291d8bef23 files/digest-glftpd-1.32-r1 65
+MD5 f619ff9e604df95944d54c1d624970a6 files/1.32-stack-overflow.patch 411
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBT4suHTu7gpaalycRAlqEAKCDMwByqO60OPsAVS13Xcxj2xej/ACeIUAU
+na+bp8yibYhlg0rKbFwwywk=
+=hPxv
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/glftpd/files/1.32-stack-overflow.patch b/net-ftp/glftpd/files/1.32-stack-overflow.patch
new file mode 100644
index 000000000000..d10182606760
--- /dev/null
+++ b/net-ftp/glftpd/files/1.32-stack-overflow.patch
@@ -0,0 +1,12 @@
+--- bin/sources/dupescan.c.orig	2004-09-20 21:19:29.448018912 -0400
++++ bin/sources/dupescan.c	2004-09-20 21:20:58.484483312 -0400
+@@ -51,7 +51,8 @@
+   read_conf_datapath(Temp);
+   sprintf(dupefile, "%s/logs/dupefile", Temp);
+   
+-  strcpy(dupename, argv[1]);
++  strncpy(dupename, argv[1], sizeof(dupename)-1);
++  dupename[sizeof(dupename)-1] = '\0';
+   if((fp = fopen(dupefile, "r")) == NULL)
+     return 0;
+ 
diff --git a/net-ftp/glftpd/files/digest-glftpd-1.32 b/net-ftp/glftpd/files/digest-glftpd-1.32-r1
index ae51c837d55b..ae51c837d55b 100644
--- a/net-ftp/glftpd/files/digest-glftpd-1.32
+++ b/net-ftp/glftpd/files/digest-glftpd-1.32-r1
diff --git a/net-ftp/glftpd/glftpd-1.32.ebuild b/net-ftp/glftpd/glftpd-1.32-r1.ebuild
index 7f69e84c3cb6..02fda6ffda6b 100644
--- a/net-ftp/glftpd/glftpd-1.32.ebuild
+++ b/net-ftp/glftpd/glftpd-1.32-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.32.ebuild,v 1.4 2004/07/14 23:55:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-1.32-r1.ebuild,v 1.1 2004/09/21 01:59:46 vapier Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ src_unpack() {
 	cd ${S}
 	cp installgl.sh{,.orig}
 	epatch ${FILESDIR}/${PV}-install.patch
+	epatch ${FILESDIR}/${PV}-stack-overflow.patch
 }
 
 yesno() { if $@ ; then echo y ; else echo n ; fi ; }