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

diff --git a/proftpd.spec b/proftpd.spec
index 80813c9..4f4e60b 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.5
-Release:	1
+Version:	1.3.6
+Release:	2.1
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5:	aff1bff40e675244d72c4667f203e5bb
+# Source0-md5:	13270911c42aac842435f18205546a1b
 # https://github.com/jbenden/mod_clamav
 Source1:	mod_clamav-%{mod_clamav_version}.tar.xz
 # Source1-md5:	89ec19115d9ea7c7f4e0b0c4551e69bc
@@ -44,11 +44,9 @@ Source9:	%{name}-mod_pam.conf
 Source10:	%{name}-mod_tls.conf
 Source11:	%{name}-anonftp.conf
 Source12:	%{name}-mod_clamav.conf
-Source13:	%{name}.tmpfiles
+Source13:	%{name}.logrotate
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-noautopriv.patch
-Patch2:		%{name}-wtmp.patch
-Patch3:		%{name}-pool.patch
 URL:		http://www.proftpd.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -446,8 +444,6 @@ dodaje hosty do pliku /etc/hosts.deny.
 %setup -q -n %{name}-%{version}%{?_rc} -a1
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
 
 # mod_clamav
 cp -a mod_clamav-%{mod_clamav_version}/*.{c,h} contrib/
@@ -490,7 +486,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 \
@@ -500,11 +498,10 @@ 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} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+	$RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -513,6 +510,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 %{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
 MODULES="
@@ -548,8 +546,6 @@ bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers.default
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
 
-install %{SOURCE13} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
-
 # only for -inetd package?
 ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
 
@@ -650,9 +646,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
@@ -661,7 +658,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}
@@ -671,7 +669,6 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_ifsession.so
 %attr(755,root,root) %{_libexecdir}/mod_lang.so
 %dir %{_localstatedir}/proftpd
-/usr/lib/tmpfiles.d/%{name}.conf
 %{_mandir}/man5/*
 %lang(ja) %{_mandir}/ja/man5/ftpusers*
 %lang(pl) %{_mandir}/pl/man5/ftpusers*