rpms/proftpd/devel proftpd.spec,1.40,1.41

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000/devel

Modified Files:
	proftpd.spec 
Log Message:
Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115) and backport recent minor changes on all current branches.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- proftpd.spec	8 Aug 2008 11:06:32 -0000	1.40
+++ proftpd.spec	2 Jan 2009 12:51:49 -0000	1.41
@@ -1,11 +1,13 @@
+%define prever rc3
+
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.1
-Release: 6%{?dist}
+Version: 1.3.2
+Release: 0.1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -14,7 +16,6 @@
 Source6: proftpd.pam
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
-Patch0: proftpd-1.3.1-find-umode_t.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -64,8 +65,7 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .find-umode_t
+%setup -q -n %{name}-%{version}%{?prever}
 
 
 %build
@@ -160,6 +160,7 @@
 %{_mandir}/man?/*
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
+%exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
@@ -196,6 +197,13 @@
 
 
 %changelog
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.2-0.1.rc3
+- Update to 1.3.2rc3 (fixes security issue #464127)
+- Exclude new pkgconfig file, as we already exclude header files (if someone
+  ever needs to rebuild something against this proftpd, just ask and I'll split
+  out a devel package... but it seems pretty useless currently).
+- Remove no longer needed find-umode_t patch.
+
 * Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
 - Add mod_ban support (#457289, Philip Prindeville).