diff --git a/vsftpd-2.3.4-tout.patch b/vsftpd-2.3.4-tout.patch new file mode 100644 index 0000000..82ba294 --- /dev/null +++ b/vsftpd-2.3.4-tout.patch @@ -0,0 +1,15 @@ +--- vsftpd-2.3.4/sysutil.c.tout 2011-06-28 23:12:21.134196123 +0530 ++++ vsftpd-2.3.4/sysutil.c 2011-06-28 23:48:20.622197105 +0530 +@@ -1831,6 +1831,12 @@ vsf_sysutil_connect_timeout(int fd, cons + { + die("getsockopt"); + } ++ ++ if (retval != 0) ++ { ++ errno = retval; ++ retval = -1; ++ } + } + } + if (wait_seconds > 0) diff --git a/vsftpd.spec b/vsftpd.spec index e2ec43c..21391c9 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -2,7 +2,7 @@ Name: vsftpd Version: 2.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Very Secure Ftp Daemon Group: System Environment/Daemons @@ -52,6 +52,7 @@ Patch14: vsftpd-2.2.0-wildchar.patch Patch16: vsftpd-2.2.2-clone.patch Patch17: vsftpd-2.2.2-v6only.patch +Patch18: vsftpd-2.3.4-tout.patch %description vsftpd is a Very Secure FTP daemon. It was written completely from @@ -78,6 +79,7 @@ cp %{SOURCE1} . %patch14 -p1 -b .wildchar %patch16 -p1 -b .clone %patch17 -p1 -b .v6only +%patch18 -p1 -b .tout %build %ifarch s390x sparcv9 sparc64 @@ -142,6 +144,9 @@ fi %changelog +* Wed Feb 16 2011 Jiri Skala - 2.3.4-2 +- fixes #717412 - Connection failures - patched by Takayuki Nagata + * Wed Feb 16 2011 Jiri Skala - 2.3.4-1 - updated to latest upstream 2.3.4