From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 19 Mar 2007 01:53:35 +0000 (+0000)
Subject: fix vsftpd build with gcc-4.1.2 (closes: #1475, partially closes: #1460)
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=a7e4453522067eae95ef49bc39594ca89f22b7db;p=packages.git

fix vsftpd build with gcc-4.1.2 (closes: #1475, partially closes: #1460)


git-svn-id: svn://svn.openwrt.org/openwrt/packages@6610 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/vsftpd/patches/005-exit_status_const.patch b/net/vsftpd/patches/005-exit_status_const.patch
new file mode 100644
index 000000000..c368aac2d
--- /dev/null
+++ b/net/vsftpd/patches/005-exit_status_const.patch
@@ -0,0 +1,27 @@
+Fix errors below when built with gcc-4.1.2
+
+sysutil.c: In function 'vsf_sysutil_wait_exited_normally':
+sysutil.c:604: error: assignment of read-only member '__in'
+sysutil.c: In function 'vsf_sysutil_wait_get_exitcode':
+sysutil.c:614: error: assignment of read-only member '__in'
+
+--- vsftpd-2.0.4-old/sysutil.c
++++ vsftpd-2.0.4-new/sysutil.c
+@@ -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