From 18264eadeb24bf2255c9ea884e05ffd15836ea2a17718f15a23289a243b14ceb Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 23 May 2011 13:32:03 +0000 Subject: [PATCH] Accepting request 70710 from home:coolo:branches:openSUSE:Factory - update to 2.0.5 * Prepare modperl for the upcoming perl 5.14 * Many other fixes over two years, see Changes OBS-URL: https://build.opensuse.org/request/show/70710 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=25 --- apache2-mod_perl-2.0.4-xss.patch | 47 -------------------------------- apache2-mod_perl.changes | 7 +++++ apache2-mod_perl.spec | 23 +++++----------- mod_perl-2.0.4.tar.bz2 | 3 -- mod_perl-2.0.5.tar.gz | 3 ++ 5 files changed, 17 insertions(+), 66 deletions(-) delete mode 100644 apache2-mod_perl-2.0.4-xss.patch delete mode 100644 mod_perl-2.0.4.tar.bz2 create mode 100644 mod_perl-2.0.5.tar.gz diff --git a/apache2-mod_perl-2.0.4-xss.patch b/apache2-mod_perl-2.0.4-xss.patch deleted file mode 100644 index 29a4a3d..0000000 --- a/apache2-mod_perl-2.0.4-xss.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- perl/modperl/trunk/lib/Apache2/Status.pm 2007/12/31 08:05:11 607697 -+++ perl/modperl/trunk/lib/Apache2/Status.pm 2009/04/01 15:39:56 760926 -@@ -29,7 +29,7 @@ use File::Spec (); - - use Apache2::Const -compile => qw(OK); - --$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0 -+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0 - - use constant IS_WIN32 => ($^O eq "MSWin32"); - -@@ -126,7 +126,7 @@ sub handler { - $r->print(symdump($r, $qs)); - } - else { -- my $uri = $r->uri; -+ my $uri = $r->location; - $r->print('

'); - $r->print( - map { qq[$status{$_}
\n] } sort { lc $a cmp lc $b } keys %status -@@ -198,7 +198,7 @@ sub status_section_config { - sub status_inc { - my ($r) = @_; - -- my $uri = $r->uri; -+ my $uri = $r->location; - my @retval = ( - '', - "", -@@ -289,7 +289,7 @@ sub status_rgysubs { - my ($r) = @_; - - local $_; -- my $uri = $r->uri; -+ my $uri = $r->location; - my $cache = __PACKAGE__->registry_cache; - - my @retval = "

Compiled registry scripts grouped by their handler

"; -@@ -765,7 +765,7 @@ sub as_HTML { - my ($self, $package, $r) = @_; - - my @m = qw(
); -- my $uri = $r->uri; -+ my $uri = $r->location; - my $is_main = $package eq "main"; - - my $do_dump = has($r, "dumper"); diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes index d7d59ef..6d11987 100644 --- a/apache2-mod_perl.changes +++ b/apache2-mod_perl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 18 13:50:41 UTC 2011 - coolo@novell.com + +- update to 2.0.5 + * Prepare modperl for the upcoming perl 5.14 + * Many other fixes over two years, see Changes + ------------------------------------------------------------------- Mon Dec 20 11:35:31 UTC 2010 - vcizek@novell.com diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec index 1c6aad2..17ee6b3 100644 --- a/apache2-mod_perl.spec +++ b/apache2-mod_perl.spec @@ -20,7 +20,7 @@ Url: http://perl.apache.org/ Name: apache2-mod_perl -BuildRequires: apache2-devel db-devel ed pcre-devel perl-BSD-Resource perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo +BuildRequires: apache2-devel db-devel ed pcre-devel perl-BSD-Resource perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo perl %if 0%{sles_version} == 9 BuildRequires: openldap2-devel %endif @@ -42,11 +42,10 @@ Requires: perl-URI perl-libwww-perl Obsoletes: mod_perl_2 Conflicts: mod_perl AutoReqProv: on -Version: 2.0.4 -Release: 48 -Source0: mod_perl-%{version}.tar.bz2 -Patch: %{name}-%{version}-tests.diff -Patch1: apache2-mod_perl-2.0.4-xss.patch +Version: 2.0.5 +Release: 1 +Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz +Patch: %{name}-2.0.4-tests.diff #%define apache_test_version 1_99_15 # cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version} #Source1: Apache-Test-%{apache_test_version}.tar.bz2 @@ -108,8 +107,7 @@ software depending on apache2-mod_perl. %prep #%setup -q -n modperl-2.0 -a 1 %setup -q -n mod_perl-%{version} -%patch -%patch1 -p3 +#%patch find -name ".svn" -type d | xargs rm -rfv %build @@ -281,13 +279,6 @@ EOF %files devel %defattr(-,root,root) -%dir %{apache_includedir} -%dir %{apache_includedir}/modules -%{apache_includedir}/modules/perl - -%clean -if ! test -f /.buildenv; then - rm -rf $RPM_BUILD_ROOT -fi +%{apache_includedir}/* %changelog diff --git a/mod_perl-2.0.4.tar.bz2 b/mod_perl-2.0.4.tar.bz2 deleted file mode 100644 index 0e57c7c..0000000 --- a/mod_perl-2.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1dfb987fb37f59edf759cb4b1cf2a8fad2fef90993cbd52d6d8a86490aa777d -size 3251421 diff --git a/mod_perl-2.0.5.tar.gz b/mod_perl-2.0.5.tar.gz new file mode 100644 index 0000000..e4691cc --- /dev/null +++ b/mod_perl-2.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa +size 3778910