From ce43389ac49b4d7de09fa63d167f86055e8ff4ab877d9b0d61404e8492b10d0a Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Thu, 7 Sep 2017 14:51:06 +0000
Subject: [PATCH] Add "vsftpd-append-seek-pipe.patch" to allow the FTP server
 to append to a file system pipe. [bsc#1048427]

OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=117
---
 vsftpd-append-seek-pipe.patch | 14 ++++++++++++++
 vsftpd.changes                |  3 +++
 vsftpd.spec                   |  2 ++
 3 files changed, 19 insertions(+)
 create mode 100644 vsftpd-append-seek-pipe.patch

diff --git a/vsftpd-append-seek-pipe.patch b/vsftpd-append-seek-pipe.patch
new file mode 100644
index 0000000..57d9652
--- /dev/null
+++ b/vsftpd-append-seek-pipe.patch
@@ -0,0 +1,14 @@
+Index: vsftpd-3.0.2/sysutil.c
+===================================================================
+--- vsftpd-3.0.2.orig/sysutil.c
++++ vsftpd-3.0.2/sysutil.c
+@@ -490,7 +490,8 @@ vsf_sysutil_lseek_end(const int fd)
+ {
+   filesize_t retval;
+   retval = lseek(fd, 0, SEEK_END);
+-  if (retval < 0)
++  /* Ignore ESPIPE to allow append to fifos */
++  if (retval < 0 && errno != ESPIPE)
+   {
+     die("lseek");
+   }
diff --git a/vsftpd.changes b/vsftpd.changes
index 60520bf..cbcb0ca 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -13,6 +13,9 @@ Thu Sep  7 12:24:26 UTC 2017 - tchvatal@suse.com
   any time zone other than UTC directly violates RFC3659 and leads
   FTP clients to misinterpret the file's time stamp. [bsc#1024961]
 
+- Add "vsftpd-append-seek-pipe.patch" to allow the FTP server to
+  append to a file system pipe. [bsc#1048427]
+
 -------------------------------------------------------------------
 Wed Jun 14 11:42:26 UTC 2017 - tchvatal@suse.com
 
diff --git a/vsftpd.spec b/vsftpd.spec
index 38d22f4..7f35c30 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -74,6 +74,7 @@ Patch25:        vsftpd-3.0.2-fix-chown-uploads.patch
 Patch26:        vsftpd-3.0.3-build-with-openssl-1.1.patch
 Patch27:        vsftpd-mdtm-in-utc.patch
 Patch28:        vsftpd-die-with-session.patch
+Patch29:        vsftpd-append-seek-pipe.patch
 BuildRequires:  libcap-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  pam-devel
@@ -130,6 +131,7 @@ tests.
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 
 %build
 %define seccomp_opts -D_GNU_SOURCE -DUSE_SECCOMP