From: Stefan Schweizer Date: Tue, 20 Jun 2006 15:53:40 +0000 (+0000) Subject: Gcc41 patch thanks to Piotr Jaroszynski in bug 135713 thanks to... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4257f92f0aadbb233f9e6884d82b8da62da627da;p=gentoo.git Gcc41 patch thanks to Piotr Jaroszynski in bug 135713 thanks to Frank T. Lofaro Jr. , add maintainer-needed metadata.xml Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/net-ftp/ftpd/ChangeLog b/net-ftp/ftpd/ChangeLog index 85b5a2844148..469b3c15a349 100644 --- a/net-ftp/ftpd/ChangeLog +++ b/net-ftp/ftpd/ChangeLog @@ -1,6 +1,12 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.25 2006/06/20 15:53:40 genstef Exp $ + + 20 Jun 2006; Stefan Schweizer + +files/ftpd-0.17-gcc41.patch, +metadata.xml, ftpd-0.17-r3.ebuild: + Gcc41 patch thanks to Piotr Jaroszynski in bug 135713 + thanks to Frank T. Lofaro Jr. , add maintainer-needed + metadata.xml 28 Jan 2006; Simon Stelling ftpd-0.17.ebuild, ftpd-0.17-r1.ebuild, ftpd-0.17-r2.ebuild: diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest index 7629f5cac32e..e42cf4740d1a 100644 --- a/net-ftp/ftpd/Manifest +++ b/net-ftp/ftpd/Manifest @@ -1,13 +1,69 @@ -MD5 9de6d64f475a4dac232d64af74fdd459 ChangeLog 3076 -MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17 131 -MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17-r1 131 -MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17-r2 131 -MD5 d6140676fe7acab811160aa574573e83 files/digest-ftpd-0.17-r3 135 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +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 +AUX ssl.diff.gz 10444 RMD160 ac0476b8da7273b64dca9bf7ce7304261aff0043 SHA1 3547ee476309565da32604e1b5980ab560801258 SHA256 28566addb8271c7d77585019c7da4d853c157d42518652d5c3f450ba6a53ae20 MD5 0630d5a4a420220cc8b912bdad705f6c files/ssl.diff.gz 10444 +RMD160 ac0476b8da7273b64dca9bf7ce7304261aff0043 files/ssl.diff.gz 10444 +SHA256 28566addb8271c7d77585019c7da4d853c157d42518652d5c3f450ba6a53ae20 files/ssl.diff.gz 10444 +DIST ftpd-0.17-ssl.diff.gz 10444 +DIST linux-ftpd-0.17-ssl.patch 36459 +DIST linux-ftpd-0.17.tar.gz 46763 +EBUILD ftpd-0.17-r1.ebuild 1506 RMD160 b83bc52911b0e0a28ed250eec3dc8e7721669423 SHA1 9d38a7e1fce8b328e1e7ca28bac4dba00c6a2d9c SHA256 3d3b32fc9b0ce4437b0521951878115a620e6054826ba1a7da123f63ed05deb2 MD5 1f7d479a8229d7c736b0b9d11027e501 ftpd-0.17-r1.ebuild 1506 +RMD160 b83bc52911b0e0a28ed250eec3dc8e7721669423 ftpd-0.17-r1.ebuild 1506 +SHA256 3d3b32fc9b0ce4437b0521951878115a620e6054826ba1a7da123f63ed05deb2 ftpd-0.17-r1.ebuild 1506 +EBUILD ftpd-0.17-r2.ebuild 1562 RMD160 0214c0622b8c19cb4311210a7a7032f3b67a8847 SHA1 7d710ac93c885a6808b0dd50df38e4489bc615bb SHA256 dae7ca4c726bc6cdd12116dcbca12de887cc23395169ad45cb805acbc432b5fe MD5 0138f8ac1c5a7b92ea739bc6401d61d5 ftpd-0.17-r2.ebuild 1562 -MD5 6f1b18b5fd24237140fc3864f7df7157 ftpd-0.17-r3.ebuild 1405 +RMD160 0214c0622b8c19cb4311210a7a7032f3b67a8847 ftpd-0.17-r2.ebuild 1562 +SHA256 dae7ca4c726bc6cdd12116dcbca12de887cc23395169ad45cb805acbc432b5fe ftpd-0.17-r2.ebuild 1562 +EBUILD ftpd-0.17-r3.ebuild 1471 RMD160 ccc78f31a55ae8b366819b0cf80b84d7589fb668 SHA1 c140cdb8583559f2d29d2ea356e54dd3d7c9ab3c SHA256 9d13e34351b1845a4de5b9d55c70b4e6a1df6870a68c0f019311cf4bce34d4a5 +MD5 09b6a60973d7efdeed923d5485afddd9 ftpd-0.17-r3.ebuild 1471 +RMD160 ccc78f31a55ae8b366819b0cf80b84d7589fb668 ftpd-0.17-r3.ebuild 1471 +SHA256 9d13e34351b1845a4de5b9d55c70b4e6a1df6870a68c0f019311cf4bce34d4a5 ftpd-0.17-r3.ebuild 1471 +EBUILD ftpd-0.17.ebuild 1452 RMD160 0a5218e6075388200b81706631683e91cff78157 SHA1 98401767ee2a14644037c3273da570d09544690d SHA256 c3c9199cd15efdbc89b66d021071186fb0c833969f099ccdaa5e313d9bb04a96 MD5 6138af5c00327fa26f61c2a7bcfee67a ftpd-0.17.ebuild 1452 +RMD160 0a5218e6075388200b81706631683e91cff78157 ftpd-0.17.ebuild 1452 +SHA256 c3c9199cd15efdbc89b66d021071186fb0c833969f099ccdaa5e313d9bb04a96 ftpd-0.17.ebuild 1452 +MISC ChangeLog 3364 RMD160 c0c28114d1f325d83229315b3498ab274b3f242c SHA1 fa93928094e5368e52633876a169f03c86089256 SHA256 2d6fff9c460e173f8b5f6111349b028bd274961ed3b22b773f375ab3d7f27951 +MD5 08fe243dbf5fafb031f8dbc9005f79d3 ChangeLog 3364 +RMD160 c0c28114d1f325d83229315b3498ab274b3f242c ChangeLog 3364 +SHA256 2d6fff9c460e173f8b5f6111349b028bd274961ed3b22b773f375ab3d7f27951 ChangeLog 3364 +MISC metadata.xml 171 RMD160 5a4d3e8a2c9e0358aa437eb0c76569f91b857ef3 SHA1 ebdc031ba92333fa3e0f93e723dbb09334d819d6 SHA256 35e9133d78efd3d08a76e7e7542de5053f7bbf9bd4b8d15a85c3406086aa4ee5 +MD5 097850a9c53cf1e70cecd8b06234b8e4 metadata.xml 171 +RMD160 5a4d3e8a2c9e0358aa437eb0c76569f91b857ef3 metadata.xml 171 +SHA256 35e9133d78efd3d08a76e7e7542de5053f7bbf9bd4b8d15a85c3406086aa4ee5 metadata.xml 171 +MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17 131 +RMD160 12ca406253b702c5c7b1d296c40d898f1f0671c8 files/digest-ftpd-0.17 131 +SHA256 16ab745374835bd48f3816f0df2d9e95090b1481ec21d97236f4e7894beeafbf files/digest-ftpd-0.17 131 +MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17-r1 131 +RMD160 12ca406253b702c5c7b1d296c40d898f1f0671c8 files/digest-ftpd-0.17-r1 131 +SHA256 16ab745374835bd48f3816f0df2d9e95090b1481ec21d97236f4e7894beeafbf files/digest-ftpd-0.17-r1 131 +MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17-r2 131 +RMD160 12ca406253b702c5c7b1d296c40d898f1f0671c8 files/digest-ftpd-0.17-r2 131 +SHA256 16ab745374835bd48f3816f0df2d9e95090b1481ec21d97236f4e7894beeafbf files/digest-ftpd-0.17-r2 131 +MD5 d6140676fe7acab811160aa574573e83 files/digest-ftpd-0.17-r3 135 +RMD160 e2465adda0c7dd17fb92bb10b44c5d2f32040193 files/digest-ftpd-0.17-r3 135 +SHA256 3540ff7d3d95b6f9b2b963b2aab1473cbc41636a0ac6227d6a453589ca0351ab files/digest-ftpd-0.17-r3 135 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEmBn6NJowsmZ/PzARAtkVAJ4oWJEwLVsc0zXQYOMKhA2tUDpRqQCgqBe7 +AY7tzjuTmXltB0EP/Yw+cDA= +=b47w +-----END PGP SIGNATURE----- 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 000000000000..11a0ae2cb6c1 --- /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, " auth_type" }, diff --git a/net-ftp/ftpd/ftpd-0.17-r3.ebuild b/net-ftp/ftpd/ftpd-0.17-r3.ebuild index 8e8246bf78d1..5ce7e3ea6145 100644 --- a/net-ftp/ftpd/ftpd-0.17-r3.ebuild +++ b/net-ftp/ftpd/ftpd-0.17-r3.ebuild @@ -1,33 +1,34 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r3.ebuild,v 1.6 2006/06/20 15:53:40 genstef 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" + mirror://gentoo/linux-${P}-ssl.patch" -SLOT="0" 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} - if use ssl; then - epatch ${DISTDIR}/linux-${P}-ssl.patch - fi - epatch ${FILESDIR}/${P}-shadowfix.patch + 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() { @@ -42,17 +43,15 @@ src_install() { doman ftpd/ftpd.8 dodoc README ChangeLog insinto /etc/xinetd.d - newins ${FILESDIR}/ftp.xinetd ftp - if use ssl; - then + newins "${FILESDIR}/ftp.xinetd" ftp + if use ssl; then insinto /etc/ssl/certs/ docert ftpd fi } pkg_postinst() { - if use ssl; - then + 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." diff --git a/net-ftp/ftpd/metadata.xml b/net-ftp/ftpd/metadata.xml new file mode 100644 index 000000000000..0e9416707c4e --- /dev/null +++ b/net-ftp/ftpd/metadata.xml @@ -0,0 +1,5 @@ + + + +maintainer-needed +