From 47f808846bd5bf603c0d0d10b6b1a6ba99d257e8 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 6 Aug 2020 14:18:12 +0200 Subject: [PATCH] - updated to 1.3.7a --- proftpd-paths.patch | 53 +++++++++++++++++++++++---------------------- proftpd.spec | 8 +++---- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/proftpd-paths.patch b/proftpd-paths.patch index 39e56ca..bcc456f 100644 --- a/proftpd-paths.patch +++ b/proftpd-paths.patch @@ -1,7 +1,18 @@ -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}`" +diff -urNpa proftpd-1.3.7a.orig/Make.rules.in proftpd-1.3.7a/Make.rules.in +--- proftpd-1.3.7a.orig/Make.rules.in 2020-07-21 19:25:51.000000000 +0200 ++++ proftpd-1.3.7a/Make.rules.in 2020-08-06 14:07:26.157662616 +0200 +@@ -11,6 +11,7 @@ libexecdir=@libexecdir@ + localedir=@localedir@ + localstatedir=@localstatedir@ + pkgconfigdir=@pkgconfigdir@ ++rundir=@localstatedir@/proftpd + mandir=@mandir@ + + AR=@AR@ +diff -urNpa proftpd-1.3.7a.orig/configure.in proftpd-1.3.7a/configure.in +--- proftpd-1.3.7a.orig/configure.in 2020-07-21 19:25:51.000000000 +0200 ++++ proftpd-1.3.7a/configure.in 2020-08-06 14:07:26.155662616 +0200 +@@ -4058,7 +4058,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,9 +21,9 @@ diff -urNpa proftpd-1.3.6.orig/configure.in proftpd-1.3.6/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 -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 +diff -urNpa proftpd-1.3.7a.orig/contrib/xferstats.holger-preiss proftpd-1.3.7a/contrib/xferstats.holger-preiss +--- proftpd-1.3.7a.orig/contrib/xferstats.holger-preiss 2020-07-21 19:25:51.000000000 +0200 ++++ proftpd-1.3.7a/contrib/xferstats.holger-preiss 2020-08-06 14:07:26.156662616 +0200 @@ -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 @@ -22,11 +33,11 @@ diff -urNpa proftpd-1.3.6.orig/contrib/xferstats.holger-preiss proftpd-1.3.6/con # $mydom2 = "org"; # edit the next line to customize for your default log file -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 +diff -urNpa proftpd-1.3.7a.orig/include/default_paths.h proftpd-1.3.7a/include/default_paths.h +--- proftpd-1.3.7a.orig/include/default_paths.h 2020-07-21 19:25:51.000000000 +0200 ++++ proftpd-1.3.7a/include/default_paths.h 2020-08-06 14:08:23.679669474 +0200 @@ -56,7 +56,7 @@ - * overriden at runtime with the '-c' switch + * overridden at runtime with the '-c' switch */ #ifndef PR_CONFIG_FILE_PATH -# define PR_CONFIG_FILE_PATH "/etc/proftpd.conf" @@ -34,12 +45,13 @@ diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/def #endif /* The location of your `shells' file; a newline delimited list of -@@ -78,13 +78,13 @@ - /* Location of the file that tells proftpd to discontinue servicing +@@ -79,14 +79,14 @@ * requests. */ --#define PR_SHUTMSG_PATH "/etc/shutmsg" -+#define PR_SHUTMSG_PATH "/etc/proftpd/shutmsg" + #ifndef PR_SHUTMSG_PATH +-# define PR_SHUTMSG_PATH "/etc/shutmsg" ++# define PR_SHUTMSG_PATH "/etc/proftpd/shutmsg" + #endif /* Location of the file containing users that *cannot* use ftp * services (odd, eh?) @@ -50,14 +62,3 @@ diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/def #endif #endif /* PROFTPD_PATHS_H */ -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@ -+rundir=@localstatedir@/proftpd - mandir=@mandir@ - - AR=@AR@ diff --git a/proftpd.spec b/proftpd.spec index f99238a..a0fc876 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.6c +Version: 1.3.7a Release: 1 Epoch: 2 License: GPL v2+ Group: Networking/Daemons Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz -# Source0-md5: 5680a462144e94770d6e5478ffd60254 +# Source0-md5: 4a9b8877b2e9b08d70e71ad56c19e2c9 # https://github.com/jbenden/mod_clamav Source1: mod_clamav-%{mod_clamav_version}.tar.xz # Source1-md5: 89ec19115d9ea7c7f4e0b0c4551e69bc @@ -702,8 +702,7 @@ sed -i -e 's|/etc/ftpd|/etc/proftpd|g' /etc/ftpd/conf.d/anonftp.conf 2>/dev/null %files common %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 -%doc README.modules +%doc README.md README.modules %doc doc/*.html doc/contrib doc/howto doc/modules %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/proftpd %dir %attr(750,root,ftp) %dir %{_sysconfdir} @@ -756,7 +755,6 @@ sed -i -e 's|/etc/ftpd|/etc/proftpd|g' /etc/ftpd/conf.d/anonftp.conf 2>/dev/null %if %{with pam} %files mod_auth_pam %defattr(644,root,root,755) -%doc README.PAM %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/* %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.ftp %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_auth_pam.conf -- 2.44.0