1 diff -Nru vsftpd-2.0.5.orig/Makefile vsftpd-2.0.5/Makefile
2 --- vsftpd-2.0.5.orig/Makefile 2006-07-04 08:34:30.000000000 +0200
3 +++ vsftpd-2.0.5/Makefile 2006-07-04 08:34:48.000000000 +0200
4 @@ -3,7 +3,7 @@
5 INSTALL = install
6 IFLAGS = -idirafter dummyinc
7 #CFLAGS = -g
8 -CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
9 +CFLAGS += -Wall -W -Wshadow #-pedantic -Werror -Wconversion
10
11 LIBS = `./vsf_findlibs.sh`
12 LINK = -Wl,-s
13 @@ -24,21 +24,10 @@
14 $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
15
16 install:
17 - if [ -x /usr/local/sbin ]; then \
18 - $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
19 - else \
20 - $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
21 - if [ -x /usr/local/man ]; then \
22 - $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
23 - $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
24 - elif [ -x /usr/share/man ]; then \
25 - $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
26 - $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
27 - else \
28 - $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
29 - $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
30 - if [ -x /etc/xinetd.d ]; then \
31 - $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
32 + $(INSTALL) -D -m 755 vsftpd $(DESTDIR)/usr/sbin/vsftpd
33 + $(INSTALL) -D -m 644 vsftpd.8 $(DESTDIR)/usr/man/man8/vsftpd.8
34 + $(INSTALL) -D -m 644 vsftpd.conf.5 $(DESTDIR)/usr/man/man5/vsftpd.conf.5
35 + $(INSTALL) -D -m 600 vsftpd.conf $(DESTDIR)/etc/vsftpd.conf
36
37 clean:
38 rm -f *.o *.swp vsftpd
39 diff -Nru vsftpd-2.0.5.orig/builddefs.h vsftpd-2.0.5/builddefs.h
40 --- vsftpd-2.0.5.orig/builddefs.h 2006-07-04 08:34:30.000000000 +0200
41 +++ vsftpd-2.0.5/builddefs.h 2006-07-04 08:34:48.000000000 +0200
42 @@ -1,9 +1,9 @@
43 #ifndef VSF_BUILDDEFS_H
44 #define VSF_BUILDDEFS_H
45
46 -#undef VSF_BUILD_TCPWRAPPERS
47 -#define VSF_BUILD_PAM
48 -#undef VSF_BUILD_SSL
49 +#define VSF_BUILD_TCPWRAPPERS
50 +#undef VSF_BUILD_PAM
51 +#define VSF_BUILD_SSL
52
53 #endif /* VSF_BUILDDEFS_H */
54
55 diff -Nru vsftpd-2.0.5.orig/tunables.c vsftpd-2.0.5/tunables.c
56 --- vsftpd-2.0.5.orig/tunables.c 2006-07-04 08:34:30.000000000 +0200
57 +++ vsftpd-2.0.5/tunables.c 2006-07-04 08:42:45.000000000 +0200
58 @@ -95,7 +95,7 @@
59 unsigned int tunable_delay_successful_login = 0;
60 unsigned int tunable_max_login_fails = 3;
61
62 -const char* tunable_secure_chroot_dir = "/usr/share/empty";
63 +const char* tunable_secure_chroot_dir = "/var/empty";
64 const char* tunable_ftp_username = "ftp";
65 const char* tunable_chown_username = "root";
66 const char* tunable_xferlog_file = "/var/log/xferlog";
67 @@ -120,9 +120,9 @@
68 const char* tunable_deny_file = 0;
69 const char* tunable_user_sub_token = 0;
70 const char* tunable_email_password_file = "/etc/vsftpd.email_passwords";
71 -const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem";
72 +const char* tunable_rsa_cert_file = "/etc/ssl/certs/vsftpd.crt";
73 const char* tunable_dsa_cert_file = 0;
74 const char* tunable_ssl_ciphers = "DES-CBC3-SHA";
75 -const char* tunable_rsa_private_key_file = 0;
76 +const char* tunable_rsa_private_key_file = "/etc/ssl/keys/vsftpd.key";
77 const char* tunable_dsa_private_key_file = 0;
78
79 diff -Nru vsftpd-2.0.5.orig/vsftpd.conf vsftpd-2.0.5/vsftpd.conf
80 --- vsftpd-2.0.5.orig/vsftpd.conf 2006-07-04 08:34:30.000000000 +0200
81 +++ vsftpd-2.0.5/vsftpd.conf 2006-07-04 08:39:27.000000000 +0200
82 @@ -8,11 +8,25 @@
83 # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
84 # capabilities.
85 #
86 +#
87 +# Run standalone
88 +listen=YES
89 +background=YES
90 +#
91 +# Use tcp_wrappers library
92 +tcp_wrappers=YES
93 +#
94 +# Enable SSL support
95 +#ssl_enable=YES
96 +#ssl_sslv3=YES
97 +#
98 # Allow anonymous FTP? (Beware - allowed by default if you comment this out).
99 anonymous_enable=YES
100 #
101 # Uncomment this to allow local users to log in.
102 #local_enable=YES
103 +#force_local_logins_ssl=YES
104 +#force_local_data_ssl=YES
105 #
106 # Uncomment this to enable any form of FTP write command.
107 #write_enable=YES
108 diff -Nru vsftpd-2.0.5.orig/vsftpd.conf.5 vsftpd-2.0.5/vsftpd.conf.5
109 --- vsftpd-2.0.5.orig/vsftpd.conf.5 2006-07-04 08:34:30.000000000 +0200
110 +++ vsftpd-2.0.5/vsftpd.conf.5 2006-07-04 08:44:07.000000000 +0200
111 @@ -863,21 +863,21 @@
112 This option specifies the location of the RSA certificate to use for SSL
113 encrypted connections.
114
115 -Default: /usr/share/ssl/certs/vsftpd.pem
116 +Default: /etc/ssl/certs/vsftpd.crt
117 .TP
118 .B rsa_private_key_file
119 This option specifies the location of the RSA private key to use for SSL
120 encrypted connections. If this option is not set, the private key is expected
121 to be in the same file as the certificate.
122
123 -Default: (none)
124 +Default: /etc/ssl/keys/vsftpd.key
125 .TP
126 .B secure_chroot_dir
127 This option should be the name of a directory which is empty. Also, the
128 directory should not be writable by the ftp user. This directory is used
129 as a secure chroot() jail at times vsftpd does not require filesystem access.
130
131 -Default: /usr/share/empty
132 +Default: /var/empty
133 .TP
134 .B ssl_ciphers
135 This option can be used to select which SSL ciphers vsftpd will allow for
|
