- security blocker: CVE-2009-0796

[packages/apache-mod_perl.git] / apache-mod_perl.spec

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 3d5485b4b3abbfed4e64b82ea35b40f2edccca8d..9eace370c071985c81bd4585143fd0b205627d12 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -34,7 +34,7 @@ Version:      %{ver}
 Release:       3
 Epoch:         1
 License:       Apache
-Group:         Networking/Daemons
+Group:         Networking/Daemons/HTTP
 Source0:       http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
 # Source0-md5: 1a05625ae6843085f985f5da8214502a
 Source1:       %{name}.conf
@@ -42,6 +42,9 @@ Patch0:               %{name}-Makefile_PL.patch
 Patch1:                %{name}-path_info_secfix.patch
 Patch2:                %{name}-magic.patch
 URL:           http://perl.apache.org/
+# Fix in svn:
+# http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?view=log
+BuildRequires: security(CVE-2009-0796)
 BuildRequires: apache-devel >= 2.0.55-1
 BuildRequires: apr-util-devel >= 1:1.0.0
 BuildRequires: expat-devel
@@ -208,8 +211,6 @@ Summary:    Files needed for building XS modules that use mod_perl
 Summary(pl.UTF-8):     Pliki potrzebne do budowania modułów XS korzystających z mod_perla
 Group:         Development/Libraries
 Requires:      apache-devel >= 2.0
-Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
-Requires:      perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
 Conflicts:     perl-modules < 1:5.8.6-6
@@ -238,7 +239,8 @@ Summary:    Apache::Test - Test.pm wrapper with helpers for testing Apache
 Summary(pl.UTF-8):     Apache::Test - wrapper na Test.pm z funkcjami do testowania Apache
 Version:       1.31
 Group:         Development/Languages/Perl
-Requires:      perl-mod_perl = %{ver}-%{release}
+Requires:      perl-mod_%{mod_name} = %{epoch}:%{ver}-%{release}
+Requires:      perl-dirs >= 2.0-5
 
 %description -n perl-Apache-Test
 Apache::Test is a wrapper around the standard Test.pm with helpers for
@@ -249,7 +251,7 @@ Apache::Test to moduł obudowujący standardowy Test.pm w funkcje
 pomocnicze do testowania serwera Apache.
 
 %prep
-%setup -q -n mod_%{mod_name}-%{version}
+%setup -q -n mod_%{mod_name}-%{ver}
 %patch0 -p1
 
 %build
@@ -271,7 +273,7 @@ pomocnicze do testowania serwera Apache.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name \*.orig -exec rm -f '{}' \;
 
@@ -333,6 +335,5 @@ fi
 
 %files -n perl-Apache-Test
 %defattr(644,root,root,755)
-%dir %{perl_vendorarch}/Apache
 %{perl_vendorarch}/Apache/Test*
 %{_mandir}/man3/Apache::Test*.3pm*