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

diff --git a/proftpd.spec b/proftpd.spec
index 4f4e60b..f331469 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -24,7 +24,7 @@ Summary(pt_BR.UTF-8):	Servidor FTP profissional, com sintaxe de configuração s
 Summary(zh_CN.UTF-8):	易于管理的,安全的 FTP 服务器
 Name:		proftpd
 Version:	1.3.6
-Release:	2.1
+Release:	3
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons
@@ -45,6 +45,8 @@ 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/
@@ -510,9 +512,8 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,security,sysconfig/rc-inetd,rc
 
 rm $RPM_BUILD_ROOT%{_sbindir}/in.proftpd
 
-install %{SOURCE13} $RPM_BUILD_ROOT/etc/logrotate.d/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
@@ -531,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
 
@@ -781,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