[SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (84e87dc46eaf3f50ac5ee565cbc573b9e6a25f48)

Mathieu Lonjaret scm at sourcemage.org
Tue Nov 25 06:10:38 EST 2008


GIT changes to master grimoire by Mathieu Lonjaret <lejatorn at sourcemage.org>:

 ftp/vsftpd/14863.diff |   20 ++++++++++++++++++++
 ftp/vsftpd/BUILD      |    3 +++
 ftp/vsftpd/HISTORY    |    3 +++
 3 files changed, 26 insertions(+)

New commits:
commit 8e0530fb353f5cb938001e9872acd9717c764a7d
Author: Mathieu Lonjaret <lejatorn at sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn at sourcemage.org>

    vsftpd: fixes bug 14863

diff --git a/ftp/vsftpd/14863.diff b/ftp/vsftpd/14863.diff
new file mode 100644
index 0000000..b2be772
--- /dev/null
+++ b/ftp/vsftpd/14863.diff
@@ -0,0 +1,20 @@
+--- sysutil.c~  2006-09-06 13:29:46.677233758 +0200
++++ sysutil.c   2006-09-06 13:30:43.824611192 +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);
+ }
+ 
+
diff --git a/ftp/vsftpd/BUILD b/ftp/vsftpd/BUILD
index a971901..b070d3a 100755
--- a/ftp/vsftpd/BUILD
+++ b/ftp/vsftpd/BUILD
@@ -1,3 +1,6 @@
+# fixes bug 14863 
+patch -p0 < ${SCRIPT_DIRECTORY}/14863.diff &&
+
 #
 # We don't want to install into /usr/local, so
 # we'll just copy the files correctly
diff --git a/ftp/vsftpd/HISTORY b/ftp/vsftpd/HISTORY
index 9808463..1379705 100644
--- a/ftp/vsftpd/HISTORY
+++ b/ftp/vsftpd/HISTORY
@@ -1,3 +1,6 @@
+2008-11-25 Mathieu Lonjaret <lejatorn at sourcemage.org>
+	* BUILD, 14863.diff: patch to fix bug 14863
+
 2008-08-05 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 2.0.7
 



More information about the SM-Commit mailing list