From a1f9493c8b918448a51d23db54c90ddc9ff80a29 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 7 Feb 2017 12:34:47 +0000 Subject: [PATCH] - updated to 1.3.5d --- proftpd-paths.patch | 12 ++++++------ proftpd.spec | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proftpd-paths.patch b/proftpd-paths.patch index 44d1673..db4e32b 100644 --- a/proftpd-paths.patch +++ b/proftpd-paths.patch @@ -1,14 +1,14 @@ 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 @@ +@@ -3004,7 +3004,7 @@ 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.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 diff --git a/proftpd.spec b/proftpd.spec index e24d981..2c6e1f6 100644 --- 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 +Version: 1.3.5d 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: bcd2846edf0dad4c4d49a7c8c176d83a # https://github.com/jbenden/mod_clamav Source1: mod_clamav-%{mod_clamav_version}.tar.xz # Source1-md5: 89ec19115d9ea7c7f4e0b0c4551e69bc -- 2.46.0