- up to 1.3.6c; package locale files

diff --git a/args.patch b/args.patch
deleted file mode 100644 (file)
index d482c3b..0000000
--- a/args.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bcaa485b4edbb4d1283b5d3ccdd0aa1ee02f0ae7 Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Thu, 7 Nov 2019 09:58:00 -0800
-Subject: [PATCH] Issue #863: Make sure we increment our index, for properly
- processing the `FSCachePolicy` directive parameters.  Oops.
-
----
- modules/mod_core.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/modules/mod_core.c b/modules/mod_core.c
-index 1da6b4c80..c12425a1b 100644
---- a/modules/mod_core.c
-+++ b/modules/mod_core.c
-@@ -1450,7 +1450,8 @@ MODRET set_fscachepolicy(cmd_rec *cmd) {
-     if (strncasecmp(cmd->argv[i], "size", 5) == 0) {
-       int size;
- 
--      size = atoi(cmd->argv[i++]);
-+      i++;
-+      size = atoi(cmd->argv[i]);
-       if (size < 1) {
-         CONF_ERROR(cmd, "size parameter must be greater than 1");
-       }
-@@ -1460,7 +1461,8 @@ MODRET set_fscachepolicy(cmd_rec *cmd) {
-     } else if (strncasecmp(cmd->argv[i], "maxAge", 7) == 0) {
-       int max_age;
- 
--      max_age = atoi(cmd->argv[i++]);
-+      i++;
-+      max_age = atoi(cmd->argv[i]);
-       if (max_age < 1) {
-         CONF_ERROR(cmd, "maxAge parameter must be greater than 1");
-       }

diff --git a/proftpd.spec b/proftpd.spec
index 2ee71a0d0b19a8effbde241148a35d4c889f02d1..1ac862c1c6822f904ef474ec5f829a24f8cd6b2d 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.6b
+Version:       1.3.6c
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5: 4040f6a6b86173e2a03f4ccdb9b9af6e
+# Source0-md5: 5680a462144e94770d6e5478ffd60254
 # https://github.com/jbenden/mod_clamav
 Source1:       https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-%{mod_clamav_version}.tar.gz
 # Source1-md5: 42e560ec0bd5964e13fad1b2bb7afe21
@@ -49,7 +49,6 @@ Patch0:               %{name}-paths.patch
 Patch1:                %{name}-noautopriv.patch
 Patch2:                %{name}-wtmp.patch
 Patch3:                %{name}-pool.patch
-Patch4:                args.patch
 URL:           http://www.proftpd.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -451,10 +450,9 @@ dodaje hosty do pliku /etc/hosts.deny.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 # mod_clamav
-patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch
+patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch || exit 1
 cp -a mod_clamav-%{mod_clamav_version}/*.{c,h} contrib/
 
 cp -f /usr/share/automake/config.sub .
@@ -573,6 +571,8 @@ rm $RPM_BUILD_ROOT%{_libexecdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
 cp -aL include/* config.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -659,7 +659,7 @@ fi
 %module_scripts mod_tls
 %module_scripts mod_wrap
 
-%files common
+%files common -f %{name}.lang
 %defattr(644,root,root,755)
 %doc sample-configurations/*.conf CREDITS ChangeLog NEWS RELEASE_NOTES
 %doc README.md README.capabilities README.classes README.controls README.IPv6