- ehh, more cleanup, release 2

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

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index 363216fcc866cf62069625a15eb3c9f89a27e6f3..44d1673792ca495d92094e72c3dd86f5a1b654ae 100644 (file)
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -1,22 +1,30 @@
---- 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 @@
+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 @@
+ locale_dir="`eval echo ${locale_dir}`"
+ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
+ 
+-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"`")
+ 
+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 @@
  # 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 = "pld";
++# $mydom1 = "tld";
  # $mydom2 = "org";
  
  # edit the next line to customize for your default log file
---- 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
+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
   */
@@ -34,20 +42,9 @@
 +#define PR_FTPUSERS_PATH      "/etc/ftpd/ftpusers"
  
  #endif /* PROFTPD_PATHS_H */
---- 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
-@@ -2276,7 +2276,7 @@
- locale_dir="`eval echo ${locale_dir}`"
- AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
- 
--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"`")
- 
-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
+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@