← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vsftpd/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/09-s390.patch

  • Committer: Package Import Robot
  • Author(s): Daniel Llewellyn (Bang Communications)
  • Date: 2013-05-08 14:08:53 UTC
  • mfrom: (2.6.1 squeeze)
  • Revision ID: package-import@ubuntu.com-20130508140853-ahhuki963v9fuuns
Tags: 3.0.2-1ubuntu2
https://launchpad.net/bugs/1160372
* debian/patches/13-disable-clone-newpid.patch
  - patch to remove CLONE_NEWPID syscall
    see: https://bugzilla.novell.com/show_bug.cgi?id=786024#c38
    Fixes LP: #1160372

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/09-s390.patch
 
1
Author: Philipp Kern <pkern@debian.org>
 
2
Description: Fix vsftpd on s390 (Closes: #602726).
 
3
 
 
4
diff -Naurp vsftpd.orig/sysdeputil.c vsftpd/sysdeputil.c
 
5
--- vsftpd.orig/sysdeputil.c    2011-09-05 16:03:18.728857644 +0200
 
6
+++ vsftpd/sysdeputil.c 2011-09-05 16:05:12.909423834 +0200
 
7
@@ -64,7 +64,7 @@
 
8
 #include <utmpx.h>
 
9
 
 
10
 /* BEGIN config */
 
11
-#if defined(__linux__)
 
12
+#if defined(__linux__) && !defined(__s390__)
 
13
   #include <errno.h>
 
14
   #include <syscall.h>
 
15
   #define VSF_SYSDEP_HAVE_LINUX_CLONE