X-Git-Url: https://git.tld-linux.org/?p=packages%2Fproftpd.git;a=blobdiff_plain;f=proftpd.spec;h=a5f030761204858cc25bbe6b29e4cf5db775aa4b;hp=a0c34ab879e94c0c83aad8a731fc47d9c817ab30;hb=8812cad19900ef93c4aa07e9ea83b439a61767e6;hpb=b39b489c4492c8743f8318bb9d6b11283d9b3f1c

diff --git a/proftpd.spec b/proftpd.spec
index a0c34ab..a5f0307 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -15,7 +15,7 @@
 %bcond_without	quotamysql	# disable quota mysql support
 %bcond_without	quotapgsql	# disable quota pgsql support
 #
-%define		mod_clamav_version	0.11rc
+%define		mod_clamav_version	0.13
 
 Summary:	PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es.UTF-8):	Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
@@ -23,15 +23,16 @@ 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.4d
-Release:	1
+Version:	1.3.6
+Release:	0.1
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5:	13c6fd7ce320886adc371c81a3e23f07
-Source1:	https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-%{mod_clamav_version}.tar.gz
-# Source1-md5:	42e560ec0bd5964e13fad1b2bb7afe21
+# Source0-md5:	13270911c42aac842435f18205546a1b
+# https://github.com/jbenden/mod_clamav
+Source1:	mod_clamav-%{mod_clamav_version}.tar.xz
+# Source1-md5:	89ec19115d9ea7c7f4e0b0c4551e69bc
 Source2:	%{name}.conf
 Source3:	ftp.pamd
 Source4:	%{name}.inetd
@@ -43,11 +44,8 @@ Source9:	%{name}-mod_pam.conf
 Source10:	%{name}-mod_tls.conf
 Source11:	%{name}-anonftp.conf
 Source12:	%{name}-mod_clamav.conf
-Source13:	%{name}.tmpfiles
 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
@@ -445,11 +443,8 @@ dodaje hosty do pliku /etc/hosts.deny.
 %setup -q -n %{name}-%{version}%{?_rc} -a1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # mod_clamav
-patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch
 cp -a mod_clamav-%{mod_clamav_version}/*.{c,h} contrib/
 
 cp -f /usr/share/automake/config.sub .
@@ -490,7 +485,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 \
@@ -503,8 +500,7 @@ 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} \
 	$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 \
@@ -548,8 +544,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,7 +644,7 @@ 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
 %dir %attr(750,root,ftp) %dir %{_sysconfdir}
@@ -671,7 +665,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*