summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-09-21 01:59:46 +0000
committerMike Frysinger <vapier@gentoo.org>2004-09-21 01:59:46 +0000
commitc24f1708bbb48db67092496c8725a3ef21b1df1c (patch)
tree48d09e5286e26f7cf64b37899254abf192c80da7 /net-ftp
parentremoved no-herd from metadata.xml, left over from skel (Manifest recommit) (diff)
downloadgentoo-2-c24f1708bbb48db67092496c8725a3ef21b1df1c.tar.gz
gentoo-2-c24f1708bbb48db67092496c8725a3ef21b1df1c.tar.bz2
gentoo-2-c24f1708bbb48db67092496c8725a3ef21b1df1c.zip
ver bump for security #64809
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/glftpd/ChangeLog8
-rw-r--r--net-ftp/glftpd/files/1.32-stack-overflow.patch12
-rw-r--r--net-ftp/glftpd/files/digest-glftpd-1.32-r1 (renamed from net-ftp/glftpd/files/digest-glftpd-1.32)0
-rw-r--r--net-ftp/glftpd/glftpd-1.32-r1.ebuild (renamed from net-ftp/glftpd/glftpd-1.32.ebuild)3
4 files changed, 21 insertions, 2 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/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 ; }