1 diff -urNpa proftpd-1.3.6.orig/configure.in proftpd-1.3.6/configure.in
2 --- proftpd-1.3.6.orig/configure.in 2017-04-10 02:31:02.000000000 +0000
3 +++ proftpd-1.3.6/configure.in 2017-12-30 22:51:10.151946983 +0000
4 @@ -3832,7 +3832,7 @@ locale_dir="`eval echo ${localedir}`"
5 locale_dir="`eval echo ${locale_dir}`"
6 AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory])
8 -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory])
9 +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`", [Define the run directory])
10 AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path])
11 AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path])
13 diff -urNpa proftpd-1.3.6.orig/contrib/xferstats.holger-preiss proftpd-1.3.6/contrib/xferstats.holger-preiss
14 --- proftpd-1.3.6.orig/contrib/xferstats.holger-preiss 2017-04-10 02:31:02.000000000 +0000
15 +++ proftpd-1.3.6/contrib/xferstats.holger-preiss 2017-12-30 22:53:57.686936997 +0000
16 @@ -52,7 +52,7 @@ $mydom1 = pop(@mydom);
17 # If you want to specify $mydom1 and $mydom2 manually you should edit the
18 # next two lines to customize for your domain. This will allow your domain
19 # to be separated in the domain listing.
20 -# $mydom1 = "debian";
21 +# $mydom1 = "tld-linux";
24 # edit the next line to customize for your default log file
25 diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/default_paths.h
26 --- proftpd-1.3.6.orig/include/default_paths.h 2017-04-10 02:31:02.000000000 +0000
27 +++ proftpd-1.3.6/include/default_paths.h 2017-12-30 22:51:59.526944040 +0000
29 * overriden at runtime with the '-c' switch
31 #ifndef PR_CONFIG_FILE_PATH
32 -# define PR_CONFIG_FILE_PATH "/etc/proftpd.conf"
33 +# define PR_CONFIG_FILE_PATH "/etc/proftpd/proftpd.conf"
36 /* The location of your `shells' file; a newline delimited list of
38 /* Location of the file that tells proftpd to discontinue servicing
41 -#define PR_SHUTMSG_PATH "/etc/shutmsg"
42 +#define PR_SHUTMSG_PATH "/etc/proftpd/shutmsg"
44 /* Location of the file containing users that *cannot* use ftp
47 #ifndef PR_FTPUSERS_PATH
48 -# define PR_FTPUSERS_PATH "/etc/ftpusers"
49 +# define PR_FTPUSERS_PATH "/etc/proftpd/ftpusers"
52 #endif /* PROFTPD_PATHS_H */
53 diff -urNpa proftpd-1.3.6.orig/Make.rules.in proftpd-1.3.6/Make.rules.in
54 --- proftpd-1.3.6.orig/Make.rules.in 2017-04-10 02:31:02.000000000 +0000
55 +++ proftpd-1.3.6/Make.rules.in 2017-12-30 22:51:10.152946983 +0000
56 @@ -11,6 +11,7 @@ libexecdir=@libexecdir@
58 localstatedir=@localstatedir@
59 pkgconfigdir=@pkgconfigdir@
60 +rundir=@localstatedir@/proftpd