[arch-commits] Commit in mod_perl/repos (5 files)

Florian Pritz bluewind at archlinux.org
Sun May 27 07:42:41 UTC 2012


    Date: Sunday, May 27, 2012 @ 03:42:40
  Author: bluewind
Revision: 159856

db-move: moved mod_perl from [staging] to [testing] (i686)

Added:
  mod_perl/repos/testing-i686/
  mod_perl/repos/testing-i686/PKGBUILD
    (from rev 159819, mod_perl/repos/staging-i686/PKGBUILD)
  mod_perl/repos/testing-i686/mod_perl-2.0.6-nolfs.patch
    (from rev 159819, mod_perl/repos/staging-i686/mod_perl-2.0.6-nolfs.patch)
  mod_perl/repos/testing-i686/mod_perl-2.0.6-perl-5.16-fixes.patch
    (from rev 159819, mod_perl/repos/staging-i686/mod_perl-2.0.6-perl-5.16-fixes.patch)
Deleted:
  mod_perl/repos/staging-i686/

--------------------------------------+
 PKGBUILD                             |   45 +++++++++++++++++++++++++++++++++
 mod_perl-2.0.6-nolfs.patch           |   13 +++++++++
 mod_perl-2.0.6-perl-5.16-fixes.patch |   17 ++++++++++++
 3 files changed, 75 insertions(+)

Copied: mod_perl/repos/testing-i686/PKGBUILD (from rev 159819, mod_perl/repos/staging-i686/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-05-27 07:42:40 UTC (rev 159856)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer:
+# Contributor: Firmicus <francois.archlinux.org>
+# Contributor: Tom K <tomk at runbox.com>
+
+pkgname=mod_perl
+pkgver=2.0.6
+pkgrel=1
+pkgdesc="Apache module that embeds the Perl interpreter within the server"
+arch=('i686' 'x86_64')
+url="http://perl.apache.org/"
+license=('APACHE')
+depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid')
+options=('!emptydirs')
+source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz
+        mod_perl-2.0.6-nolfs.patch
+        mod_perl-2.0.6-perl-5.16-fixes.patch)
+sha256sums=('8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc'
+            '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08'
+            'c6cde22806b1b2d919545b21c49536c8c377c8d1f921e8948e1289bb2ab413d9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Patch from openSUSE to fix segfaults on i686 (FS#25008):
+  #   avoid a conflict between apache's LARGEFILE64_SOURCE and perl's
+  #   FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl
+  #   structures to be invalid if only the apache flags are used
+  patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch"
+
+  # Fix build with Perl 5.16
+  # http://search.cpan.org/dist/perl-5.16.0/pod/perldelta.pod#$%3C,_$%3E,_$%28_and_$%29_are_no_longer_cached
+  patch -Np1 -i "$srcdir/mod_perl-2.0.6-perl-5.16-fixes.patch"
+
+  # install module in vendor directories.
+  perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs
+  make
+}
+
+package() {
+  cd  "$srcdir/$pkgname-$pkgver"
+  make install DESTDIR="$pkgdir"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: mod_perl/repos/testing-i686/mod_perl-2.0.6-nolfs.patch (from rev 159819, mod_perl/repos/staging-i686/mod_perl-2.0.6-nolfs.patch)
===================================================================
--- testing-i686/mod_perl-2.0.6-nolfs.patch	                        (rev 0)
+++ testing-i686/mod_perl-2.0.6-nolfs.patch	2012-05-27 07:42:40 UTC (rev 159856)
@@ -0,0 +1,13 @@
+diff -upr mod_perl-2.0.6.orig/lib/Apache2/Build.pm mod_perl-2.0.6/lib/Apache2/Build.pm
+--- mod_perl-2.0.6.orig/lib/Apache2/Build.pm	2012-05-26 22:31:00.000000000 +0300
++++ mod_perl-2.0.6/lib/Apache2/Build.pm	2012-05-26 22:31:32.000000000 +0300
+@@ -2207,7 +2207,8 @@ sub has_large_files_conflict {
+     # with it is that we didn't have such a case yet, but may need to
+     # deal with it later
+ 
+-    return $perl_lfs64 ^ $apr_lfs64;
++    return 0;
++    # $perl_lfs64 ^ $apr_lfs64;
+ }
+ 
+ # if perl is built with uselargefiles, but apr not, the build won't

Copied: mod_perl/repos/testing-i686/mod_perl-2.0.6-perl-5.16-fixes.patch (from rev 159819, mod_perl/repos/staging-i686/mod_perl-2.0.6-perl-5.16-fixes.patch)
===================================================================
--- testing-i686/mod_perl-2.0.6-perl-5.16-fixes.patch	                        (rev 0)
+++ testing-i686/mod_perl-2.0.6-perl-5.16-fixes.patch	2012-05-27 07:42:40 UTC (rev 159856)
@@ -0,0 +1,17 @@
+diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c
+--- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c	2012-05-26 21:49:27.000000000 +0300
++++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c	2012-05-26 21:55:39.000000000 +0300
+@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_
+     sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid);
+ 
+-#ifndef WIN32
+-    PL_uid  = ids->uid;
+-    PL_euid = ids->euid;
+-    PL_gid  = ids->gid;
+-    PL_egid = ids->egid;
+-#endif
+-#ifdef MP_MAINTAIN_PPID
+-    PL_ppid = ids->ppid;
+-#endif
+ }
+ 




More information about the arch-commits mailing list