OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jun-2008 19:04:51
Branch: HEAD Handle: 2008060718044701
Modified files:
openpkg-src/apache-perl apache-perl.patch apache-perl.pl apache-perl.spec
Log:
finally upgrade to mod_perl 2.0.4
Summary:
Revision Changes Path
1.2 +19 -20 openpkg-src/apache-perl/apache-perl.patch
1.2 +2 -1 openpkg-src/apache-perl/apache-perl.pl
1.7 +2 -2 openpkg-src/apache-perl/apache-perl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-perl/apache-perl.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-perl.patch
--- openpkg-src/apache-perl/apache-perl.patch 28 Jun 2007 07:10:22 -0000
1.1
+++ openpkg-src/apache-perl/apache-perl.patch 7 Jun 2008 17:04:47 -0000
1.2
@@ -1,24 +1,23 @@
-Index: ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
---- ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig 2006-11-20
00:31:41 +0100
-+++ ModPerl-Registry/lib/ModPerl/RegistryCooker.pm 2007-06-28 09:07:22
+0200
-@@ -337,7 +337,7 @@
- my $self = shift;
+Index: lib/ModPerl/BuildMM.pm
+--- lib/ModPerl/BuildMM.pm.orig 2007-12-31 08:50:47 +0100
++++ lib/ModPerl/BuildMM.pm 2008-06-07 19:02:20 +0200
+@@ -359,7 +359,7 @@
- my $path_info = $self->{REQ}->path_info;
-- my $script_name = $path_info && $self->{URI} =~ /$path_info$/
-+ my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
- ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
- : $self->{URI};
+ $apr_config ||= $build->get_apr_config();
-Index: xs/APR/APR/Makefile.PL
---- xs/APR/APR/Makefile.PL.orig 2006-11-20 00:31:02 +0100
-+++ xs/APR/APR/Makefile.PL 2007-06-28 09:07:22 +0200
-@@ -15,7 +15,7 @@
+- if ($path =~ m/(Thread|Global)Mutex/) {
++ if ($path =~ m/(Thread|Global)(Mutex|RWLock)/) {
+ return unless $apr_config->{HAS_THREADS};
+ }
- my %args;
+Index: src/modules/perl/modperl_apache_compat.h
+--- src/modules/perl/modperl_apache_compat.h.orig 2007-12-31 08:23:36
+0100
++++ src/modules/perl/modperl_apache_compat.h 2008-06-07 19:02:20 +0200
+@@ -22,6 +22,7 @@
+ #if !APR_HAS_THREADS
+ typedef unsigned long apr_os_thread_t;
+ typedef void * apr_thread_mutex_t;
++typedef void * apr_thread_rwlock_t;
+ #endif
--%args = map { split /=/, $_ } @ARGV;
-+%args = map { split /=/, $_, 2 } @ARGV;
-
- $args{NAME} = 'APR';
- $args{VERSION_FROM} = 'APR.pm';
+ /* back compat adjustements for older Apache versions
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-perl/apache-perl.pl
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-perl.pl
--- openpkg-src/apache-perl/apache-perl.pl 22 Jun 2007 10:54:04 -0000
1.1
+++ openpkg-src/apache-perl/apache-perl.pl 7 Jun 2008 17:04:47 -0000
1.2
@@ -2,7 +2,8 @@
## apache-perl.pl -- Apache Perl/mod_perl Startup Script
##
-$ENV{MOD_PERL} or die "you are not running mod_perl";
+# sanity check run-time environment
+$ENV{MOD_PERL} or die "you are not running Apache/mod_perl";
# strict run-time environment
use strict;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-perl/apache-perl.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 apache-perl.spec
--- openpkg-src/apache-perl/apache-perl.spec 8 May 2008 11:31:57 -0000
1.6
+++ openpkg-src/apache-perl/apache-perl.spec 7 Jun 2008 17:04:48 -0000
1.7
@@ -31,8 +31,8 @@
Class: BASE
Group: Web
License: Artistic/GPL
-Version: 2.0.3
-Release: 20080508
+Version: 2.0.4
+Release: 20080607
# list of sources
Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
