[arch-commits] Commit in mod_perl/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, June 6, 2012 @ 15:20:00
  Author: foutrelis
Revision: 160910

upgpkg: mod_perl 2.0.7-1

New upstream release.

Modified:
  mod_perl/trunk/PKGBUILD
Deleted:
  mod_perl/trunk/mod_perl-2.0.6-perl-5.16-fixes.patch

--------------------------------------+
 PKGBUILD                             |   14 ++++----------
 mod_perl-2.0.6-perl-5.16-fixes.patch |   17 -----------------
 2 files changed, 4 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-06 17:45:54 UTC (rev 160909)
+++ PKGBUILD	2012-06-06 19:20:00 UTC (rev 160910)
@@ -4,7 +4,7 @@
 # Contributor: Tom K <tomk at runbox.com>
 
 pkgname=mod_perl
-pkgver=2.0.6
+pkgver=2.0.7
 pkgrel=1
 pkgdesc="Apache module that embeds the Perl interpreter within the server"
 arch=('i686' 'x86_64')
@@ -13,11 +13,9 @@
 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')
+        mod_perl-2.0.6-nolfs.patch)
+sha256sums=('53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6'
+            '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,10 +26,6 @@
   #   structures to be invalid if only the apache flags are used
   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
   make

Deleted: mod_perl-2.0.6-perl-5.16-fixes.patch
===================================================================
--- mod_perl-2.0.6-perl-5.16-fixes.patch	2012-06-06 17:45:54 UTC (rev 160909)
+++ mod_perl-2.0.6-perl-5.16-fixes.patch	2012-06-06 19:20:00 UTC (rev 160910)
@@ -1,17 +0,0 @@
-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
- }
-