diff -urNpa proftpd-1.3.7a.orig/Make.rules.in proftpd-1.3.7a/Make.rules.in --- proftpd-1.3.7a.orig/Make.rules.in 2020-07-21 19:25:51.000000000 +0200 +++ proftpd-1.3.7a/Make.rules.in 2020-08-06 14:07:26.157662616 +0200 @@ -11,6 +11,7 @@ libexecdir=@libexecdir@ localedir=@localedir@ localstatedir=@localstatedir@ pkgconfigdir=@pkgconfigdir@ +rundir=@localstatedir@/proftpd mandir=@mandir@ AR=@AR@ diff -urNpa proftpd-1.3.7a.orig/configure.in proftpd-1.3.7a/configure.in --- proftpd-1.3.7a.orig/configure.in 2020-07-21 19:25:51.000000000 +0200 +++ proftpd-1.3.7a/configure.in 2020-08-06 14:07:26.155662616 +0200 @@ -4058,7 +4058,7 @@ locale_dir="`eval echo ${localedir}`" locale_dir="`eval echo ${locale_dir}`" AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) -AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) +AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`", [Define the run directory]) AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path]) AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path]) diff -urNpa proftpd-1.3.7a.orig/contrib/xferstats.holger-preiss proftpd-1.3.7a/contrib/xferstats.holger-preiss --- proftpd-1.3.7a.orig/contrib/xferstats.holger-preiss 2020-07-21 19:25:51.000000000 +0200 +++ proftpd-1.3.7a/contrib/xferstats.holger-preiss 2020-08-06 14:07:26.156662616 +0200 @@ -52,7 +52,7 @@ $mydom1 = pop(@mydom); # If you want to specify $mydom1 and $mydom2 manually you should edit the # next two lines to customize for your domain. This will allow your domain # to be separated in the domain listing. -# $mydom1 = "debian"; +# $mydom1 = "tld-linux"; # $mydom2 = "org"; # edit the next line to customize for your default log file diff -urNpa proftpd-1.3.7a.orig/include/default_paths.h proftpd-1.3.7a/include/default_paths.h --- proftpd-1.3.7a.orig/include/default_paths.h 2020-07-21 19:25:51.000000000 +0200 +++ proftpd-1.3.7a/include/default_paths.h 2020-08-06 14:08:23.679669474 +0200 @@ -56,7 +56,7 @@ * overridden at runtime with the '-c' switch */ #ifndef PR_CONFIG_FILE_PATH -# define PR_CONFIG_FILE_PATH "/etc/proftpd.conf" +# define PR_CONFIG_FILE_PATH "/etc/proftpd/proftpd.conf" #endif /* The location of your `shells' file; a newline delimited list of @@ -79,14 +79,14 @@ * requests. */ #ifndef PR_SHUTMSG_PATH -# define PR_SHUTMSG_PATH "/etc/shutmsg" +# define PR_SHUTMSG_PATH "/etc/proftpd/shutmsg" #endif /* Location of the file containing users that *cannot* use ftp * services (odd, eh?) */ #ifndef PR_FTPUSERS_PATH -# define PR_FTPUSERS_PATH "/etc/ftpusers" +# define PR_FTPUSERS_PATH "/etc/proftpd/ftpusers" #endif #endif /* PROFTPD_PATHS_H */