perl/apache2-mod_perl
SHA256
8
0
Fork 0
forked from pool/apache2-mod_perl
Code Pull Requests Activity

Accepting request 123062 from devel:languages:perl

Browse Source 
- update to 2.0.6
 +Set the -apxs argument correctly when building from mod_perl.
  [Steve Hay]
 
 +Doc spelling fix
  [Nicholas Bamber]
 +Add Apache-Test 1.34 dependency.
  [Phred]

OBS-URL: https://build.opensuse.org/request/show/123062
OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=34
This commit is contained in:
Factory Maintainer
2012-06-01 09:57:01 +00:00
committed by Git OBS Bridge
parent db8602e559
commit 57fd4b19a2
6 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apache2-mod_perl.changes
View File

@@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu May 31 10:44:31 UTC 2012 - coolo@suse.com
- update to 2.0.6
+Set the -apxs argument correctly when building from mod_perl.
[Steve Hay]
+Doc spelling fix
[Nicholas Bamber]
+Add Apache-Test 1.34 dependency.
[Phred]
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 22 12:37:39 UTC 2012 - dvaleev@suse.com Wed Feb 22 12:37:39 UTC 2012 - dvaleev@suse.com

14
apache2-mod_perl.spec
View File

@@ -43,17 +43,22 @@ BuildRequires: openldap2-devel
Summary: Embedded Perl for Apache Summary: Embedded Perl for Apache
License: Apache-2.0 License: Apache-2.0
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
Requires: apache2 %{apache_mmn} Requires: %{apache_mmn}
Requires: apache2
Requires: perl = %{perl_version} Requires: perl = %{perl_version}
Requires: perl-HTML-Parser perl-Tie-IxHash Requires: perl-HTML-Parser
Requires: perl-URI perl-libwww-perl Requires: perl-Tie-IxHash
Requires: perl-URI
Requires: perl-libwww-perl
Obsoletes: mod_perl_2 Obsoletes: mod_perl_2
Conflicts: mod_perl Conflicts: mod_perl
Version: 2.0.5 Version: 2.0.6
Release: 0 Release: 0
Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
Patch: %{name}-2.0.4-tests.diff Patch: %{name}-2.0.4-tests.diff
Patch1: lfs-perl-5.14.patch Patch1: lfs-perl-5.14.patch
# RT#77129
Patch2: patch-PL_uid.diff
#%define apache_test_version 1_99_15 #%define apache_test_version 1_99_15
# cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version} # cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version}
#Source1: Apache-Test-%{apache_test_version}.tar.bz2 #Source1: Apache-Test-%{apache_test_version}.tar.bz2
@@ -114,6 +119,7 @@ software depending on apache2-mod_perl.
#%setup -q -n modperl-2.0 -a 1 #%setup -q -n modperl-2.0 -a 1
%setup -q -n mod_perl-%{version} %setup -q -n mod_perl-%{version}
%patch1 -p1 %patch1 -p1
%patch2
find -name ".svn" -type d | xargs rm -rfv find -name ".svn" -type d | xargs rm -rfv
%build %build

16
lfs-perl-5.14.patch
View File

@@ -1,8 +1,8 @@
Index: mod_perl-2.0.5/lib/Apache2/Build.pm Index: mod_perl-2.0.6/lib/Apache2/Build.pm
=================================================================== ===================================================================
--- mod_perl-2.0.5.orig/lib/Apache2/Build.pm --- mod_perl-2.0.6.orig/lib/Apache2/Build.pm 2012-05-31 13:03:22.969922364 +0200
+++ mod_perl-2.0.5/lib/Apache2/Build.pm +++ mod_perl-2.0.6/lib/Apache2/Build.pm 2012-05-31 13:03:28.940642765 +0200
@@ -598,7 +598,7 @@ sub cmp_tuples { @@ -643,7 +643,7 @@ sub cmp_tuples {
sub perl_ccopts { sub perl_ccopts {
my $self = shift; my $self = shift;
@@ -11,7 +11,7 @@ Index: mod_perl-2.0.5/lib/Apache2/Build.pm
my $fixup = \&{"ccopts_$^O"}; my $fixup = \&{"ccopts_$^O"};
if (defined &$fixup) { if (defined &$fixup) {
@@ -2077,94 +2077,6 @@ sub inc { @@ -2137,94 +2137,6 @@ sub inc {
"@includes"; "@includes";
} }
@@ -106,10 +106,10 @@ Index: mod_perl-2.0.5/lib/Apache2/Build.pm
sub define { sub define {
my $self = shift; my $self = shift;
Index: mod_perl-2.0.5/xs/APR/PerlIO/Makefile.PL Index: mod_perl-2.0.6/xs/APR/PerlIO/Makefile.PL
=================================================================== ===================================================================
--- mod_perl-2.0.5.orig/xs/APR/PerlIO/Makefile.PL --- mod_perl-2.0.6.orig/xs/APR/PerlIO/Makefile.PL 2012-05-31 13:03:22.969922364 +0200
+++ mod_perl-2.0.5/xs/APR/PerlIO/Makefile.PL +++ mod_perl-2.0.6/xs/APR/PerlIO/Makefile.PL 2012-05-31 13:03:28.940642765 +0200
@@ -8,23 +8,6 @@ my $build = Apache2::Build->build_config @@ -8,23 +8,6 @@ my $build = Apache2::Build->build_config
my $ccopts = $build->ccopts; my $ccopts = $build->ccopts;

3
mod_perl-2.0.5.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa
size 3778910

3
mod_perl-2.0.6.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc
size 3784836

20
patch-PL_uid.diff Normal file
View File

@@ -0,0 +1,20 @@
Index: src/modules/perl/modperl_perl.c
===================================================================
--- src/modules/perl/modperl_perl.c 2012-05-21 10:06:24.000000000 +0000
+++ src/modules/perl/modperl_perl.c 2012-05-21 10:08:56.000000000 +0000
@@ -101,6 +101,7 @@
{
sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid);
+#if !MP_PERL_VERSION_AT_LEAST(5, 16, 0)
#ifndef WIN32
PL_uid = ids->uid;
PL_euid = ids->euid;
@@ -110,6 +111,7 @@
#ifdef MP_MAINTAIN_PPID
PL_ppid = ids->ppid;
#endif
+#endif
}