SPECS: proftpd.spec - up to 1.3.1rc2

[baggins]

Author: baggins                      Date: Thu Mar 22 17:20:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.3.1rc2

---- Files affected:
SPECS:
   proftpd.spec (1.235 -> 1.236) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.235 SPECS/proftpd.spec:1.236
--- SPECS/proftpd.spec:1.235	Tue Feb 13 09:06:42 2007
+++ SPECS/proftpd.spec	Thu Mar 22 18:20:37 2007
@@ -20,13 +20,13 @@
 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.0
-Release:	4
+Version:	1.3.1rc2
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
 Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
-# Source0-md5:	fae47d01b52e035eb6b7190e74c17722
+# Source0-md5:	b117abb8fa7df8bc6d5e2ee85d97b4e0
 Source1:	%{name}.conf
 Source3:	ftp.pamd
 Source4:	%{name}.inetd
@@ -43,9 +43,6 @@
 Patch3:		%{name}-wtmp.patch
 Patch4:		%{name}-configure.patch
 Patch5:		%{name}-pool.patch
-Patch6:		%{name}-CVE-2006-5815.patch
-Patch7:		%{name}-ctrls-reqarglen.patch
-Patch8:		%{name}-CVE-2006-6170.patch
 URL:		http://www.proftpd.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -429,9 +426,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
 
 cp -f /usr/share/automake/config.sub .
 
@@ -513,6 +507,7 @@
 
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers.default
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
+:> $RPM_BUILD_ROOT/var/log/xferlog
 
 # only for -inetd package?
 ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
@@ -530,6 +525,7 @@
 
 %post common
 umask 027
+touch /var/log/xferlog
 awk -F: '{ if (($3 < 500) && ($1 != "ftp")) print $1; }' < /etc/passwd >> %{_sysconfdir}/ftpusers.default
 if [ ! -f %{_sysconfdir}/ftpusers ]; then
 	cp -f %{_sysconfdir}/ftpusers.default %{_sysconfdir}/ftpusers
@@ -648,6 +644,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/ftpusers
 %attr(640,root,root) %{_sysconfdir}/ftpusers.default
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
+%attr(640,root,root) %ghost /var/log/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_libdir}/%{name}
@@ -775,6 +772,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.236  2007/03/22 17:20:37  baggins
+- up to 1.3.1rc2
+
 Revision 1.235  2007/02/13 08:06:42  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.235&r2=1.236&f=u