Hello community,

here is the log from the commit of package apache2-mod_perl for 
openSUSE:Factory checked in at 2012-06-01 22:30:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_perl (Old)
 and      /work/SRC/openSUSE:Factory/.apache2-mod_perl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "apache2-mod_perl", Maintainer is "dlova...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_perl/apache2-mod_perl.changes        
2012-04-12 09:18:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache2-mod_perl.new/apache2-mod_perl.changes   
2012-06-01 22:30:08.000000000 +0200
@@ -1,0 +2,13 @@
+Thu May 31 10:44:31 UTC 2012 - co...@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]
+
+-------------------------------------------------------------------

Old:
----
  mod_perl-2.0.5.tar.gz

New:
----
  mod_perl-2.0.6.tar.gz
  patch-PL_uid.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apache2-mod_perl.spec ++++++
--- /var/tmp/diff_new_pack.Ae9IHw/_old  2012-06-01 22:30:10.000000000 +0200
+++ /var/tmp/diff_new_pack.Ae9IHw/_new  2012-06-01 22:30:10.000000000 +0200
@@ -43,17 +43,22 @@
 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:anon...@cvs.apache.org:/home/cvspublic up -r 
MODPERL_%{apache_test_version}
 #Source1:      Apache-Test-%{apache_test_version}.tar.bz2
@@ -114,6 +119,7 @@
 #%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

++++++ lfs-perl-5.14.patch ++++++
--- /var/tmp/diff_new_pack.Ae9IHw/_old  2012-06-01 22:30:10.000000000 +0200
+++ /var/tmp/diff_new_pack.Ae9IHw/_new  2012-06-01 22:30:10.000000000 +0200
@@ -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 @@
  
      my $fixup = \&{"ccopts_$^O"};
      if (defined &$fixup) {
-@@ -2077,94 +2077,6 @@ sub inc {
+@@ -2137,94 +2137,6 @@ sub inc {
      "@includes";
  }
  
@@ -106,10 +106,10 @@
  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;

++++++ mod_perl-2.0.5.tar.gz -> mod_perl-2.0.6.tar.gz ++++++
++++ 7443 lines of diff (skipped)

++++++ patch-PL_uid.diff ++++++
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
 }
 
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to