From owner-svn-ports-head@freebsd.org Mon Jan 18 10:01:01 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69AACA85EDF; Mon, 18 Jan 2016 10:01:01 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 218141ECE; Mon, 18 Jan 2016 10:01:01 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0IA10IU005203; Mon, 18 Jan 2016 10:01:00 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0IA10Qx005198; Mon, 18 Jan 2016 10:01:00 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201601181001.u0IA10Qx005198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Mon, 18 Jan 2016 10:01:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406555 - in head/databases/pgespresso: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2016 10:01:01 -0000 Author: matthew Date: Mon Jan 18 10:00:59 2016 New Revision: 406555 URL: https://svnweb.freebsd.org/changeset/ports/406555 Log: Apply patch from upstream GitHub to provide compile- and run-time compatibility with postgresql95 Obtained from: https://github.com/2ndquadrant-it/pgespresso/commit/7bedbfb894aedff8c08de85ede430a15a8888a0a Added: head/databases/pgespresso/files/ head/databases/pgespresso/files/patch-pgespresso.c (contents, props changed) Modified: head/databases/pgespresso/Makefile Modified: head/databases/pgespresso/Makefile ============================================================================== --- head/databases/pgespresso/Makefile Mon Jan 18 09:43:54 2016 (r406554) +++ head/databases/pgespresso/Makefile Mon Jan 18 10:00:59 2016 (r406555) @@ -1,8 +1,9 @@ -# Created by: MAtthew Seaman +# Created by: Matthew Seaman # $FreeBSD$ PORTNAME= pgespresso PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= matthew@FreeBSD.org Added: head/databases/pgespresso/files/patch-pgespresso.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgespresso/files/patch-pgespresso.c Mon Jan 18 10:00:59 2016 (r406555) @@ -0,0 +1,42 @@ +--- pgespresso.c.orig 2014-04-11 10:46:36 UTC ++++ pgespresso.c +@@ -78,10 +78,38 @@ pgespresso_start_backup(PG_FUNCTION_ARGS + } + + /* ++ * Starting from 9.5 the do_pg_start_backup caller needs to allocate the ++ * 'pg_tblspc' directory and pass it as argument. ++ * ++ * Ref: http://git.postgresql.org/gitweb/?p=postgresql.git;h=72d422a ++ */ ++ #if PG_VERSION_NUM >= 90500 ++ { ++ DIR *dir; ++ ++ /* Make sure we can open the directory with ++ tablespaces in it */ ++ dir = AllocateDir("pg_tblspc"); ++ ++ if (!dir) ++ ereport(ERROR, ++ (errmsg("could not open directory \"%s\": %m", "pg_tblspc"))); ++ ++ /* ++ * We are not filling the tablespace map here. ++ * This means that on 9.5 the 'tablespace_map' file has to be ++ * generated by the invoker. ++ */ ++ do_pg_start_backup(backupidstr, fast, NULL, &labelfile, ++ dir, NULL, NULL, false, false); ++ ++ FreeDir(dir); ++ } ++ /* + * Starting from 9.3 the do_pg_start_backup returns the timeline ID + * in *starttli_p additional argument + */ +- #if PG_VERSION_NUM >= 90300 ++ #elif PG_VERSION_NUM >= 90300 + do_pg_start_backup(backupidstr, fast, NULL, &labelfile); + #else + do_pg_start_backup(backupidstr, fast, &labelfile);