rpms/vsftpd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- syscall(__NR_clone) replaced by clone() to fix incorrect order of params

Browse Source 
on s390 arch
This commit is contained in:
Jiri Skala 2010-05-14 12:19:39 +00:00
parent 2cd5643885
commit a76a17f6ac
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vsftpd-2.2.2-clone.patch Normal file
View File

@ -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)

7
vsftpd.spec
View File

@ -2,7 +2,7 @@
Name: vsftpd Name: vsftpd
Version: 2.2.2 Version: 2.2.2
Release: 5%{?dist} Release: 6%{?dist}
Summary: Very Secure Ftp Daemon Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons Group: System Environment/Daemons
@ -52,6 +52,7 @@ Patch13: vsftpd-2.2.0-openssl.patch
Patch14: vsftpd-2.2.0-wildchar.patch Patch14: vsftpd-2.2.0-wildchar.patch
Patch15: vsftpd-2.2.2-dso.patch Patch15: vsftpd-2.2.2-dso.patch
Patch16: vsftpd-2.2.2-clone.patch
%description %description
vsftpd is a Very Secure FTP daemon. It was written completely from vsftpd is a Very Secure FTP daemon. It was written completely from
@ -78,6 +79,7 @@ cp %{SOURCE1} .
%patch13 -p1 -b .openssl %patch13 -p1 -b .openssl
%patch14 -p1 -b .wildchar %patch14 -p1 -b .wildchar
%patch15 -p1 -b .dso %patch15 -p1 -b .dso
%patch16 -p1 -b .clone
%build %build
%ifarch s390x sparcv9 sparc64 %ifarch s390x sparcv9 sparc64
@ -142,6 +144,9 @@ fi
%changelog %changelog
* Wed 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 * 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 - corrected daemonize_plus patch - don't try kill parent when vsftpd isn't daemonized