%include /usr/lib/rpm/macros.perl
%define apxs /usr/sbin/apxs
%define mod_name perl
-# NB! leave this without *release*
-%define apache_test_version 1.29
+
Summary: A Perl interpreter for the Apache Web server
Summary(cs.UTF-8): Vestavěný interpret Perlu pro WWW server Apache
Summary(da.UTF-8): En indbygget Perl-fortolker for webtjeneren Apache
Summary(uk.UTF-8): Модуль вбудовування інтерпретатора Perl в сервер Apache
Summary(zh_CN.UTF-8): 用于 Apache web 服务程序的 Perl 解释程序。
Name: apache-mod_perl
-Version: 2.0.3
-Release: 4
+%define ver 2.0.4
+Version: %{ver}
+Release: 7
Epoch: 1
License: Apache
-Group: Networking/Daemons
+Group: Networking/Daemons/HTTP
Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
-# Source0-md5: b40e2adf67c6be15a0041af1c67b6997
+# Source0-md5: 1a05625ae6843085f985f5da8214502a
Source1: %{name}.conf
Patch0: %{name}-Makefile_PL.patch
-Patch1: %{name}-path_info_secfix.patch
+Patch1: %{name}-CVE-2009-0796.patch
URL: http://perl.apache.org/
BuildRequires: apache-devel >= 2.0.55-1
BuildRequires: apr-util-devel >= 1:1.0.0
BuildRequires: expat-devel
BuildRequires: gdbm-devel
BuildRequires: openldap-devel >= 2.4.6
-BuildRequires: perl-Apache-Test >= 1:%{apache_test_version}
%{?with_autodeps:BuildRequires: perl-Data-Flow}
BuildRequires: perl-devel >= 1:5.8.2
BuildRequires: rpm-perlprov >= 3.0.3-16
# TODO: separate -devel with ExtUtils::Embed and friends?
%define _noautoreq 'perl(Apache::.*)' 'perl(mod_perl)' 'perl(ModPerl::.*)' 'perl(ExtUtils::Embed)' 'perl(Module::Build)'
-%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define apacheconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
%description
Mod_perl incorporates a Perl interpreter into the Apache web server,
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-Apache-Test
-Requires: perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
Obsoletes: mod_perl
Obsoletes: mod_perl-common
Conflicts: perl-modules < 1:5.8.6-6
%description -n perl-mod_%{mod_name} -l pl.UTF-8
Perlowe API dla mod_perla.
+%package -n perl-Apache-Test
+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_%{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
+testing an Apache server.
+
+%description -n perl-Apache-Test -l pl.UTF-8
+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
-%patch1 -p0
-
-bundled=$(%{__perl} -IApache-Test/lib -MApache::Test -e 'print Apache::Test->VERSION')
-if [ "%apache_test_version" != "$bundled" ]; then
- : "%%define apache_test_version to $bundled and retry."
- exit 1
-fi
-rm -rf Apache-Test
+%patch1 -p3
%build
%{__perl} Makefile.PL \
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+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 '{}' \;
rm -f $RPM_BUILD_ROOT%{_mandir}/man?/Bundle*
rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_perl2/.packlist
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/75_mod_perl.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_perl.conf
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc Changes INSTALL README STATUS
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*.conf
+%attr(755,root,root) %{apachelibdir}/*.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/apache/mod_perl.h
+%{_includedir}/apache/modperl_*.h
%files -n perl-mod_%{mod_name}
%defattr(644,root,root,755)
-%{perl_vendorarch}/*.pm
+%{perl_vendorarch}/APR.pm
%{perl_vendorarch}/APR
%{perl_vendorarch}/Apache2
%{perl_vendorarch}/ModPerl
-
-%dir %{perl_vendorarch}/auto/*
-%{perl_vendorarch}/auto/*/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/*/*.so
+%{perl_vendorarch}/mod_perl2.pm
+%dir %{perl_vendorarch}/auto/APR
+%{perl_vendorarch}/auto/APR/APR.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/APR.so
%dir %{perl_vendorarch}/auto/APR/[B-U]*
+%dir %{perl_vendorarch}/auto/Apache2
%dir %{perl_vendorarch}/auto/Apache2/[A-U]*
+%{perl_vendorarch}/auto/Apache2/typemap
+%dir %{perl_vendorarch}/auto/ModPerl
%dir %{perl_vendorarch}/auto/ModPerl/*
%{perl_vendorarch}/auto/*/*/*.ix
%{perl_vendorarch}/auto/*/*/*.bs
%attr(755,root,root) %{perl_vendorarch}/auto/*/*/*.so
-%{perl_vendorarch}/auto/Apache2/typemap
-%{_mandir}/man?/*
+%{_mandir}/man3/APR*.3pm*
+%{_mandir}/man3/Apache2::*.3pm*
+%{_mandir}/man3/ModPerl::*.3pm*
+%{_mandir}/man3/mod_perl2.3pm*
-%files devel
+%files -n perl-Apache-Test
%defattr(644,root,root,755)
-%{_includedir}/apache/*.h
+%{perl_vendorarch}/Apache/Test*
+%{_mandir}/man3/Apache::Test*.3pm*
projects / packages / apache-mod_perl.git / blobdiff