net-ftp/ftpd gcc41 patch is now in portage :)

svn path=/sunrise/; revision=154

diff --git a/net-ftp/ftpd/ChangeLog b/net-ftp/ftpd/ChangeLog
deleted file mode 100644 (file)
index ceca514..0000000
--- a/net-ftp/ftpd/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 $
-
-  09 Jun 2006; Piotr Jaroszynski <peper@aster.pl> +ftpd-0.17-r4.ebuild:
-  revbump to avoid conflicts with main tree
-
-  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

diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest
deleted file mode 100644 (file)
index 282aea6..0000000
--- a/net-ftp/ftpd/Manifest
+++ /dev/null
@@ -1,29 +0,0 @@
-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-r4.ebuild 1380 RMD160 6a5ee4ff086160e5a65504db3aaa70ae077ed4c6 SHA1 f75bb977bbbdd101d20c5cc1cef7c1dfd96c585f SHA256 1bcb411fd2e71c5356330187a0dd5e05231832415d16b20d529d255eb22143d2
-MD5 39b658b291ffc5403541193dc02d2f4a ftpd-0.17-r4.ebuild 1380
-RMD160 6a5ee4ff086160e5a65504db3aaa70ae077ed4c6 ftpd-0.17-r4.ebuild 1380
-SHA256 1bcb411fd2e71c5356330187a0dd5e05231832415d16b20d529d255eb22143d2 ftpd-0.17-r4.ebuild 1380
-MISC ChangeLog 472 RMD160 858fa05d385aa0315017f0fd5d2415406d000a73 SHA1 a92725b14f558b2a8fd969b06e5d28487e102dfc SHA256 e73bca80c50fb267d16ae5f41ca8d65209f66b96df4c37b8a29093876c60ee3f
-MD5 af43162cafd5858e6abcc8b0562e44bb ChangeLog 472
-RMD160 858fa05d385aa0315017f0fd5d2415406d000a73 ChangeLog 472
-SHA256 e73bca80c50fb267d16ae5f41ca8d65209f66b96df4c37b8a29093876c60ee3f ChangeLog 472
-MD5 23b5566dcb3362b0143bf2c14ac79c5a files/digest-ftpd-0.17-r4 362
-RMD160 8744f4667371faa4fa3200bf4b245ffd815835f0 files/digest-ftpd-0.17-r4 362
-SHA256 dac7c801af6e46ee1a962a99ca593032683ae77ad67daa9dcc6e30026ce68bb7 files/digest-ftpd-0.17-r4 362

diff --git a/net-ftp/ftpd/files/digest-ftpd-0.17-r4 b/net-ftp/ftpd/files/digest-ftpd-0.17-r4
deleted file mode 100644 (file)
index 17484d4..0000000
--- a/net-ftp/ftpd/files/digest-ftpd-0.17-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-RMD160 5a0d7301f69b4c1714f36419f98134f9aa0ce874 linux-ftpd-0.17-ssl.patch 36459
-SHA256 0082ee6a71fdd83f61e63166f7bbba97c204cdc67f9e1bf10f2df31590fba780 linux-ftpd-0.17-ssl.patch 36459
-RMD160 869e410d8f063c764c04f1d3b41b625a9d679d22 linux-ftpd-0.17.tar.gz 46763
-SHA256 65a0b249e38bf3c3a16dbd4d3edd2657683ca8f47b307e92007f378b21d2fa65 linux-ftpd-0.17.tar.gz 46763

diff --git a/net-ftp/ftpd/files/ftp.xinetd b/net-ftp/ftpd/files/ftp.xinetd
deleted file mode 100644 (file)
index 22bca8e..0000000
--- a/net-ftp/ftpd/files/ftp.xinetd
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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
deleted file mode 100644 (file)
index 6290079..0000000
--- a/net-ftp/ftpd/files/ftpd-0.17+ssl-0.3-overflowpatch.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 11a0ae2..0000000
--- a/net-ftp/ftpd/files/ftpd-0.17-gcc41.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644 (file)
index 1287a6f..0000000
--- a/net-ftp/ftpd/files/ftpd-0.17-shadowfix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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-r4.ebuild b/net-ftp/ftpd/ftpd-0.17-r4.ebuild
deleted file mode 100644 (file)
index a8d0c07..0000000
--- a/net-ftp/ftpd/ftpd-0.17-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils ssl-cert
-
-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"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-       virtual/inetd"
-
-S=${WORKDIR}/linux-${P}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       use ssl && epatch "${DISTDIR}/linux-${P}-ssl.patch"
-       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
-}