X-Git-Url: https://git.tld-linux.org/?p=packages%2Fproftpd.git;a=blobdiff_plain;f=proftpd-paths.patch;h=bcc456f693c2bed459645d26d2a782aa8cf1ee21;hp=39e56cacf84f10eba9d88fd718890ea2801b0f73;hb=47f808846bd5bf603c0d0d10b6b1a6ba99d257e8;hpb=bf81486ead7409875c8e6300d7a386b23f01480a

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index 39e56ca..bcc456f 100644
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -1,7 +1,18 @@
-diff -urNpa proftpd-1.3.6.orig/configure.in proftpd-1.3.6/configure.in
---- proftpd-1.3.6.orig/configure.in	2017-04-10 02:31:02.000000000 +0000
-+++ proftpd-1.3.6/configure.in	2017-12-30 22:51:10.151946983 +0000
-@@ -3832,7 +3832,7 @@ locale_dir="`eval echo ${localedir}`"
+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])
  
@@ -10,9 +21,9 @@ diff -urNpa proftpd-1.3.6.orig/configure.in proftpd-1.3.6/configure.in
  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.6.orig/contrib/xferstats.holger-preiss proftpd-1.3.6/contrib/xferstats.holger-preiss
---- proftpd-1.3.6.orig/contrib/xferstats.holger-preiss	2017-04-10 02:31:02.000000000 +0000
-+++ proftpd-1.3.6/contrib/xferstats.holger-preiss	2017-12-30 22:53:57.686936997 +0000
+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
@@ -22,11 +33,11 @@ diff -urNpa proftpd-1.3.6.orig/contrib/xferstats.holger-preiss proftpd-1.3.6/con
  # $mydom2 = "org";
  
  # edit the next line to customize for your default log file
-diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/default_paths.h
---- proftpd-1.3.6.orig/include/default_paths.h	2017-04-10 02:31:02.000000000 +0000
-+++ proftpd-1.3.6/include/default_paths.h	2017-12-30 22:51:59.526944040 +0000
+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 @@
-  * overriden at runtime with the '-c' switch
+  * overridden at runtime with the '-c' switch
   */
  #ifndef PR_CONFIG_FILE_PATH
 -# define PR_CONFIG_FILE_PATH	"/etc/proftpd.conf"
@@ -34,12 +45,13 @@ diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/def
  #endif
  
  /* The location of your `shells' file; a newline delimited list of
-@@ -78,13 +78,13 @@
- /* Location of the file that tells proftpd to discontinue servicing
+@@ -79,14 +79,14 @@
   * requests.
   */
--#define PR_SHUTMSG_PATH		"/etc/shutmsg"
-+#define PR_SHUTMSG_PATH		"/etc/proftpd/shutmsg"
+ #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?)
@@ -50,14 +62,3 @@ diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/def
  #endif
  
  #endif /* PROFTPD_PATHS_H */
-diff -urNpa proftpd-1.3.6.orig/Make.rules.in proftpd-1.3.6/Make.rules.in
---- proftpd-1.3.6.orig/Make.rules.in	2017-04-10 02:31:02.000000000 +0000
-+++ proftpd-1.3.6/Make.rules.in	2017-12-30 22:51:10.152946983 +0000
-@@ -11,6 +11,7 @@ libexecdir=@libexecdir@
- localedir=@localedir@
- localstatedir=@localstatedir@
- pkgconfigdir=@pkgconfigdir@
-+rundir=@localstatedir@/proftpd
- mandir=@mandir@
- 
- AR=@AR@