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

[Anatol Pomozov]

    Date: Sunday, January 25, 2015 @ 04:19:17
  Author: anatolik
Revision: 126543

upgpkg: mod_perl 2.0.8-4

Change branch to trunk that suppose to have 'almost complete Apache 2.4 support'

Modified:
  mod_perl/trunk/PKGBUILD
Deleted:
  mod_perl/trunk/mod_perl-2.0.6-nolfs.patch

----------------------------+
 PKGBUILD                   |   45 ++++++++++++++-----------------------------
 mod_perl-2.0.6-nolfs.patch |   13 ------------
 2 files changed, 15 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-24 23:58:50 UTC (rev 126542)
+++ PKGBUILD	2015-01-25 03:19:17 UTC (rev 126543)
@@ -5,49 +5,34 @@
 
 pkgname=mod_perl
 pkgver=2.0.8
-pkgrel=3
-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')
-makedepends=('subversion')
-options=('!emptydirs')
+pkgrel=4
+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)
+makedepends=(subversion)
+options=(!emptydirs)
 # upstream from http://apache.org/dist/perl/$pkgname-$pkgver.tar.gz is not ready for apache 2.4 yet
 # See the discussion http://mail-archives.apache.org/mod_mbox/perl-modperl/201402.mbox/thread
-# Debian developers ported mod_perl to apache 2.4 that seems works well
-source=(mod_perl::svn+http://svn.apache.org/repos/asf/perl/modperl/branches/httpd24/#revision=1572460
-        mod_perl-2.0.6-nolfs.patch)
-sha256sums=('SKIP'
-            '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08')
+# But trunk seems almost ready for Apache 2.4
+# http://mail-archives.apache.org/mod_mbox/perl-modperl/201408.mbox/browser
+source=(mod_perl::svn+http://svn.apache.org/repos/asf/perl/modperl/trunk#revision=1654615)
+sha256sums=('SKIP')
 
-prepare() {
-  cd $pkgname
-
-  # 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"
-}
-
 build() {
-  cd $pkgname
-
-  # install module in vendor directories.
+  cd mod_perl
   perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/bin/apxs
   make
 }
 
 check() {
-  cd $pkgname
+  cd mod_perl
   # tests are very flaky
   # make test
 }
 
 package() {
-  cd $pkgname
+  cd mod_perl
   make install DESTDIR="$pkgdir"
 }
-
-# vim:set ts=2 sw=2 et:

Deleted: mod_perl-2.0.6-nolfs.patch
===================================================================
--- mod_perl-2.0.6-nolfs.patch	2015-01-24 23:58:50 UTC (rev 126542)
+++ mod_perl-2.0.6-nolfs.patch	2015-01-25 03:19:17 UTC (rev 126543)
@@ -1,13 +0,0 @@
-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