On Wed, Dec 02, 2020 at 01:02:46PM -0800, Jeremy Evans wrote:
> On 12/02 09:39, Christian Weisgerber wrote:
> > Jeremy Evans:
> >
> > > Now that PostgreSQL 13.1 is out, I think we can consider upgrading to
> > > it. The diff below was tested on amd64 on a partial bulk of the ports
> > > depending on PostgreSQL.
> > >
> > > Could we please have this tested in a bulk?
> >
> > I ran this through a bulk build on amd64. Two build failures were
> > attributable to it:
>
> Thank you very much for you testing. I'll try to make sure I catch
> these issues next time.
>
> > ===> databases/postgresql-plr
> > pg_backend_support.c:120:13: error: use of undeclared identifier
> > 'tag_hash'; did
> > you mean 'time_hash'?
> > ctl.hash = tag_hash;
> > ^~~~~~~~
>
> This is fixed by upgrading from plr 8.4 to 8.4.1.
>
> > ===> databases/timescaledb
> > -- Compiling against PostgreSQL version 13.1
> > -- Configuring incomplete, errors occurred!
> > See also
> > "/usr/obj/ports/timescaledb-1.7.4/build-amd64/CMakeFiles/CMakeOutput.log".
> > CMake Error at CMakeLists.txt:209 (message):
> > TimescaleDB only supports PostgreSQL 9.6.3+, 10.2+, 11 or 12
>
> TimescaleDB's master branch still doesn't support PostgreSQL 13 (they
> also dropped support for <11):
> https://github.com/timescale/timescaledb/blob/master/CMakeLists.txt#L197
>
> There is a work in progress pull request to add support, but it is
> fairly large:
> https://github.com/timescale/timescaledb/pull/2498
>
> I think it's best if we mark TimescaleDB BROKEN, as I don't think it
> should hold back the PostgreSQL upgrade.
>
Fine with me.
> Patch below with both fixes. OKs for committing the PostgreSQL 13
> update?
>
> Thanks,
> Jeremy
>
> Index: databases/timescaledb/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/timescaledb/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- databases/timescaledb/Makefile 15 Nov 2020 09:12:13 -0000 1.1.1.1
> +++ databases/timescaledb/Makefile 2 Dec 2020 20:53:33 -0000
> @@ -1,5 +1,6 @@
> # $OpenBSD: Makefile,v 1.1.1.1 2020/11/15 09:12:13 denis Exp $
>
> +BROKEN = Does not yet support PostgreSQL 13
> COMMENT = database designed to make SQL scalable for time-series data
>
> GH_ACCOUNT = timescale
> Index: databases/postgresql-plr/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/postgresql-plr/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- databases/postgresql-plr/Makefile 6 Feb 2020 00:36:58 -0000 1.6
> +++ databases/postgresql-plr/Makefile 2 Dec 2020 20:46:39 -0000
> @@ -2,8 +2,8 @@
>
> COMMENT = R procedural language for PostgreSQL
>
> -VERSION = 8.4
> -DISTNAME = REL8_4
> +VERSION = 8.4.1
> +DISTNAME = REL8_4_1
> PKGNAME = postgresql-plr-${VERSION}
>
> CATEGORIES = databases
> Index: databases/postgresql-plr/distinfo
> ===================================================================
> RCS file: /cvs/ports/databases/postgresql-plr/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- databases/postgresql-plr/distinfo 6 Feb 2020 00:36:58 -0000 1.3
> +++ databases/postgresql-plr/distinfo 2 Dec 2020 20:46:44 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (REL8_4.tar.gz) = v5w4IeY+IDsl8vrlzbdhBBb0q8y8ZSu3jp5oAHE4FjA=
> -SIZE (REL8_4.tar.gz) = 264511
> +SHA256 (REL8_4_1.tar.gz) = 3bbyA3EFtZ+d2mkw1Kme14kJXYll7G8PftW5Y6wCLgc=
> +SIZE (REL8_4_1.tar.gz) = 265142
> Index: databases/postgresql-plr/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/databases/postgresql-plr/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- databases/postgresql-plr/pkg/PLIST 6 Feb 2020 00:36:59 -0000
> 1.3
> +++ databases/postgresql-plr/pkg/PLIST 2 Dec 2020 20:47:56 -0000
> @@ -1,6 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.3 2020/02/06 00:36:59 jeremy Exp $
> -lib/postgresql/plr.so
> -share/postgresql/extension/plr--8.3.0.18--8.4.sql
> -share/postgresql/extension/plr--8.4.sql
> -share/postgresql/extension/plr--unpackaged--8.4.sql
> +@so lib/postgresql/plr.so
> +share/postgresql/extension/plr--8.4--8.4.1.sql
> +share/postgresql/extension/plr--8.4.1.sql
> +share/postgresql/extension/plr--unpackaged--8.4.1.sql
> share/postgresql/extension/plr.control
