~andreserl/ubuntu/lucid/vsftpd/sru1

« back to all changes in this revision

Viewing changes to debian/patches/06-alpha.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-05 10:01:25 UTC
  • mfrom: (2.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100105100125-y03j29ea115sf09h
Tags: 2.2.2-3ubuntu1
* Merged from debian testing::
  - Use LSB functions in the init script.
  - Use snakeoil SSL certificates and key.
  - Add update-inetd dependency.
  - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8.
    (LP: #364958)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Author: Daniel Baumann <daniel@debian.org>
2
 
Description:
3
 
 Don't define VSF_SYSDEP_HAVE_LINUX_CLONE on alpha to avoid FTBFS
4
 
 (Closes: #540860).
5
 
 
6
 
diff -Naurp vsftpd.orig/sysdeputil.c vsftpd/sysdeputil.c
7
 
--- vsftpd.orig/sysdeputil.c    2009-09-20 16:26:21.000000000 +0000
8
 
+++ vsftpd/sysdeputil.c 2009-09-20 16:27:13.000000000 +0000
9
 
@@ -67,7 +67,9 @@
10
 
 #if defined(__linux__)
11
 
   #include <errno.h>
12
 
   #include <syscall.h>
13
 
+#if !defined(__alpha__)
14
 
   #define VSF_SYSDEP_HAVE_LINUX_CLONE
15
 
+#endif
16
 
   #include <sched.h>
17
 
   #ifndef CLONE_NEWPID
18
 
     #define CLONE_NEWPID 0x20000000