From 57fd4b19a21e286eabadae24286ba817c5cdcd9063a639a852a9dd9ba9495ebb Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Fri, 1 Jun 2012 09:57:01 +0000 Subject: [PATCH] Accepting request 123062 from devel:languages:perl - 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 --- apache2-mod_perl.changes | 13 +++++++++++++ apache2-mod_perl.spec | 14 ++++++++++---- lfs-perl-5.14.patch | 16 ++++++++-------- mod_perl-2.0.5.tar.gz | 3 --- mod_perl-2.0.6.tar.gz | 3 +++ patch-PL_uid.diff | 20 ++++++++++++++++++++ 6 files changed, 54 insertions(+), 15 deletions(-) delete mode 100644 mod_perl-2.0.5.tar.gz create mode 100644 mod_perl-2.0.6.tar.gz create mode 100644 patch-PL_uid.diff diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes index e96c7fd..c8836ad 100644 --- a/apache2-mod_perl.changes +++ b/apache2-mod_perl.changes @@ -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 diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec index 148f4a2..fbad9e4 100644 --- a/apache2-mod_perl.spec +++ b/apache2-mod_perl.spec @@ -43,17 +43,22 @@ BuildRequires: openldap2-devel Summary: Embedded Perl for Apache License: Apache-2.0 Group: Productivity/Networking/Web/Servers -Requires: apache2 %{apache_mmn} +Requires: %{apache_mmn} +Requires: apache2 Requires: perl = %{perl_version} -Requires: perl-HTML-Parser perl-Tie-IxHash -Requires: perl-URI perl-libwww-perl +Requires: perl-HTML-Parser +Requires: perl-Tie-IxHash +Requires: perl-URI +Requires: perl-libwww-perl Obsoletes: mod_perl_2 Conflicts: mod_perl -Version: 2.0.5 +Version: 2.0.6 Release: 0 Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz Patch: %{name}-2.0.4-tests.diff Patch1: lfs-perl-5.14.patch +# RT#77129 +Patch2: patch-PL_uid.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 @@ -114,6 +119,7 @@ software depending on apache2-mod_perl. #%setup -q -n modperl-2.0 -a 1 %setup -q -n mod_perl-%{version} %patch1 -p1 +%patch2 find -name ".svn" -type d | xargs rm -rfv %build diff --git a/lfs-perl-5.14.patch b/lfs-perl-5.14.patch index 1b500fd..df84f12 100644 --- a/lfs-perl-5.14.patch +++ b/lfs-perl-5.14.patch @@ -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.5/lib/Apache2/Build.pm -@@ -598,7 +598,7 @@ sub cmp_tuples { +--- mod_perl-2.0.6.orig/lib/Apache2/Build.pm 2012-05-31 13:03:22.969922364 +0200 ++++ mod_perl-2.0.6/lib/Apache2/Build.pm 2012-05-31 13:03:28.940642765 +0200 +@@ -643,7 +643,7 @@ sub cmp_tuples { sub perl_ccopts { my $self = shift; @@ -11,7 +11,7 @@ Index: mod_perl-2.0.5/lib/Apache2/Build.pm my $fixup = \&{"ccopts_$^O"}; if (defined &$fixup) { -@@ -2077,94 +2077,6 @@ sub inc { +@@ -2137,94 +2137,6 @@ sub inc { "@includes"; } @@ -106,10 +106,10 @@ Index: mod_perl-2.0.5/lib/Apache2/Build.pm sub define { 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.5/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.6/xs/APR/PerlIO/Makefile.PL 2012-05-31 13:03:28.940642765 +0200 @@ -8,23 +8,6 @@ my $build = Apache2::Build->build_config my $ccopts = $build->ccopts; diff --git a/mod_perl-2.0.5.tar.gz b/mod_perl-2.0.5.tar.gz deleted file mode 100644 index e4691cc..0000000 --- a/mod_perl-2.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa -size 3778910 diff --git a/mod_perl-2.0.6.tar.gz b/mod_perl-2.0.6.tar.gz new file mode 100644 index 0000000..b9a73d5 --- /dev/null +++ b/mod_perl-2.0.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc +size 3784836 diff --git a/patch-PL_uid.diff b/patch-PL_uid.diff new file mode 100644 index 0000000..20bb392 --- /dev/null +++ b/patch-PL_uid.diff @@ -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 + } + +