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

- disable ptrace sandbox to fix build on i386

Browse Source
This commit is contained in:
Martin Nagy 2009-01-16 18:14:14 +00:00
parent 3572541ce7
commit a04e00cb31
3 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vsftpd-2.1.0-disable_ptrace.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up vsftpd-2.1.0/ptracesandbox.c.disable_ptrace vsftpd-2.1.0/ptracesandbox.c
--- vsftpd-2.1.0/ptracesandbox.c.disable_ptrace 2009-01-16 19:04:48.000000000 +0100
+++ vsftpd-2.1.0/ptracesandbox.c 2009-01-16 19:04:56.000000000 +0100
@@ -14,7 +14,7 @@
#include "ptracesandbox.h"
-#if defined(__linux__) && defined(__i386__)
+#if defined(__linux__) && defined(__i386__) && 0
#include <sys/mman.h>
#include <sys/prctl.h>

27
vsftpd-2.1.0-warnings.patch
View File

@ -1,7 +1,27 @@
diff -up vsftpd-2.1.0/ptracesandbox.c.warnings vsftpd-2.1.0/ptracesandbox.c
--- vsftpd-2.1.0/ptracesandbox.c.warnings 2009-01-15 15:31:26.000000000 +0100
+++ vsftpd-2.1.0/ptracesandbox.c 2009-01-15 15:32:56.000000000 +0100
@@ -1146,6 +1146,7 @@ int
--- vsftpd-2.1.0/ptracesandbox.c.warnings 2009-01-09 07:20:00.000000000 +0100
+++ vsftpd-2.1.0/ptracesandbox.c 2009-01-16 19:01:27.000000000 +0100
@@ -20,6 +20,7 @@
#include <sys/prctl.h>
#include <sys/ptrace.h>
#include <sys/types.h>
+#include <sys/user.h>
#include <sys/wait.h>
#include <err.h>
#include <errno.h>
@@ -31,10 +32,10 @@
#include <syslog.h>
#include <asm/unistd.h>
-#include <asm/user.h>
/* For the socketcall() multiplex args. */
#include <linux/net.h>
+#include <linux/socket.h>
#ifndef PTRACE_SETOPTIONS
#define PTRACE_SETOPTIONS 0x4200
@@ -1146,6 +1147,7 @@ int
ptrace_sandbox_run_processes(struct pt_sandbox* p_sandbox)
{
(void) p_sandbox;
@ -9,4 +29,3 @@ diff -up vsftpd-2.1.0/ptracesandbox.c.warnings vsftpd-2.1.0/ptracesandbox.c
}
void
diff -up vsftpd-2.1.0/sysdeputil.c.warnings vsftpd-2.1.0/sysdeputil.c

8
vsftpd.spec
View File

@ -2,7 +2,7 @@
Name: vsftpd
Version: 2.1.0
Release: 0.1.pre3%{?dist}
Release: 0.2.pre3%{?dist}
Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons
@ -49,6 +49,8 @@ Patch9: vsftpd-2.1.0-userlist_log.patch
# Sent upstream on 2009-01-16 via email
Patch10: vsftpd-2.1.0-warnings.patch
Patch11: vsftpd-2.1.0-disable_ptrace.patch
%description
vsftpd is a Very Secure FTP daemon. It was written completely from
@ -71,6 +73,7 @@ cp %{SOURCE1} .
%patch8 -p1 -b .greedy
%patch9 -p1 -b .userlist_log
%patch10 -p1 -b .warnings
%patch11 -p1 -b .disable_ptrace
%build
@ -133,6 +136,9 @@ fi
%changelog
* Fri Jan 16 2009 Martin Nagy <mnagy@redhat.com> - 2.1.0-0.2.pre3
- disable ptrace sandbox to fix build on i386
* Fri Jan 16 2009 Martin Nagy <mnagy@redhat.com> - 2.1.0-0.1.pre3
- update to latest upstream release
- cleanup the spec file