- updated to 1.3.6, build with nls and facls

diff --git a/proftpd-noautopriv.patch b/proftpd-noautopriv.patch
index 9787950436ff342181cec5c534b13cb11384380e..7eac80b42de375f82e130428686c0af6e2d7d813 100644 (file)
--- a/proftpd-noautopriv.patch
+++ b/proftpd-noautopriv.patch
@@ -1,7 +1,7 @@
-diff -ur proftpd-1.3.5.orig/include/log.h proftpd-1.3.5/include/log.h
---- proftpd-1.3.5.orig/include/log.h   2013-10-07 01:29:05.000000000 +0000
-+++ proftpd-1.3.5/include/log.h        2014-06-02 11:06:19.649846522 +0000
-@@ -33,6 +33,7 @@
+diff -urNpa proftpd-1.3.6.orig/include/log.h proftpd-1.3.6/include/log.h
+--- proftpd-1.3.6.orig/include/log.h   2017-04-10 02:31:02.000000000 +0000
++++ proftpd-1.3.6/include/log.h        2017-12-30 22:55:37.846931027 +0000
+@@ -31,6 +31,7 @@
  #ifndef PR_LOG_H
  #define PR_LOG_H
  

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index db4e32b2bd831dbd0517257ecd06cd77f0f05cfe..b50179dbb06f51eecc30064accf5710d24a006e5 100644 (file)
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -1,7 +1,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
-@@ -3004,7 +3004,7 @@
+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}`"
  locale_dir="`eval echo ${locale_dir}`"
  AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory])
  
@@ -10,22 +10,22 @@ diff -ur proftpd-1.3.5.orig/configure.in proftpd-1.3.5/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 -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.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
+@@ -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 @@
+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
+@@ -56,7 +56,7 @@
   * overriden at runtime with the '-c' switch
   */
  #ifndef PR_CONFIG_FILE_PATH
@@ -34,18 +34,26 @@ diff -ur proftpd-1.3.5.orig/include/default_paths.h proftpd-1.3.5/include/defaul
  #endif
  
  /* The location of your `shells' file; a newline delimited list of
-@@ -80,6 +80,6 @@
+@@ -78,13 +78,13 @@
+ /* Location of the file that tells proftpd to discontinue servicing
+  * requests.
+  */
+-#define PR_SHUTMSG_PATH               "/etc/shutmsg"
++#define PR_SHUTMSG_PATH               "/etc/ftpd/shutmsg"
+ 
  /* 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/ftpd/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 @@
+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@

diff --git a/proftpd.spec b/proftpd.spec
index 2c6e1f6aaac26b0433937b45b4b104e90cc0d528..a5f030761204858cc25bbe6b29e4cf5db775aa4b 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.5d
-Release:       1
+Version:       1.3.6
+Release:       0.1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5: bcd2846edf0dad4c4d49a7c8c176d83a
+# Source0-md5: 13270911c42aac842435f18205546a1b
 # https://github.com/jbenden/mod_clamav
 Source1:       mod_clamav-%{mod_clamav_version}.tar.xz
 # Source1-md5: 89ec19115d9ea7c7f4e0b0c4551e69bc
@@ -485,7 +485,9 @@ MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
        --enable-autoshadow \
        --enable-ctrls \
        --enable-dso \
+       --enable-facls \
        %{?with_ipv6:--enable-ipv6} \
+       --enable-nls \
        --enable-sendfile \
        %{!?with_ssl:--disable-tls} \
        --with-shared=$MODARG \
@@ -642,7 +644,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}