Also add a patch from Debian to fix uclibc build, bug #241720

(Portage version: 2.1.6.3/cvs/Linux 2.6.27-gentoo-r7 i686)

4 files changed, 29 insertions, 24 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 1898d5990a68..3af360c9aab9 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.102 2008/12/26 16:50:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.103 2008/12/26 16:56:36 armin76 Exp $
+
+  26 Dec 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/vsftpd-2.0.5-anon-upload-umask.patch,
+  +files/vsftpd-2.0.7-uclibc.patch, vsftpd-2.0.7-r1.ebuild:
+  Also add a patch from Debian to fix uclibc build, bug #241720
 
 *vsftpd-2.0.7-r1 (26 Dec 2008)
 
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.5-anon-upload-umask.patch b/net-ftp/vsftpd/files/vsftpd-2.0.5-anon-upload-umask.patch
deleted file mode 100644
index 223744b8f58e..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.0.5-anon-upload-umask.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Bruno Cornec <Bruno.Cornec@hp.com>
-To: 269193@bugs.debian.org
-Subject: Proposal of patch
-Date: Wed, 2 May 2007 19:51:49 +0200
-
-Hello,
-
-I'm not a Debian contributer, but a Mandriva one.
-Here is the patch I made for the Mandriva cooker package.
-Maybe it could be useful, or at least serve as a base for discussion:
-
---- vsftpd-2.0.5/postlogin.c.orig       2007-05-02 19:43:54.000000000 +0200
-+++ vsftpd-2.0.5/postlogin.c    2007-05-02 19:44:28.000000000 +0200
-@@ -1009,7 +1009,7 @@
-   /* Are we required to chown() this file for security? */
-   if (p_sess->is_anonymous && tunable_chown_uploads)
-   {
--    vsf_sysutil_fchmod(new_file_fd, 0600);
-+    vsf_sysutil_fchmod(new_file_fd, (0777 & ~tunable_anon_umask));
-     if (tunable_one_process_model)
-     {
-       vsf_one_process_chown_upload(p_sess, new_file_fd);
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch b/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch
new file mode 100644
index 000000000000..f59b39573711
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch
@@ -0,0 +1,20 @@
+--- sysutil.c.orig	2008-10-13 10:07:34.000000000 +0200
++++ sysutil.c	2008-10-13 10:08:00.000000000 +0200
+@@ -601,7 +601,7 @@
+ vsf_sysutil_wait_exited_normally(
+   const struct vsf_sysutil_wait_retval* p_waitret)
+ {
+-  return WIFEXITED(p_waitret->exit_status);
++  return WIFEXITED((struct vsf_sysutil_wait_retval *)p_waitret->exit_status);
+ }
+ 
+ int
+@@ -611,7 +611,7 @@
+   {
+     bug("not a normal exit in vsf_sysutil_wait_get_exitcode");
+   }
+-  return WEXITSTATUS(p_waitret->exit_status);
++  return WEXITSTATUS((struct vsf_sysutil_wait_retval *)p_waitret->exit_status);
+ }
+ 
+ void
diff --git a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
index b947cf890141..c3d460d05166 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild,v 1.1 2008/12/26 16:50:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild,v 1.2 2008/12/26 16:56:36 armin76 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -29,6 +29,8 @@ src_unpack() {
 
 	# Patch the source, config and the manpage to use /etc/vsftpd/
 	epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
+	# uclibc fix, from Debian
+	epatch "${FILESDIR}"/${PN}-2.0.7-uclibc.patch
 
 	# Fix building without the libcap
 	epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"