Release 4 (by relup.sh)

[packages/proftpd.git] / proftpd-paths.patch

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index ca1347c5c6aa17669901a1d758b7d4bb3ec14be7..7e914b7d5dc4921a4959050b936d4cc96fe14cdf 100644 (file)
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -1,13 +1,6 @@
-diff -Nur proftpd-1.2.0pre3/contrib/xferstats.holger-preiss proftpd-1.2.0pre3.pld/contrib/xferstats.holger-preiss
 --- proftpd-1.2.0pre3/contrib/xferstats.holger-preiss  Sun Oct 18 04:24:41 1998
 +++ proftpd-1.2.0pre3.pld/contrib/xferstats.holger-preiss      Fri May 28 10:49:08 1999
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/usr/bin/perl
- # ---------------------------------------------------------------------------
- #
- # USAGE: xferstats <options>
-@@ -40,7 +40,7 @@
+@@ -52,7 +52,7 @@
  # 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.
@@ -16,48 +9,45 @@ diff -Nur proftpd-1.2.0pre3/contrib/xferstats.holger-preiss proftpd-1.2.0pre3.pl
  # $mydom2 = "org";
  
  # edit the next line to customize for your default log file
-diff -Nur proftpd-1.2.0pre3/include/default_paths.h proftpd-1.2.0pre3.pld/include/default_paths.h
---- proftpd-1.2.0pre3/include/default_paths.h  Sun Oct 18 04:24:41 1998
-+++ proftpd-1.2.0pre3.pld/include/default_paths.h      Fri May 28 10:47:56 1999
-@@ -30,7 +30,7 @@
-  * ftpcount, ftpwho, etc.
+--- proftpd-1.3.0/include/default_paths.h~     2006-04-29 14:05:26.906490255 +0300
++++ proftpd-1.3.0/include/default_paths.h      2006-04-29 14:06:53.778425641 +0300
+@@ -57,7 +57,7 @@
+  * overridden at runtime with the '-c' switch
   */
- #ifndef RUN_DIR
--#define RUN_DIR                       "/var/run/proftpd"
-+#define RUN_DIR                       "/var/run"
- #endif
- 
- /* The location you wish to place any core files produced as a result of
-@@ -51,7 +51,7 @@
-  * overriden at runtime with the '-c' switch
-  */
- #ifndef CONFIG_FILE_PATH
--#define       CONFIG_FILE_PATH        "/etc/proftpd.conf"
-+#define       CONFIG_FILE_PATH        "/etc/ftpd/proftpd.conf"
+ #ifndef PR_CONFIG_FILE_PATH
+-# define PR_CONFIG_FILE_PATH  "/etc/proftpd.conf"
++# define PR_CONFIG_FILE_PATH  "/etc/ftpd/proftpd.conf"
  #endif
  
  /* The location of your `shells' file; a newline delimited list of
-@@ -75,6 +75,6 @@
- /* Location of the file containing users that *cannot* use ftp
+@@ -84,7 +84,7 @@
   * services (odd, eh?)
   */
--#define FTPUSERS_PATH         "/etc/ftpusers"
-+#define FTPUSERS_PATH         "/etc/ftpd/ftpusers"
+ #ifndef PR_FTPUSERS_PATH
+-# define PR_FTPUSERS_PATH     "/etc/ftpusers"
++# define PR_FTPUSERS_PATH     "/etc/ftpd/ftpusers"
+ #endif
  
  #endif /* PROFTPD_PATHS_H */
---- proftpd-1.2.0rc2/configure.in~     Sun Sep 17 07:09:08 2000
-+++ proftpd-1.2.0rc2/configure.in      Sun Sep 17 07:10:35 2000
-@@ -1184,13 +1184,6 @@
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+--- proftpd-1.3.3b/configure.in~       2010-09-15 11:59:14.956175001 +0200
++++ proftpd-1.3.3b/configure.in        2010-09-15 12:05:20.368863997 +0200
+@@ -3832,7 +3832,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])
  
--AC_DEFINE_UNQUOTED(CONFIG_FILE_PATH,
--                      "`eval echo "${sysconfdir}/proftpd.conf"`")
--AC_DEFINE_UNQUOTED(PID_FILE_PATH,
--                      "`eval echo "${localstatedir}/proftpd.pid"`")
--AC_DEFINE_UNQUOTED(RUN_DIR,
--                      "`eval echo "${localstatedir}/proftpd"`")
--
- prefix="$pr_saved_prefix"
- exec_prefix="$pr_saved_exec_prefix"
+diff -ur proftpd-1.3.2e/Make.rules.in proftpd-1.3.3b/Make.rules.in
+--- proftpd-1.3.2e/Make.rules.in       2008-11-19 04:51:38.000000000 +0100
++++ proftpd-1.3.3b/Make.rules.in       2009-11-18 22:48:25.000000000 +0100
+@@ -11,6 +11,7 @@
+ localedir=@localedir@
+ localstatedir=@localstatedir@
+ pkgconfigdir=@pkgconfigdir@
++rundir=@localstatedir@/proftpd
+ mandir=@mandir@
  
+ AR=@AR@