X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=proftpd.spec;h=f3314696eab17ee3582ddce7e2bc8b9cdd0ee141;hb=fb70bff867dcf7858827b5dbb9ca3cd76003086f;hp=2c6e1f6aaac26b0433937b45b4b104e90cc0d528;hpb=a1f9493c8b918448a51d23db54c90ddc9ff80a29;p=packages%2Fproftpd.git

diff --git a/proftpd.spec b/proftpd.spec
index 2c6e1f6..f331469 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.5d
-Release:	1
+Version:	1.3.6
+Release:	3
 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
@@ -44,6 +44,9 @@ Source9:	%{name}-mod_pam.conf
 Source10:	%{name}-mod_tls.conf
 Source11:	%{name}-anonftp.conf
 Source12:	%{name}-mod_clamav.conf
+Source13:	%{name}.logrotate
+Source14:	%{name}-server.crt
+Source15:	%{name}-server.key
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-noautopriv.patch
 URL:		http://www.proftpd.org/
@@ -485,7 +488,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 \
@@ -495,8 +500,8 @@ MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
-	$RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log,run/proftpd} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
+	$RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log/{archive,}/proftpd,run/proftpd} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d \
 	$RPM_BUILD_ROOT%{_includedir}/%{name}
 
@@ -508,7 +513,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
 rm $RPM_BUILD_ROOT%{_sbindir}/in.proftpd
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_auth_pam.conf
+cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_auth_pam.conf
 MODULES="
 mod_auth_file
 mod_ident
@@ -527,13 +532,18 @@ mod_wrap
 for module in $MODULES; do
 	echo "LoadModule	$module.c" > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/$module.conf
 done
-install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_tls.conf
-install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/anonftp.conf
-install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_clamav.conf
+cp -a %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_tls.conf
+cp -a %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/anonftp.conf
+cp -a %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_clamav.conf
 
-%{?with_pam:install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/ftp}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/proftpd
+cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/server.crt
+cp -a %{SOURCE15} $RPM_BUILD_ROOT%{_sysconfdir}/server.key
+
+cp -a %{SOURCE13} $RPM_BUILD_ROOT/etc/logrotate.d/proftpd
+
+%{?with_pam:cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/ftp}
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
+cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/proftpd
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/proftpd
 install contrib/xferstats.holger-preiss $RPM_BUILD_ROOT%{_bindir}/xferstat
 
@@ -642,9 +652,10 @@ 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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/proftpd
 %dir %attr(750,root,ftp) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/ftpusers
@@ -653,7 +664,8 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_auth_file.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ident.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_clamav.conf
-#%attr(640,root,root) %ghost /var/log/*
+%attr(750,root,root) %dir /var/log/proftpd
+%attr(750,root,root) %dir /var/log/archive/proftpd
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_libexecdir}
@@ -775,6 +787,8 @@ fi
 %files mod_tls
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_tls.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/server.crt
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/server.key
 %attr(755,root,root) %{_libexecdir}/mod_tls.so
 
 %files mod_wrap