summaryrefslogtreecommitdiff
path: root/extra/mod_perl
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-04 00:01:23 +0000
committerroot <root@rshg054.dnsready.net>2012-06-04 00:01:23 +0000
commit1e6588d64f084decf287a58b7ff93ff0ce4d0446 (patch)
tree29bf5b8778e1eb67871d9e6e8bb6e205bdde5db7 /extra/mod_perl
parent80053e720288b6205a59c52c1b31c14a0f830989 (diff)
Mon Jun 4 00:01:23 UTC 2012
Diffstat (limited to 'extra/mod_perl')
-rw-r--r--extra/mod_perl/PKGBUILD41
-rw-r--r--extra/mod_perl/mod_perl-2.0.6-nolfs.patch13
-rw-r--r--extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch17
3 files changed, 55 insertions, 16 deletions
diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD
index 0d257544b..f333c0aeb 100644
--- a/extra/mod_perl/PKGBUILD
+++ b/extra/mod_perl/PKGBUILD
@@ -1,29 +1,36 @@
-# $Id: PKGBUILD 131985 2011-07-18 18:21:39Z foutrelis $
-# Maintainer: Firmicus <francois.archlinux.org>
+# $Id: PKGBUILD 160497 2012-06-02 10:26:43Z bluewind $
+# Maintainer:
+# Contributor: Firmicus <francois.archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=mod_perl
-pkgver=2.0.5
-pkgrel=8
+pkgver=2.0.6
+pkgrel=1
pkgdesc="Apache module that embeds the Perl interpreter within the server"
-url="http://search.cpan.org/dist/${pkgname}/"
-depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid')
-license=('APACHE')
arch=('i686' 'x86_64')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz
- nolfs.patch)
-md5sums=('03d01d135a122bd8cebd0cd5b185d674'
- '088e082afef57f92f234a01269e24ce5')
+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}
+ 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/nolfs.patch"
+ 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
@@ -31,6 +38,8 @@ build() {
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make install DESTDIR=${pkgdir}
+ cd "$srcdir/$pkgname-$pkgver"
+ make install DESTDIR="$pkgdir"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/mod_perl/mod_perl-2.0.6-nolfs.patch b/extra/mod_perl/mod_perl-2.0.6-nolfs.patch
new file mode 100644
index 000000000..13e5cccee
--- /dev/null
+++ b/extra/mod_perl/mod_perl-2.0.6-nolfs.patch
@@ -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
diff --git a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
new file mode 100644
index 000000000..4e26fd87d
--- /dev/null
+++ b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
@@ -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
+ }
+