diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-19 23:13:08 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-19 23:13:08 +0000 |
| commit | 94e3eb45cd3402cbc5efd70ae725e8d48ed696af (patch) | |
| tree | 5f43e51e770fce190ea2732d7784460e4a34b351 /extra/mod_perl | |
| parent | 040215f1ca1d14472525c2562bc33e84f9728d4a (diff) | |
Tue Jul 19 23:13:07 UTC 2011
Diffstat (limited to 'extra/mod_perl')
| -rw-r--r-- | extra/mod_perl/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/mod_perl/nolfs.patch | 14 |
2 files changed, 27 insertions, 4 deletions
diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index 9f3595deb..0d257544b 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,21 +1,30 @@ -# $Id: PKGBUILD 129799 2011-06-28 23:07:22Z angvp $ +# $Id: PKGBUILD 131985 2011-07-18 18:21:39Z foutrelis $ # Maintainer: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl pkgver=2.0.5 -pkgrel=7 +pkgrel=8 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) -md5sums=('03d01d135a122bd8cebd0cd5b185d674') +source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz + nolfs.patch) +md5sums=('03d01d135a122bd8cebd0cd5b185d674' + '088e082afef57f92f234a01269e24ce5') 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/nolfs.patch" + # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs make diff --git a/extra/mod_perl/nolfs.patch b/extra/mod_perl/nolfs.patch new file mode 100644 index 000000000..3eb345b66 --- /dev/null +++ b/extra/mod_perl/nolfs.patch @@ -0,0 +1,14 @@ +Index: mod_perl-2.0.5/lib/Apache2/Build.pm +=================================================================== +--- mod_perl-2.0.5.orig/lib/Apache2/Build.pm 2011-02-02 21:23:47.000000000 +0100 ++++ mod_perl-2.0.5/lib/Apache2/Build.pm 2011-05-26 17:12:46.276946520 +0200 +@@ -2147,7 +2147,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 |