From 47beeaef29712a9ebebca6655bde245d625a4648 Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: May 14 2010 12:31:31 +0000
Subject: - syscall(__NR_clone) replaced by clone() to fix incorrect order of params

    on s390 arch

---

diff --git a/vsftpd-2.2.2-clone.patch b/vsftpd-2.2.2-clone.patch
new file mode 100644
index 0000000..b2a275f
--- /dev/null
+++ b/vsftpd-2.2.2-clone.patch
@@ -0,0 +1,21 @@
+diff -up vsftpd-2.2.2/sysdeputil.c.clone vsftpd-2.2.2/sysdeputil.c
+--- vsftpd-2.2.2/sysdeputil.c.clone	2010-05-13 13:26:32.099358732 +0200
++++ vsftpd-2.2.2/sysdeputil.c	2010-05-13 13:26:43.894359985 +0200
+@@ -1279,7 +1279,7 @@ vsf_sysutil_fork_isolate_failok()
+   static int cloneflags_work = 1;
+   if (cloneflags_work)
+   {
+-    int ret = syscall(__NR_clone, CLONE_NEWPID | CLONE_NEWIPC | SIGCHLD, NULL);
++    int ret = clone(NULL, NULL, CLONE_NEWPID | CLONE_NEWIPC | SIGCHLD, NULL);
+     if (ret != -1 || (errno != EINVAL && errno != EPERM))
+     {
+       if (ret == 0)
+@@ -1301,7 +1301,7 @@ vsf_sysutil_fork_newnet()
+   static int cloneflags_work = 1;
+   if (cloneflags_work)
+   {
+-    int ret = syscall(__NR_clone, CLONE_NEWNET | SIGCHLD, NULL);
++    int ret = clone(NULL, NULL, CLONE_NEWNET | SIGCHLD, NULL);
+     if (ret != -1 || (errno != EINVAL && errno != EPERM))
+     {
+       if (ret == 0)
diff --git a/vsftpd.spec b/vsftpd.spec
index f22b860..69abb7d 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -52,6 +52,7 @@ Patch13: vsftpd-2.2.0-openssl.patch
 Patch14: vsftpd-2.2.0-wildchar.patch
 
 Patch15: vsftpd-2.2.2-dso.patch
+Patch16: vsftpd-2.2.2-clone.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -78,6 +79,7 @@ cp %{SOURCE1} .
 %patch13 -p1 -b .openssl
 %patch14 -p1 -b .wildchar
 %patch15 -p1 -b .dso
+%patch16 -p1 -b .clone
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -142,6 +144,9 @@ fi
 
 
 %changelog
+* Fri May 14 2010 Jiri Skala <jskala@redhat.com> - 2.2.2-6
+- syscall(__NR_clone) replaced by clone() to fix incorrect order of params on s390 arch
+
 * Wed Apr 07 2010 Jiri Skala <jskala@redhat.com> - 2.2.2-5
 - corrected daemonize_plus patch - don't try kill parent when vsftpd isn't daemonized