]>
Commit | Line | Data |
---|---|---|
5e32873f | 1 | --- proftpd-1.2.0pre3/contrib/xferstats.holger-preiss Sun Oct 18 04:24:41 1998 |
2 | +++ proftpd-1.2.0pre3.pld/contrib/xferstats.holger-preiss Fri May 28 10:49:08 1999 | |
3 | @@ -1,4 +1,4 @@ | |
4 | -#! /usr/bin/perl | |
5 | +#!/usr/bin/perl | |
6 | # --------------------------------------------------------------------------- | |
7 | # | |
8 | # USAGE: xferstats <options> | |
9 | @@ -40,7 +40,7 @@ | |
10 | # If you want to specify $mydom1 and $mydom2 manually you should edit the | |
11 | # next two lines to customize for your domain. This will allow your domain | |
12 | # to be separated in the domain listing. | |
13 | -# $mydom1 = "debian"; | |
14 | +# $mydom1 = "pld"; | |
15 | # $mydom2 = "org"; | |
16 | ||
17 | # edit the next line to customize for your default log file | |
7b7692b8 ER |
18 | --- proftpd-1.3.0/include/default_paths.h~ 2006-04-29 14:05:26.906490255 +0300 |
19 | +++ proftpd-1.3.0/include/default_paths.h 2006-04-29 14:06:53.778425641 +0300 | |
20 | @@ -57,7 +57,7 @@ | |
5e32873f | 21 | * overriden at runtime with the '-c' switch |
22 | */ | |
7b7692b8 ER |
23 | #ifndef PR_CONFIG_FILE_PATH |
24 | -# define PR_CONFIG_FILE_PATH "/etc/proftpd.conf" | |
25 | +# define PR_CONFIG_FILE_PATH "/etc/ftpd/proftpd.conf" | |
5e32873f | 26 | #endif |
27 | ||
28 | /* The location of your `shells' file; a newline delimited list of | |
7b7692b8 | 29 | @@ -80,6 +80,6 @@ |
5e32873f | 30 | /* Location of the file containing users that *cannot* use ftp |
31 | * services (odd, eh?) | |
32 | */ | |
7b7692b8 ER |
33 | -#define PR_FTPUSERS_PATH "/etc/ftpusers" |
34 | +#define PR_FTPUSERS_PATH "/etc/ftpd/ftpusers" | |
5e32873f | 35 | |
36 | #endif /* PROFTPD_PATHS_H */ | |
f29b09f2 JR |
37 | --- proftpd-1.3.3b/configure.in~ 2010-09-15 11:59:14.956175001 +0200 |
38 | +++ proftpd-1.3.3b/configure.in 2010-09-15 12:05:20.368863997 +0200 | |
39 | @@ -2276,7 +2276,7 @@ | |
40 | locale_dir="`eval echo ${locale_dir}`" | |
41 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") | |
42 | ||
43 | -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") | |
44 | +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`") | |
45 | AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") | |
46 | AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") | |
47 | ||
48 | diff -ur proftpd-1.3.2e/Make.rules.in proftpd-1.3.3b/Make.rules.in | |
49 | --- proftpd-1.3.2e/Make.rules.in 2008-11-19 04:51:38.000000000 +0100 | |
50 | +++ proftpd-1.3.3b/Make.rules.in 2009-11-18 22:48:25.000000000 +0100 | |
51 | @@ -11,6 +11,7 @@ | |
52 | localedir=@localedir@ | |
53 | localstatedir=@localstatedir@ | |
54 | pkgconfigdir=@pkgconfigdir@ | |
55 | +rundir=@localstatedir@/proftpd | |
56 | mandir=@mandir@ | |
57 | ||
58 | AR=@AR@ |