From 473a538edc15c34cce40f93b0f8c9c0eff6a7990e69603fb79d840194ca363cb Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 1 Sep 2014 15:38:56 +0000
Subject: [PATCH] Accepting request 246751 from home:matejcik:branches:network

- force using fork() instead of clone() on s390 - fixes bnc#890469
  * vsftpd-3.0.2-s390.patch

OBS-URL: https://build.opensuse.org/request/show/246751
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=65
---
 vsftpd-3.0.2-s390.patch | 13 +++++++++++++
 vsftpd.changes          |  6 ++++++
 vsftpd.spec             |  3 +++
 3 files changed, 22 insertions(+)
 create mode 100644 vsftpd-3.0.2-s390.patch

diff --git a/vsftpd-3.0.2-s390.patch b/vsftpd-3.0.2-s390.patch
new file mode 100644
index 0000000..9a54233
--- /dev/null
+++ b/vsftpd-3.0.2-s390.patch
@@ -0,0 +1,13 @@
+Index: vsftpd-3.0.2/sysdeputil.c
+===================================================================
+--- vsftpd-3.0.2.orig/sysdeputil.c	2014-08-21 16:12:59.845872489 +0200
++++ vsftpd-3.0.2/sysdeputil.c	2014-08-21 16:14:59.641431931 +0200
+@@ -66,7 +66,7 @@
+ #include <utmpx.h>
+ 
+ /* BEGIN config */
+-#if defined(__linux__)
++#if defined(__linux__) && !defined(__s390__)
+   #include <errno.h>
+   #include <syscall.h>
+   #define VSF_SYSDEP_HAVE_LINUX_CLONE
diff --git a/vsftpd.changes b/vsftpd.changes
index 5c207b0..daaadf5 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 21 14:21:51 UTC 2014 - jmatejek@suse.com
+
+- force using fork() instead of clone() on s390 - fixes bnc#890469
+  * vsftpd-3.0.2-s390.patch
+
 -------------------------------------------------------------------
 Mon May 26 13:13:44 UTC 2014 - tchvatal@suse.com
 
diff --git a/vsftpd.spec b/vsftpd.spec
index 6521ad8..7e800c8 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -56,6 +56,8 @@ Patch15:        vsftpd-enable-dev-log-sendto.patch
 Patch16:        vsftpd-root-squashed-chroot.patch
 #PATCH-FIX-UPSTREAM: bnc#870122
 Patch17:        vsftpd-enable-gettimeofday-sec.patch
+#PATCH-FIX-UPSTREAM: bnc#890469 fix broken syscall on s390
+Patch18:        vsftpd-3.0.2-s390.patch
 BuildRequires:  gpg-offline
 BuildRequires:  libcap-devel
 BuildRequires:  openssl-devel
@@ -97,6 +99,7 @@ tests.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP