net-ftp/ftpd-0.17-r3: Add patch to fix compilation with gcc-4.1; bug #135713

svn path=/; revision=21

8 files changed, 273 insertions, 0 deletions

diff --git a/net-ftp/ftpd/ChangeLog b/net-ftp/ftpd/ChangeLog
new file mode 100644
index 000000000..de093e505
--- /dev/null
+++ b/net-ftp/ftpd/ChangeLog
@@ -0,0 +1,89 @@
+# ChangeLog for net-ftp/ftpd
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.24 2006/01/30 19:03:56 blubb Exp $
+
+  08 Jun 2006; Piotr Jaroszynski <peper@aster.pl> +files/ftpd-0.17-gcc41.patch, ftpd-0.17-r3.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #135713
+
+  28 Jan 2006; Simon Stelling <blubb@gentoo.org> ftpd-0.17.ebuild,
+  ftpd-0.17-r1.ebuild, ftpd-0.17-r2.ebuild:
+  move binary files to mirrors
+
+  11 Nov 2005; Simon Stelling <blubb@gentoo.org> ftpd-0.17-r3.ebuild:
+  stable on amd64 wrt bug 111573
+
+  10 Nov 2005; Jose Luis Rivero <yoswink@gentoo.org> ftpd-0.17-r3.ebuild:
+  Stable on alpha wrt security bug #111573
+
+  10 Nov 2005; Jason Wever <weeve@gentoo.org> ftpd-0.17-r3.ebuild:
+  Stable on SPARC wrt bug #111573.
+
+  10 Nov 2005; Mark Loeser <halcy0n@gentoo.org> ftpd-0.17-r3.ebuild:
+  Stable on x86; bug #111573
+
+*ftpd-0.17-r3 (09 Nov 2005)
+
+  09 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +ftpd-0.17-r3.ebuild:
+  bumped with a better patch from solar
+
+*ftpd-0.17-r2 (06 Nov 2005)
+
+  06 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/ftpd-0.17+ssl-0.3-overflowpatch.diff, +ftpd-0.17-r2.ebuild:
+  fix remote hole in linux-ftpd-ssl - security bug #111573 - patch thanks to
+  James Longstreet, bug thanks to Wernfried Haas
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> ftpd-0.17-r1.ebuild:
+  Added to ~ppc.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ftpd-0.17-r1.ebuild:
+  Stable on amd64.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/ftp.xinetd:
+  Fixed CVS Header.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> ftpd-0.17-r1.ebuild:
+  Stable on sparc.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ftpd-0.17-r1.ebuild,
+  ftpd-0.17.ebuild:
+  Fix use invocation
+
+  13 Aug 2003; Aron Griffis <agriffis@gentoo.org> ftpd-0.17-r1.ebuild:
+  Mark stable on alpha for LiveCD
+
+  08 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17-r1.ebuild:
+  shadow fix patch is not ssl specific, moved out of ssl USE check. Thanks again
+  to: Frank Straetz
+
+*ftpd-0.17-r1 (07 Jun 2003)
+
+  07 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17-r1.ebuild,
+  files/ftpd-0.17-shadowfix.patch:
+  fix for shadow passwords, to close bug #12353 opened by Adam Bolte
+  <adam@vivid.net.au>. Fix provided by Frank Straetz <Frank@KTHXBYE.de>
+
+*ftpd-0.17 (25 Nov 2002)
+
+  29 Apr 2003; Jason Wever <weeve@gentoo.org> ftpd-0.17.ebuild:
+  Added ~sparc to keywords.
+
+  19 Apr 2003; Martin Holzer <mholzer@gentoo.org> ftpd-0.17.ebuild:
+  Changed to virtual/inetd depend.
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17.ebuild :
+
+  Sed expression delimiter from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  15 Jan 2003; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
+  Fixed a typo in postinst and added xinetd as an RDEPEND and now
+  installing an /etc/xinetd.d/ftp.  Also changed to epatch.
+
+  05 Dec 2002; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
+  Marked stable.
+
+  25 Nov 2002; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild,
+  files/digest-ftpd-0.17.ebuild, files/ssl.diff.gz :
+  New ebuild.  Your basic netkit linux-ftpd patched for ssl support.
diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest
new file mode 100644
index 000000000..f33a8c8b6
--- /dev/null
+++ b/net-ftp/ftpd/Manifest
@@ -0,0 +1,29 @@
+AUX ftp.xinetd 313 RMD160 ff141a45ea3b93ccb56b595ce5a888fd94f29794 SHA1 9d33ac90722d87fc21d185078b4932ace610c7b1 SHA256 ee08270697e8880aa190de3453fb715a545febdf07071e0cf8d342f781748562
+MD5 c77f5bcf2f56d61c7e8845d94df88164 files/ftp.xinetd 313
+RMD160 ff141a45ea3b93ccb56b595ce5a888fd94f29794 files/ftp.xinetd 313
+SHA256 ee08270697e8880aa190de3453fb715a545febdf07071e0cf8d342f781748562 files/ftp.xinetd 313
+AUX ftpd-0.17+ssl-0.3-overflowpatch.diff 532 RMD160 9479136b001732871c866120ffbb58f44d487215 SHA1 0f03523d4d7f539e4b1806bef2fc288af6fdbc17 SHA256 3476479f9e355d0e9c2ff1822f8bc613dd932c827a1858075f554c9f80f637b8
+MD5 fb54312525ec906691ee16975f1658be files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
+RMD160 9479136b001732871c866120ffbb58f44d487215 files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
+SHA256 3476479f9e355d0e9c2ff1822f8bc613dd932c827a1858075f554c9f80f637b8 files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
+AUX ftpd-0.17-gcc41.patch 921 RMD160 f1e2348d98602c7ff3cbe7bb0a2777c08c9e52cd SHA1 c71743205e0ddbee3f2361e8be526c51d91c4978 SHA256 eb1e24e1dfd3443ee197a0f9f4eb44c66db463b67bf3fb427543d6ab5093eaaa
+MD5 835a4cb3e4b0fb1234f3b8cb66139a47 files/ftpd-0.17-gcc41.patch 921
+RMD160 f1e2348d98602c7ff3cbe7bb0a2777c08c9e52cd files/ftpd-0.17-gcc41.patch 921
+SHA256 eb1e24e1dfd3443ee197a0f9f4eb44c66db463b67bf3fb427543d6ab5093eaaa files/ftpd-0.17-gcc41.patch 921
+AUX ftpd-0.17-shadowfix.patch 895 RMD160 64fc0211ae0f7b7760a7460a9d1044736833d7fc SHA1 23e77f0548f99c34ce1813529ee572eb1548caf4 SHA256 8c8b221554b713c7d842b2b10608010fbf264577cebfaf20c9f34e560e054886
+MD5 7e1217f2de231dda2c8e842a7d7dfb7b files/ftpd-0.17-shadowfix.patch 895
+RMD160 64fc0211ae0f7b7760a7460a9d1044736833d7fc files/ftpd-0.17-shadowfix.patch 895
+SHA256 8c8b221554b713c7d842b2b10608010fbf264577cebfaf20c9f34e560e054886 files/ftpd-0.17-shadowfix.patch 895
+DIST linux-ftpd-0.17-ssl.patch 36459 RMD160 5a0d7301f69b4c1714f36419f98134f9aa0ce874 SHA1 a684c075dbc7603b40704713350c1bb95d98a4c5 SHA256 0082ee6a71fdd83f61e63166f7bbba97c204cdc67f9e1bf10f2df31590fba780
+DIST linux-ftpd-0.17.tar.gz 46763 RMD160 869e410d8f063c764c04f1d3b41b625a9d679d22 SHA1 b348e2c9561d746a42b7a24ba8730a3adc203dfb SHA256 65a0b249e38bf3c3a16dbd4d3edd2657683ca8f47b307e92007f378b21d2fa65
+EBUILD ftpd-0.17-r3.ebuild 1474 RMD160 32e79c0517308662df331ca042e024cbb0ffba43 SHA1 b0a48e1642ede05db17fae15c12d2dad0bd09313 SHA256 ffde5a6caebb7706d5395e0d1773d2ca1322166f4591b4011ca83957514c0d7b
+MD5 639c5f803d3c1f6c368cd39a044b5dbf ftpd-0.17-r3.ebuild 1474
+RMD160 32e79c0517308662df331ca042e024cbb0ffba43 ftpd-0.17-r3.ebuild 1474
+SHA256 ffde5a6caebb7706d5395e0d1773d2ca1322166f4591b4011ca83957514c0d7b ftpd-0.17-r3.ebuild 1474
+MISC ChangeLog 3235 RMD160 80e3d9da9594805aa0e053940cba283fede5cc90 SHA1 9441e27e5008e510e6a29afe00b6592f1393eb94 SHA256 8181c8fd08787bbb6318a58489d18a80cffa4e465d5998d9ad029bcee6b555d9
+MD5 b4453fe0d60bab309c5c78d7fa9703ea ChangeLog 3235
+RMD160 80e3d9da9594805aa0e053940cba283fede5cc90 ChangeLog 3235
+SHA256 8181c8fd08787bbb6318a58489d18a80cffa4e465d5998d9ad029bcee6b555d9 ChangeLog 3235
+MD5 a5158bf958d1411f9daefa3a43b7f12e files/digest-ftpd-0.17-r3 497
+RMD160 db856b5782788330427703698f410c205225d8e2 files/digest-ftpd-0.17-r3 497
+SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/digest-ftpd-0.17-r3 497
diff --git a/net-ftp/ftpd/files/digest-ftpd-0.17-r3 b/net-ftp/ftpd/files/digest-ftpd-0.17-r3
new file mode 100644
index 000000000..79a49aa35
--- /dev/null
+++ b/net-ftp/ftpd/files/digest-ftpd-0.17-r3
@@ -0,0 +1,2 @@
+MD5 0b9185d5144904798b721354ea9ff156 linux-ftpd-0.17-ssl.patch 36459
+MD5 f5f491564812db5d8783daa538c49186 linux-ftpd-0.17.tar.gz 46763
diff --git a/net-ftp/ftpd/files/ftp.xinetd b/net-ftp/ftpd/files/ftp.xinetd
new file mode 100644
index 000000000..22bca8e7c
--- /dev/null
+++ b/net-ftp/ftpd/files/ftp.xinetd
@@ -0,0 +1,13 @@
+# default: off
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/files/ftp.xinetd,v 1.2 2004/08/14 13:41:20 swegener Exp $
+# description: The netkit ftp daemon with optional SSL support.
+
+service ftp
+{
+	socket_type		= stream
+	protocol		= tcp
+	wait			= no
+	user			= root
+	server			= /usr/bin/ftpd
+	disable			= yes
+}
diff --git a/net-ftp/ftpd/files/ftpd-0.17+ssl-0.3-overflowpatch.diff b/net-ftp/ftpd/files/ftpd-0.17+ssl-0.3-overflowpatch.diff
new file mode 100644
index 000000000..6290079a7
--- /dev/null
+++ b/net-ftp/ftpd/files/ftpd-0.17+ssl-0.3-overflowpatch.diff
@@ -0,0 +1,14 @@
+--- linux-ftpd-0.17/ftpd/ftpd.c	2005-11-05 17:04:53.000000000 -0600
++++ linux-ftpd-0.17-patched/ftpd/ftpd.c	2005-11-05 17:11:54.000000000 -0600
+@@ -2082,9 +2082,9 @@
+ 	va_start(ap);
+ #endif
+ #ifdef USE_SSL
+-        /* assemble the output into a buffer */
++        /* assemble the output into a buffer, checking for length*/
+ 	sprintf(outputbuf,"%d ",n);
+-	vsprintf(outputbuf+strlen(outputbuf),fmt,ap);
++	vsnprintf(outputbuf+strlen(outputbuf),2048-(strlen(outputbuf) + 3),fmt,ap);
+ 	strcat(outputbuf,"\r\n");
+ 
+ 	if (ssl_debug_flag)
diff --git a/net-ftp/ftpd/files/ftpd-0.17-gcc41.patch b/net-ftp/ftpd/files/ftpd-0.17-gcc41.patch
new file mode 100644
index 000000000..11a0ae2cb
--- /dev/null
+++ b/net-ftp/ftpd/files/ftpd-0.17-gcc41.patch
@@ -0,0 +1,33 @@
+diff -ur linux-ftpd-0.17-orig/ftpd/ftpcmd.y linux-ftpd-0.17/ftpd/ftpcmd.y
+--- linux-ftpd-0.17-orig/ftpd/ftpcmd.y	2006-06-06 15:00:29.000000000 +0200
++++ linux-ftpd-0.17/ftpd/ftpcmd.y	2006-06-06 15:23:10.000000000 +0200
+@@ -125,7 +125,14 @@
+ char	cbuf[512];
+ char	*fromname;
+ 
+-struct tab;
++struct tab {
++	const char	*name;
++	short	token;
++	short	state;
++	short	implemented;	/* 1 if command is implemented */
++	const char	*help;
++};
++
+ static int	 yylex __P((void));
+ static void	 sizecmd __P((char *));
+ static void	 help __P((struct tab *, char *));
+@@ -891,13 +898,6 @@
+ #define	SITECMD	7	/* SITE command */
+ #define	NSTR	8	/* Number followed by a string */
+ 
+-struct tab {
+-	const char	*name;
+-	short	token;
+-	short	state;
+-	short	implemented;	/* 1 if command is implemented */
+-	const char	*help;
+-};
+ 
+ struct tab cmdtab[] = {		/* In order defined in RFC 765 */
+         { "AUTH", AUTH, STR1, 1,	"<sp> auth_type" },
diff --git a/net-ftp/ftpd/files/ftpd-0.17-shadowfix.patch b/net-ftp/ftpd/files/ftpd-0.17-shadowfix.patch
new file mode 100644
index 000000000..1287a6fcd
--- /dev/null
+++ b/net-ftp/ftpd/files/ftpd-0.17-shadowfix.patch
@@ -0,0 +1,30 @@
+diff -Naur linux-ftpd-0.17/ftpd/Makefile linux-ftpd-0.17-patched/ftpd/Makefile
+--- linux-ftpd-0.17/ftpd/Makefile	1999-12-12 19:04:58.000000000 +0100
++++ linux-ftpd-0.17-patched/ftpd/Makefile	2003-04-06 11:52:17.000000000 +0200
+@@ -19,7 +19,11 @@
+ all: ftpd
+ 
+ %.o: %.c
++ ifdef USE_SHADOW
++	$(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c
++ else
+ 	$(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c
++ endif
+ 
+ ftpcmd.c: %.c: %.y
+ 	$(YACC) $<
+diff -Naur linux-ftpd-0.17/support/Makefile linux-ftpd-0.17-patched/support/Makefile
+--- linux-ftpd-0.17/support/Makefile	1999-08-01 00:05:52.000000000 +0200
++++ linux-ftpd-0.17-patched/support/Makefile	2003-04-06 11:54:50.000000000 +0200
+@@ -5,7 +5,11 @@
+ all: libsupport.a
+ 
+ %.o: %.c
++ ifdef USE_SHADOW
++	$(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c
++ else
+ 	$(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c
++ endif
+ 
+ libsupport.a: $(OBJS)
+ 	ar -cruv $@ $^
diff --git a/net-ftp/ftpd/ftpd-0.17-r3.ebuild b/net-ftp/ftpd/ftpd-0.17-r3.ebuild
new file mode 100644
index 000000000..0ce341dcb
--- /dev/null
+++ b/net-ftp/ftpd/ftpd-0.17-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r3.ebuild,v 1.5 2005/11/11 15:43:40 blubb Exp $
+
+inherit eutils ssl-cert
+
+IUSE="ssl"
+
+S=${WORKDIR}/linux-${P}
+DESCRIPTION="The netkit FTP server with optional SSL support"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz
+		mirror://gentoo/linux-${P}-ssl.patch"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}
+	virtual/inetd"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use ssl; then
+		epatch ${DISTDIR}/linux-${P}-ssl.patch
+	fi
+	epatch ${FILESDIR}/${P}-shadowfix.patch
+
+	# fixes gcc 4.1 compatibility
+	epatch ${FILESDIR}/${P}-gcc41.patch
+}
+
+src_compile() {
+	./configure --prefix=/usr || die "configure failed"
+	cp MCONFIG MCONFIG.orig
+	sed -e "s:-pipe -O2:${CFLAGS}:" MCONFIG.orig > MCONFIG
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	dobin ftpd/ftpd
+	doman ftpd/ftpd.8
+	dodoc README ChangeLog
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/ftp.xinetd ftp
+	if use ssl;
+	then
+		insinto /etc/ssl/certs/
+		docert ftpd
+	fi
+}
+
+pkg_postinst() {
+	if use ssl;
+	then
+		einfo "In order to start the server with SSL support"
+		einfo "You need a certificate /etc/ssl/certs/ftpd.pem."
+		einfo "A temporary certificiate has been created."
+	fi
+}