diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-29 23:10:39 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-29 23:10:39 +0000 |
| commit | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (patch) | |
| tree | 438c05155823f16b71f4277fef949610bf6fe826 /extra/postgresql | |
| parent | 108636e69eaeef67f4e7263c7f26105e25979e89 (diff) | |
Wed Jun 29 23:10:38 UTC 2011
Diffstat (limited to 'extra/postgresql')
| -rw-r--r-- | extra/postgresql/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/postgresql/perl-5.14-fix.patch | 25 |
2 files changed, 33 insertions, 4 deletions
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index a0d0e3cc5..d5a887585 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 122182 2011-05-02 17:54:57Z dan $ +# $Id: PKGBUILD 125329 2011-05-25 22:33:15Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> 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 @@ build() { # 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 @@ md5sums=('80390514d568a7af5ab61db1cda27e29' 'd63a05943cf0a2726aa2070f3033c569' '4d74f4227dc5e12bf95b3490758d86c9' '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137') + 'd28e443f9f65a5712c52018b84e27137' + '6606e4279d91fc617b5c4dae0d76c603') diff --git a/extra/postgresql/perl-5.14-fix.patch b/extra/postgresql/perl-5.14-fix.patch new file mode 100644 index 000000000..82ef7d688 --- /dev/null +++ b/extra/postgresql/perl-5.14-fix.patch @@ -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 *); |