[rt3] - Upstream update (CVE-2011-0009, BZ 672257). - Rebase patches. - Switch to using perl-filters (Wo

corsepiu corsepiu at fedoraproject.org
Thu Feb 17 09:30:24 UTC 2011


commit 1a578216e4d095d68e456925dfaa3f57bda886b9
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Feb 17 10:28:28 2011 +0100

    - Upstream update (CVE-2011-0009, BZ 672257).
    - Rebase patches.
    - Switch to using perl-filters
      (Work around broken deps caused by rpm dep-tracker changes).
    - Spec file overhaul.

 rt3.spec |   68 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/rt3.spec b/rt3.spec
index 2601b77..52f34f1 100644
--- a/rt3.spec
+++ b/rt3.spec
@@ -39,8 +39,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.8.8
-Release:	4%{?dist}
+Version:	3.8.9
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -51,9 +51,9 @@ Source3:	rt3.conf.in
 Source4:	README.fedora.in
 Source5:	rt3.logrotate.in
 
-Patch0:		rt-3.8.8-config.diff
-Patch2:		rt-3.8.8-Makefile.diff
-Patch3:		rt-3.8.6-test-dependencies.diff
+Patch0:		rt-%{version}-config.diff
+Patch2:		rt-%{version}-Makefile.diff
+Patch3:		rt-%{version}-test-dependencies.diff
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -170,21 +170,16 @@ Requires(postun): /bin/rm
 # rpm doesn't catch these:
 Requires: perl(Apache::Session)
 Requires: perl(Calendar::Simple)
-Requires: perl(Class::Accessor::Fast)
 Requires: perl(Data::ICal)
 Requires: perl(Data::ICal::Entry::Event)
-Requires: perl(Exception::Class::Base)
 %{?with_gd:Requires: perl(GD::Text)}
 %{?with_gd:Requires: perl(GD::Graph::bars)}
 %{?with_gd:Requires: perl(GD::Graph::pie)}
-Requires: perl(HTTP::Server::Simple::Mason)
-Requires: perl(HTML::Mason::Request)
 Requires: perl(I18N::LangTags::List)
 Requires: perl(Locale::Maketext::Fuzzy)
 Requires: perl(LWP::MediaTypes)
 Requires: perl(mod_perl2)
 Requires: perl(Module::Versions::Report)
-Requires: perl(Net::Server::PreFork)
 Requires: perl(Text::Quoted)
 Requires: perl(Text::WikiFormat)
 Requires: perl(Tree::Simple)
@@ -200,6 +195,25 @@ Provides: perl(RT::Tickets_Overlay_SQL)
 # Split out. Technically, not actually necessary, but ... let's keep it for now.
 Requires: rt3-mailgate
 
+# rpm regression
+Provides: config(rt3) = %{version}-%{release}
+Requires: config(rt3) = %{version}-%{release}
+
+%{?filter_setup:
+# Keep SpamAssassin optional
+%filter_from_requires /^perl(Mail::SpamAssassin)/d
+# Keep FCGI optional
+%filter_from_requires /^perl(FCGI::ProcManager)/d
+# Filter bogus requires
+%filter_from_requires /^perl()/d
+# Filter redundant provides
+%filter_from_provides /^perl(RT)$/d
+# Filter bogus provides
+%filter_from_provides /^perl(HTML::Mason/d
+%filter_from_provides /^perl(IO::Handle::CRLF)$/d
+%{?perl_default_filter}
+}
+
 %description
 RT is an enterprise-grade ticketing system which enables a group of people
 to intelligently and efficiently manage tasks, issues, and requests submitted
@@ -244,34 +258,13 @@ find etc -type f -exec chmod a-x {} \;
 # Upstream tarball contains temporary autotools-files.
 rm -rf autom4te.cache config.log config.status
 
+# Fixup the tarball containing generated files
+find bin sbin etc -name '*.in' | while read a; do d=$(echo "$a" | sed 's,\.in$,,'); rm "$d"; done
+
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
 
-# Patch backups added by rpm disturb
-find -name '*.orig' -exec rm -f {} \;
-
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-    sed -e '/^perl(RT)$/d' \
-    	-e '/^perl(HTML::Mason/d' \
-	-e '/^perl(IO::Handle::CRLF)$/d'
-EOF
-%define __perl_provides %{_builddir}/rt-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
-# Filter out a bogus R:perl() rpm adds.
-# Keep SpamAssassin optional
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-    sed -e '/^perl()/d' \
-	-e '/^perl(Mail::SpamAssassin)$/d'
-EOF
-%define __perl_requires %{_builddir}/rt-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 # Propagate rpm's directories to config.layout
 cat << \EOF >> config.layout
 
@@ -457,6 +450,13 @@ fi
 %endif
 
 %changelog
+* Thu Feb 17 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.9-1
+- Upstream update (CVE-2011-0009, BZ 672257).
+- Rebase patches.
+- Switch to using perl-filters
+  (Work around broken deps caused by rpm dep-tracker changes).
+- Spec file overhaul.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 



More information about the perl-devel mailing list