X-Git-Url: https://git.tld-linux.org/?p=packages%2Fproftpd.git;a=blobdiff_plain;f=proftpd-paths.patch;h=bcc456f693c2bed459645d26d2a782aa8cf1ee21;hp=44d1673792ca495d92094e72c3dd86f5a1b654ae;hb=HEAD;hpb=f252350736aec4730f457eec9b71eda3077f68ca

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index 44d1673..bcc456f 100644
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -1,55 +1,64 @@
-diff -ur proftpd-1.3.5.orig/configure.in proftpd-1.3.5/configure.in
---- proftpd-1.3.5.orig/configure.in	2014-01-17 18:04:19.000000000 +0000
-+++ proftpd-1.3.5/configure.in	2014-06-02 11:03:41.577869556 +0000
-@@ -2970,7 +2970,7 @@
+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}"`")
+ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory])
  
--AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
-+AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`")
- AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
- AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
+-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 -ur proftpd-1.3.5.orig/contrib/xferstats.holger-preiss proftpd-1.3.5/contrib/xferstats.holger-preiss
---- proftpd-1.3.5.orig/contrib/xferstats.holger-preiss	2013-09-17 21:53:59.000000000 +0000
-+++ proftpd-1.3.5/contrib/xferstats.holger-preiss	2014-06-02 11:03:41.576869727 +0000
-@@ -52,7 +52,7 @@
+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";
++# $mydom1 = "tld-linux";
  # $mydom2 = "org";
  
  # edit the next line to customize for your default log file
-diff -ur proftpd-1.3.5.orig/include/default_paths.h proftpd-1.3.5/include/default_paths.h
---- proftpd-1.3.5.orig/include/default_paths.h	2011-05-23 20:35:35.000000000 +0000
-+++ proftpd-1.3.5/include/default_paths.h	2014-06-02 11:03:41.576869727 +0000
-@@ -57,7 +57,7 @@
-  * overriden at runtime with the '-c' switch
+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/ftpd/proftpd.conf"
++# define PR_CONFIG_FILE_PATH	"/etc/proftpd/proftpd.conf"
  #endif
  
  /* The location of your `shells' file; a newline delimited list of
-@@ -80,6 +80,6 @@
+@@ -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?)
   */
--#define PR_FTPUSERS_PATH	"/etc/ftpusers"
-+#define PR_FTPUSERS_PATH	"/etc/ftpd/ftpusers"
+ #ifndef PR_FTPUSERS_PATH
+-# define PR_FTPUSERS_PATH	"/etc/ftpusers"
++# define PR_FTPUSERS_PATH	"/etc/proftpd/ftpusers"
+ #endif
  
  #endif /* PROFTPD_PATHS_H */
-diff -ur proftpd-1.3.5.orig/Make.rules.in proftpd-1.3.5/Make.rules.in
---- proftpd-1.3.5.orig/Make.rules.in	2013-02-06 06:51:04.000000000 +0000
-+++ proftpd-1.3.5/Make.rules.in	2014-06-02 11:03:41.578869373 +0000
-@@ -11,6 +11,7 @@
- localedir=@localedir@
- localstatedir=@localstatedir@
- pkgconfigdir=@pkgconfigdir@
-+rundir=@localstatedir@/proftpd
- mandir=@mandir@
- 
- AR=@AR@