fix bug #64175 on ppc64

4 files changed, 34 insertions, 27 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index ac84574af93d..f92e2446bf93 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.43 2004/09/24 23:32:59 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.44 2004/09/29 03:11:23 tgall Exp $
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild, 
+  +vsftpd-1.2.2-ppc64.diff:
+  fix bug #64175 for ppc64
 
   25 Sep 2004; Tom Martin <slarti@gentoo.org> vsftpd-2.0.1.ebuild:
   Fixed the epatch line in the ebuild to not include `.bz2' (see jforman's
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 6d439f7463cd..8477b5a1b647 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,33 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8db5a76f69189b1fc1bbbcce8f18e517 vsftpd-1.2.2.ebuild 2238
-MD5 bce1cd62cbe79fc1bcb85e693131f252 vsftpd-2.0.1.ebuild 2341
-MD5 213703fc92069b2036caf192afb39068 vsftpd-1.2.0-r1.ebuild 2218
-MD5 d1a2ec32b0639d78243cc5aee840eb9f vsftpd-1.0.1-r1.ebuild 1325
-MD5 284ab51c778b56a5f4155fbb7eb7492e vsftpd-1.2.1.ebuild 2237
 MD5 7a565507d831da380a5353027d6bb862 ChangeLog 5004
 MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
-MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
-MD5 fd342c037bab05b6fcdd20c0d8fd6720 files/digest-vsftpd-1.2.1 64
-MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
-MD5 2b36bc74604934d6ce3ef5c6b2d77485 files/digest-vsftpd-2.0.1 64
-MD5 e0a15cbbb9ee8ae2099c0b267431f2da files/vsftpd-2.0.1-gentoo.diff 6762
+MD5 d1a2ec32b0639d78243cc5aee840eb9f vsftpd-1.0.1-r1.ebuild 1325
+MD5 213703fc92069b2036caf192afb39068 vsftpd-1.2.0-r1.ebuild 2218
+MD5 284ab51c778b56a5f4155fbb7eb7492e vsftpd-1.2.1.ebuild 2237
+MD5 029215e25600ffd57232a8c8c78eb241 vsftpd-1.2.2.ebuild 2295
+MD5 bce1cd62cbe79fc1bcb85e693131f252 vsftpd-2.0.1.ebuild 2341
 MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
 MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
-MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488
+MD5 fd342c037bab05b6fcdd20c0d8fd6720 files/digest-vsftpd-1.2.1 64
+MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
+MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
+MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
 MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078
-MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
+MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
 MD5 eb057c63bffcf702e1b8d0f9e406b6e5 files/vsftpd.conf 3770
+MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
 MD5 73da8f18451d3c3770c539e5dde163ef files/vsftpd.init.d 979
-MD5 e50b10a57c22f7b27de250b8b65038a0 files/vsftpd.xinetd 468
-MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
-MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
 MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBVK7ECHk4+ZoBpvsRAhenAJ9MhJWxpVB+8MZyn8konvbGmWXE/gCeLQ5/
-oal/iqAk7VDLgqvYPzCbqbw=
-=DKvM
------END PGP SIGNATURE-----
+MD5 e50b10a57c22f7b27de250b8b65038a0 files/vsftpd.xinetd 468
+MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488
+MD5 2b36bc74604934d6ce3ef5c6b2d77485 files/digest-vsftpd-2.0.1 64
+MD5 e0a15cbbb9ee8ae2099c0b267431f2da files/vsftpd-2.0.1-gentoo.diff 6762
+MD5 e0e25ba72aea7fb37f3f66f4ca359a82 files/vsftpd-1.2.2-ppc64.diff 479
diff --git a/net-ftp/vsftpd/files/vsftpd-1.2.2-ppc64.diff b/net-ftp/vsftpd/files/vsftpd-1.2.2-ppc64.diff
new file mode 100644
index 000000000000..ab483fc3bf06
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-1.2.2-ppc64.diff
@@ -0,0 +1,11 @@
+--- sysdeputil.c.orig	2004-09-28 22:08:30.727084224 -0500
++++ sysdeputil.c	2004-09-28 22:08:53.719050328 -0500
+@@ -157,7 +157,7 @@
+ #include <linux/capability.h>
+ #include <errno.h>
+ #include <syscall.h>
+-_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data)
++/* _syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data) */
+ /* Gross HACK to avoid warnings - linux headers overlap glibc headers */
+ #undef __NFDBITS
+ #undef __FDMASK
diff --git a/net-ftp/vsftpd/vsftpd-1.2.2.ebuild b/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
index 0abbcbaf9342..d8ced9dfc6cc 100644
--- a/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-1.2.2.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/vsftpd/vsftpd-1.2.2.ebuild,v 1.8 2004/09/23 04:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.2.ebuild,v 1.9 2004/09/29 03:11:23 tgall Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S} || die
 	epatch ${FILESDIR}/${PN}-1.2.1-gentoo.diff.bz2 || die
 	use tcpd && echo '#define VSF_BUILD_TCPWRAPPERS' >> builddefs.h
+	use ppc64 && epatch ${FILESDIR}/vsftpd-1.2.2-ppc64.diff
 }
 
 src_compile() {