[arch-commits] Commit in postgresql/trunk (PKGBUILD perl-5.14-fix.patch)

[Dan McGee]

    Date: Wednesday, May 25, 2011 @ 18:33:15
  Author: dan
Revision: 125329

upgpkg: postgresql 9.0.4-4
rebuild for perl 5.14

Added:
  postgresql/trunk/perl-5.14-fix.patch
Modified:
  postgresql/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 perl-5.14-fix.patch |   25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-25 22:23:06 UTC (rev 125328)
+++ PKGBUILD	2011-05-25 22:33:15 UTC (rev 125329)
@@ -4,13 +4,14 @@
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.0.4
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.postgresql.org"
 license=('custom:PostgreSQL')
 makedepends=('libxml2' 'python2' 'perl')
 source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
-        postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
+        postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate
+        perl-5.14-fix.patch)
 install=postgresql.install
 
 build() {
@@ -18,6 +19,8 @@
 
   # patch to remove regress/test make target (won't build with it present)
   patch -Np1 -i ../build.patch
+  # fix for perl 5.14
+  patch -Np1 -i ../perl-5.14-fix.patch
 
   # configure
   ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
@@ -134,4 +137,5 @@
          'd63a05943cf0a2726aa2070f3033c569'
          '4d74f4227dc5e12bf95b3490758d86c9'
          '96f82c38f3f540b53f3e5144900acf17'
-         'd28e443f9f65a5712c52018b84e27137')
+         'd28e443f9f65a5712c52018b84e27137'
+         '6606e4279d91fc617b5c4dae0d76c603')

Added: perl-5.14-fix.patch
===================================================================
--- perl-5.14-fix.patch	                        (rev 0)
+++ perl-5.14-fix.patch	2011-05-25 22:33:15 UTC (rev 125329)
@@ -0,0 +1,25 @@
+--- a/src/pl/plperl/plperl.c
++++ b/src/pl/plperl/plperl.c
+@@ -926,7 +926,7 @@ plperl_trusted_init(void)
+ 		if (!isGV_with_GP(sv) || !GvCV(sv))
+ 			continue;
+ 		SvREFCNT_dec(GvCV(sv)); /* free the CV */
+-		GvCV(sv) = NULL;		/* prevent call via GV */
++		GvCV_set(sv, NULL);		/* prevent call via GV */
+ 	}
+ 	hv_clear(stash);
+ 
+--- a/src/pl/plperl/plperl.h
++++ b/src/pl/plperl/plperl.h
+@@ -49,6 +49,11 @@
+ 								(U32)HeKUTF8(he))
+ #endif
+ 
++/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
++#ifndef GvCV_set
++#define GvCV_set(gv, cv)		(GvCV(gv) = cv)
++#endif
++
+ /* declare routines from plperl.c for access by .xs files */
+ HV		   *plperl_spi_exec(char *, int);
+ void		plperl_return_next(SV *);