- up to 1.3.6

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index 57736e0ad648ad1a6a35cf874d19d6993c59d2c8..96899995b9712ee317dd6cfdce2484ddd8eef3d9 100644 (file)
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -20,24 +20,25 @@
  #endif
  
  /* The location of your `shells' file; a newline delimited list of
-@@ -80,6 +80,6 @@
- /* Location of the file containing users that *cannot* use ftp
+@@ -84,7 +84,7 @@
   * 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/ftpd/ftpusers"
+ #endif
  
  #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 @@
+@@ -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}"`")
+ 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.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

diff --git a/proftpd.spec b/proftpd.spec
index 9e842a5700d192a0f1c5c4c2294142af09d6a660..7b51b5670915ded06ff9255ecee523499fe7de6d 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -23,13 +23,13 @@ Summary(pl.UTF-8):  PROfesionalny serwer FTP
 Summary(pt_BR.UTF-8):  Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
 Summary(zh_CN.UTF-8):  易于管理的,安全的 FTP 服务器
 Name:          proftpd
-Version:       1.3.5b
-Release:       4
+Version:       1.3.6
+Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5: f7b8e3a383b34a894c2502db74ccccde
+# Source0-md5: 13270911c42aac842435f18205546a1b
 Source1:       https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-%{mod_clamav_version}.tar.gz
 # Source1-md5: 42e560ec0bd5964e13fad1b2bb7afe21
 Source2:       %{name}.conf
@@ -652,7 +652,7 @@ fi
 %files common
 %defattr(644,root,root,755)
 %doc sample-configurations/*.conf CREDITS ChangeLog NEWS RELEASE_NOTES
-%doc README README.capabilities README.classes README.controls README.IPv6
+%doc README.md README.capabilities README.classes README.controls README.IPv6
 %doc README.modules
 %doc doc/*.html doc/contrib doc/howto doc/modules
 %dir %attr(750,root,ftp) %dir %{_sysconfdir}