Author: bcornec
Date: Wed Feb 7 16:00:52 2007
New Revision: 117181
Added:
packages/cooker/vsftpd/current/SOURCES/vsftpd-2.0.5-pam.patch
Modified:
packages/cooker/vsftpd/current/SPECS/vsftpd.spec
Log:
Add a patch for vsftpd to solve bug #15989, by changing the pam config file
name from ftp to vsftpd
Added: packages/cooker/vsftpd/current/SOURCES/vsftpd-2.0.5-pam.patch
==============================================================================
--- (empty file)
+++ packages/cooker/vsftpd/current/SOURCES/vsftpd-2.0.5-pam.patch Wed Feb
7 16:00:52 2007
@@ -0,0 +1,19 @@
+*** vsftpd-2.0.5/tunables.c.orig 2007-02-07 15:56:05.000000000 +0100
+--- vsftpd-2.0.5/tunables.c 2007-02-07 15:56:43.000000000 +0100
+***************
+*** 105,111 ****
+ const char* tunable_ftpd_banner = 0;
+ const char* tunable_banned_email_file = "/etc/vsftpd/banned_emails";
+ const char* tunable_chroot_list_file = "/etc/vsftpd/chroot_list";
+! const char* tunable_pam_service_name = "ftp";
+ const char* tunable_guest_username = "ftp";
+ const char* tunable_userlist_file = "/etc/vsftpd/user_list";
+ const char* tunable_anon_root = 0;
+--- 105,111 ----
+ const char* tunable_ftpd_banner = 0;
+ const char* tunable_banned_email_file = "/etc/vsftpd/banned_emails";
+ const char* tunable_chroot_list_file = "/etc/vsftpd/chroot_list";
+! const char* tunable_pam_service_name = "vsftpd";
+ const char* tunable_guest_username = "ftp";
+ const char* tunable_userlist_file = "/etc/vsftpd/user_list";
+ const char* tunable_anon_root = 0;
Modified: packages/cooker/vsftpd/current/SPECS/vsftpd.spec
==============================================================================
--- packages/cooker/vsftpd/current/SPECS/vsftpd.spec (original)
+++ packages/cooker/vsftpd/current/SPECS/vsftpd.spec Wed Feb 7 16:00:52 2007
@@ -1,6 +1,6 @@
%define name vsftpd
%define version 2.0.5
-%define rel 2
+%define rel 3
%define release %mkrel %{rel}
Summary: Very Secure File Transfer Protocol Daemon
@@ -31,6 +31,7 @@
Patch11: vsftpd-2.0.1-dir.patch
Patch12: vsftpd-2.0.1-use_localtime.patch
Patch13: vsftpd-1.2.1-nonrootconf.patch
+Patch14: vsftpd-2.0.5-pam.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Requires(pre): rpm-helper
Requires(post): rpm-helper
@@ -64,6 +65,7 @@
%patch11 -p1 -b .dir
%patch12 -p1 -b .use_localtime
%patch13 -p1 -b .nonroot
+%patch14 -p1 -b .pam
%build
