rpms/proftpd/EL-5 .cvsignore, 1.10, 1.11 proftpd.spec, 1.31, 1.32 sources, 1.10, 1.11 proftpd-1.3.1-csrf.patch, 1.1, NONE proftpd-1.3.1-tls_debug.patch, 1.1, NONE proftpd-1.3.1-tls_shutdown.patch, 1.1, NONE proftpd-1.3.1-tls_sighup.patch, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17894/EL-5

Modified Files:
	.cvsignore proftpd.spec sources 
Removed Files:
	proftpd-1.3.1-csrf.patch proftpd-1.3.1-tls_debug.patch 
	proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update to 1.3.2 and enable mod_wrap.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Feb 2008 17:54:06 -0000	1.10
+++ .cvsignore	6 Apr 2009 22:06:20 -0000	1.11
@@ -1 +1 @@
-proftpd-1.3.1.tar.bz2
+proftpd-1.3.2.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- proftpd.spec	2 Jan 2009 13:45:48 -0000	1.31
+++ proftpd.spec	6 Apr 2009 22:06:20 -0000	1.32
@@ -1,11 +1,13 @@
+#define prever rc3
+
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.1
-Release: 8%{?dist}
+Version: 1.3.2
+Release: 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,11 +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
-Patch1: proftpd-1.3.1-csrf.patch
-Patch2: proftpd-1.3.1-tls_shutdown.patch
-Patch3: proftpd-1.3.1-tls_debug.patch
-Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -26,7 +23,16 @@
 Requires(postun): /sbin/service
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
+BuildRequires: zlib-devel
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
+%if 0%{?rhel} <= 5
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openldap-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
 Provides: ftpserver
 
 %description
@@ -68,12 +74,7 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .find-umode_t
-%patch1 -p1 -b .csrf
-%patch2 -p0 -b .tls_shutdown
-%patch3 -p1 -b .tls_debug.patch
-%patch4 -p0 -b .tls_sighup.patch
+%setup -q -n %{name}-%{version}%{?prever}
 
 
 %build
@@ -92,7 +93,7 @@
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -168,12 +169,14 @@
 %{_mandir}/man?/*
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
+%exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
+%{_libexecdir}/proftpd/mod_wrap.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
@@ -204,13 +207,27 @@
 
 
 %changelog
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
+- Update to 1.3.2.
+- Include mod_wrap (#479813).
+- Tried to include mod_wrap2* modules but build failed.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caolán McNamara 1.3.2-0.3.rc3
+- rebuild for dependencies
+
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more
   example configuration for them.
-- Include patches to fix TLS issues (#457280).
 
-* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
-- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+* 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).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Feb 2008 17:54:06 -0000	1.10
+++ sources	6 Apr 2009 22:06:20 -0000	1.11
@@ -1 +1 @@
-175958df8de92d5209b7b1e2e23a5a28  proftpd-1.3.1.tar.bz2
+89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2


--- proftpd-1.3.1-csrf.patch DELETED ---


--- proftpd-1.3.1-tls_debug.patch DELETED ---


--- proftpd-1.3.1-tls_shutdown.patch DELETED ---


--- proftpd-1.3.1-tls_sighup.patch DELETED ---