Date: Sunday, June 1, 2014 @ 13:09:14 Author: bluewind Revision: 213969
db-move: moved mod_perl from [staging] to [testing] (i686, x86_64) Added: mod_perl/repos/testing-i686/ mod_perl/repos/testing-i686/PKGBUILD (from rev 213950, mod_perl/repos/staging-i686/PKGBUILD) mod_perl/repos/testing-i686/mod_perl-2.0.6-nolfs.patch (from rev 213950, mod_perl/repos/staging-i686/mod_perl-2.0.6-nolfs.patch) mod_perl/repos/testing-x86_64/ mod_perl/repos/testing-x86_64/PKGBUILD (from rev 213950, mod_perl/repos/staging-x86_64/PKGBUILD) mod_perl/repos/testing-x86_64/mod_perl-2.0.6-nolfs.patch (from rev 213950, mod_perl/repos/staging-x86_64/mod_perl-2.0.6-nolfs.patch) Deleted: mod_perl/repos/staging-i686/ mod_perl/repos/staging-x86_64/ -------------------------------------------+ testing-i686/PKGBUILD | 53 ++++++++++++++++++++++++++++ testing-i686/mod_perl-2.0.6-nolfs.patch | 13 ++++++ testing-x86_64/PKGBUILD | 53 ++++++++++++++++++++++++++++ testing-x86_64/mod_perl-2.0.6-nolfs.patch | 13 ++++++ 4 files changed, 132 insertions(+) Copied: mod_perl/repos/testing-i686/PKGBUILD (from rev 213950, mod_perl/repos/staging-i686/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-06-01 11:09:14 UTC (rev 213969) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: +# Contributor: Firmicus <francois.archlinux.org> +# Contributor: Tom K <t...@runbox.com> + +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') +# 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') + +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. + perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/bin/apxs + make +} + +check() { + cd $pkgname + # tests are very flaky + # make test +} + +package() { + cd $pkgname + 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 213950, 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 2014-06-01 11:09:14 UTC (rev 213969) @@ -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-x86_64/PKGBUILD (from rev 213950, mod_perl/repos/staging-x86_64/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-06-01 11:09:14 UTC (rev 213969) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: +# Contributor: Firmicus <francois.archlinux.org> +# Contributor: Tom K <t...@runbox.com> + +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') +# 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') + +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. + perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/bin/apxs + make +} + +check() { + cd $pkgname + # tests are very flaky + # make test +} + +package() { + cd $pkgname + make install DESTDIR="$pkgdir" +} + +# vim:set ts=2 sw=2 et: Copied: mod_perl/repos/testing-x86_64/mod_perl-2.0.6-nolfs.patch (from rev 213950, mod_perl/repos/staging-x86_64/mod_perl-2.0.6-nolfs.patch) =================================================================== --- testing-x86_64/mod_perl-2.0.6-nolfs.patch (rev 0) +++ testing-x86_64/mod_perl-2.0.6-nolfs.patch 2014-06-01 11:09:14 UTC (rev 213969) @@ -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