From 3bb482e2599e5458d659442c5774c4d67b9b4a87 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Fri, 6 Jan 2012 15:56:07 +0100
Subject: [PATCH] vsftpd: update to 2.3.5

---
 vsftpd/.md5sum             |  4 ++--
 vsftpd/Pkgfile             |  2 +-
 vsftpd/vsftpd-config.patch | 32 ++++++++++++++++----------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/vsftpd/.md5sum b/vsftpd/.md5sum
index bca75fa60..100c8f278 100644
--- a/vsftpd/.md5sum
+++ b/vsftpd/.md5sum
@@ -1,3 +1,3 @@
 7f5bb0bcd0f3a54673157aaaee6f6c30  vsftpd
-2ea5d19978710527bb7444d93b67767a  vsftpd-2.3.4.tar.gz
-af40b87797bab83d080a2a2328f02e05  vsftpd-config.patch
+01398a5bef8e85b6cf2c213a4b011eca  vsftpd-2.3.5.tar.gz
+6fdedb51829177ff236e06f5948b95d3  vsftpd-config.patch
diff --git a/vsftpd/Pkgfile b/vsftpd/Pkgfile
index 5662c4d38..49c4ae8e8 100644
--- a/vsftpd/Pkgfile
+++ b/vsftpd/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  openssl libcap tcp_wrappers
 
 name=vsftpd
-version=2.3.4
+version=2.3.5
 release=1
 source=(https://security.appspot.com/downloads/$name-$version.tar.gz \
         $name-config.patch vsftpd)
diff --git a/vsftpd/vsftpd-config.patch b/vsftpd/vsftpd-config.patch
index 8d739d523..52e2b381e 100644
--- a/vsftpd/vsftpd-config.patch
+++ b/vsftpd/vsftpd-config.patch
@@ -1,6 +1,6 @@
-diff -Nru vsftpd-2.3.2.orig/Makefile vsftpd-2.3.2/Makefile
---- vsftpd-2.3.2.orig/Makefile	2010-08-28 15:38:07.032912301 +0200
-+++ vsftpd-2.3.2/Makefile	2010-08-28 15:38:23.114141478 +0200
+diff -Nru vsftpd-2.3.5.orig/Makefile vsftpd-2.3.5/Makefile
+--- vsftpd-2.3.5.orig/Makefile	2012-01-06 10:46:09.698823473 +0100
++++ vsftpd-2.3.5/Makefile	2012-01-06 10:46:22.908340697 +0100
 @@ -3,7 +3,7 @@
  INSTALL	=	install
  IFLAGS  = -idirafter dummyinc
@@ -36,9 +36,9 @@ diff -Nru vsftpd-2.3.2.orig/Makefile vsftpd-2.3.2/Makefile
  
  clean:
  	rm -f *.o *.swp vsftpd
-diff -Nru vsftpd-2.3.2.orig/builddefs.h vsftpd-2.3.2/builddefs.h
---- vsftpd-2.3.2.orig/builddefs.h	2010-08-28 15:38:07.032912301 +0200
-+++ vsftpd-2.3.2/builddefs.h	2010-08-28 15:38:23.114141478 +0200
+diff -Nru vsftpd-2.3.5.orig/builddefs.h vsftpd-2.3.5/builddefs.h
+--- vsftpd-2.3.5.orig/builddefs.h	2012-01-06 10:46:09.698823473 +0100
++++ vsftpd-2.3.5/builddefs.h	2012-01-06 10:46:22.908340697 +0100
 @@ -1,9 +1,9 @@
  #ifndef VSF_BUILDDEFS_H
  #define VSF_BUILDDEFS_H
@@ -52,9 +52,9 @@ diff -Nru vsftpd-2.3.2.orig/builddefs.h vsftpd-2.3.2/builddefs.h
  
  #endif /* VSF_BUILDDEFS_H */
  
-diff -Nru vsftpd-2.3.2.orig/tunables.c vsftpd-2.3.2/tunables.c
---- vsftpd-2.3.2.orig/tunables.c	2010-08-28 15:38:07.082917253 +0200
-+++ vsftpd-2.3.2/tunables.c	2010-08-28 15:38:23.114141478 +0200
+diff -Nru vsftpd-2.3.5.orig/tunables.c vsftpd-2.3.5/tunables.c
+--- vsftpd-2.3.5.orig/tunables.c	2012-01-06 10:46:09.698823473 +0100
++++ vsftpd-2.3.5/tunables.c	2012-01-06 10:46:22.908340697 +0100
 @@ -250,7 +250,7 @@
    /* -rw------- */
    tunable_chown_upload_mode = 0600;
@@ -78,9 +78,9 @@ diff -Nru vsftpd-2.3.2.orig/tunables.c vsftpd-2.3.2/tunables.c
    install_str_setting(0, &tunable_dsa_private_key_file);
    install_str_setting(0, &tunable_ca_certs_file);
  }
-diff -Nru vsftpd-2.3.2.orig/vsftpd.conf vsftpd-2.3.2/vsftpd.conf
---- vsftpd-2.3.2.orig/vsftpd.conf	2010-08-28 15:38:07.082917253 +0200
-+++ vsftpd-2.3.2/vsftpd.conf	2010-08-28 15:38:23.114141478 +0200
+diff -Nru vsftpd-2.3.5.orig/vsftpd.conf vsftpd-2.3.5/vsftpd.conf
+--- vsftpd-2.3.5.orig/vsftpd.conf	2012-01-06 10:46:09.698823473 +0100
++++ vsftpd-2.3.5/vsftpd.conf	2012-01-06 10:46:22.908340697 +0100
 @@ -8,11 +8,21 @@
  # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
  # capabilities.
@@ -103,7 +103,7 @@ diff -Nru vsftpd-2.3.2.orig/vsftpd.conf vsftpd-2.3.2/vsftpd.conf
  #
  # Uncomment this to enable any form of FTP write command.
  #write_enable=YES
-@@ -107,6 +117,7 @@
+@@ -110,6 +120,7 @@
  # listens on IPv4 sockets. This directive cannot be used in conjunction
  # with the listen_ipv6 directive.
  listen=YES
@@ -111,9 +111,9 @@ diff -Nru vsftpd-2.3.2.orig/vsftpd.conf vsftpd-2.3.2/vsftpd.conf
  #
  # This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
  # sockets, you must run two copies of vsftpd with two configuration files.
-diff -Nru vsftpd-2.3.2.orig/vsftpd.conf.5 vsftpd-2.3.2/vsftpd.conf.5
---- vsftpd-2.3.2.orig/vsftpd.conf.5	2010-08-28 15:38:07.082917253 +0200
-+++ vsftpd-2.3.2/vsftpd.conf.5	2010-08-28 15:38:23.114141478 +0200
+diff -Nru vsftpd-2.3.5.orig/vsftpd.conf.5 vsftpd-2.3.5/vsftpd.conf.5
+--- vsftpd-2.3.5.orig/vsftpd.conf.5	2012-01-06 10:46:09.698823473 +0100
++++ vsftpd-2.3.5/vsftpd.conf.5	2012-01-06 10:46:22.908340697 +0100
 @@ -955,21 +955,21 @@
  This option specifies the location of the RSA certificate to use for SSL
  encrypted connections.