[arch-commits] Commit in mod_perl/trunk (PKGBUILD nolfs.patch)

[Evangelos Foutras]

    Date: Monday, July 18, 2011 @ 14:21:39
  Author: foutrelis
Revision: 131985

upgpkg: mod_perl 2.0.5-8
Apply patch to fix segfaults on i686. (FS#25008)

Added:
  mod_perl/trunk/nolfs.patch
Modified:
  mod_perl/trunk/PKGBUILD

-------------+
 PKGBUILD    |   15 ++++++++++++---
 nolfs.patch |   14 ++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-18 15:27:42 UTC (rev 131984)
+++ PKGBUILD	2011-07-18 18:21:39 UTC (rev 131985)
@@ -4,18 +4,27 @@
 
 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

Added: nolfs.patch
===================================================================
--- nolfs.patch	                        (rev 0)
+++ nolfs.patch	2011-07-18 18:21:39 UTC (rev 131985)
@@ -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