]>
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 | |
c6226f44 | 3 | @@ -52,7 +52,7 @@ |
5e32873f | 4 | # If you want to specify $mydom1 and $mydom2 manually you should edit the |
5 | # next two lines to customize for your domain. This will allow your domain | |
6 | # to be separated in the domain listing. | |
7 | -# $mydom1 = "debian"; | |
8 | +# $mydom1 = "pld"; | |
9 | # $mydom2 = "org"; | |
10 | ||
11 | # edit the next line to customize for your default log file | |
7b7692b8 ER |
12 | --- proftpd-1.3.0/include/default_paths.h~ 2006-04-29 14:05:26.906490255 +0300 |
13 | +++ proftpd-1.3.0/include/default_paths.h 2006-04-29 14:06:53.778425641 +0300 | |
14 | @@ -57,7 +57,7 @@ | |
5e32873f | 15 | * overriden at runtime with the '-c' switch |
16 | */ | |
7b7692b8 ER |
17 | #ifndef PR_CONFIG_FILE_PATH |
18 | -# define PR_CONFIG_FILE_PATH "/etc/proftpd.conf" | |
19 | +# define PR_CONFIG_FILE_PATH "/etc/ftpd/proftpd.conf" | |
5e32873f | 20 | #endif |
21 | ||
22 | /* The location of your `shells' file; a newline delimited list of | |
cf16444b | 23 | @@ -84,7 +84,7 @@ |
5e32873f | 24 | * services (odd, eh?) |
25 | */ | |
cf16444b AM |
26 | #ifndef PR_FTPUSERS_PATH |
27 | -# define PR_FTPUSERS_PATH "/etc/ftpusers" | |
28 | +# define PR_FTPUSERS_PATH "/etc/ftpd/ftpusers" | |
29 | #endif | |
5e32873f | 30 | |
31 | #endif /* PROFTPD_PATHS_H */ | |
f29b09f2 JR |
32 | --- proftpd-1.3.3b/configure.in~ 2010-09-15 11:59:14.956175001 +0200 |
33 | +++ proftpd-1.3.3b/configure.in 2010-09-15 12:05:20.368863997 +0200 | |
cf16444b | 34 | @@ -3832,7 +3832,7 @@ locale_dir="`eval echo ${localedir}`" |
f29b09f2 | 35 | locale_dir="`eval echo ${locale_dir}`" |
cf16444b | 36 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) |
f29b09f2 | 37 | |
cf16444b AM |
38 | -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) |
39 | +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`", [Define the run directory]) | |
40 | AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path]) | |
41 | AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path]) | |
f29b09f2 JR |
42 | |
43 | diff -ur proftpd-1.3.2e/Make.rules.in proftpd-1.3.3b/Make.rules.in | |
44 | --- proftpd-1.3.2e/Make.rules.in 2008-11-19 04:51:38.000000000 +0100 | |
45 | +++ proftpd-1.3.3b/Make.rules.in 2009-11-18 22:48:25.000000000 +0100 | |
46 | @@ -11,6 +11,7 @@ | |
47 | localedir=@localedir@ | |
48 | localstatedir=@localstatedir@ | |
49 | pkgconfigdir=@pkgconfigdir@ | |
50 | +rundir=@localstatedir@/proftpd | |
51 | mandir=@mandir@ | |
52 | ||
53 | AR=@AR@ |