Re: PostgreSQL 13.1 Upgrade

2021-02-05 Thread Pierre-Emmanuel Andr??
On Thu, Feb 04, 2021 at 01:32:31PM +, Stuart Henderson wrote:
> > >  @conflict postgresql-*
> > > -@ask-update postgresql-server-<${V_MAJOR} Make sure your existing 
> > > database is backed up
> > > +@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
> > > pg_upgrade, make sure your database is backed up
> > 
> > 
> > yes ok pea@
> 
> Here is an updated version of the pgsql 13.1 update, based on
> https://marc.info/?l=openbsd-ports=160592088315669=2 with the
> above and the following other changes (some of which were mentioned
> in the thread but I didn't find another full diff):
> 
> - don't bump libraries unnecessarily; only pq has a minor bump
> - https homepage
> - sync WANTLIB/LIB_DEPENDS
> - knock out backtrace_symbols/libexecinfo (found by Mark Patruck ;)
> - line up some tabs
> 
> this one is OK with me

ok pea@ too

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.266
> diff -u -p -r1.266 Makefile
> --- Makefile  14 Nov 2020 13:03:49 -  1.266
> +++ Makefile  4 Feb 2021 13:28:44 -
> @@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
>  COMMENT-plpython=Python procedural language for PostgreSQL
>  COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous 
> version
>  
> -VERSION= 12.5
> -PREV_MAJOR=  11
> +VERSION= 13.1
> +PREV_MAJOR=  12
>  DISTNAME=postgresql-${VERSION}
>  PKGNAME-main=postgresql-client-${VERSION}
>  PKGNAME-server=  postgresql-server-${VERSION}
> @@ -16,16 +16,16 @@ PKGNAME-docs= postgresql-docs-${VERSION}
>  PKGNAME-contrib=postgresql-contrib-${VERSION}
>  PKGNAME-plpython=postgresql-plpython-${VERSION}
>  PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> -REVISION-server= 0
>  
> +DPB_PROPERTIES=  parallel
>  
>  CATEGORIES=  databases
>  SHARED_LIBS= ecpg7.10 \
>   ecpg_compat 4.10 \
>   pgtypes 4.9 \
> - pq  6.11
> + pq  6.12
>  
> -HOMEPAGE=http://www.postgresql.org/
> +HOMEPAGE=https://www.postgresql.org/
>  
>  MAINTAINER=  Pierre-Emmanuel Andre 
>  
> @@ -51,10 +51,12 @@ MODULES=  lang/python
>  MODPY_RUNDEP=No
>  
>  CONFIGURE_ENV=   ac_cv_path_PYTHON=${MODPY_BIN} \
> + ac_cv_search_backtrace_symbols=no \
>   CPPFLAGS="-I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib"
>  
> -CONFIGURE_ARGS=  --disable-rpath --with-openssl=/usr \
> +CONFIGURE_ARGS=  --disable-rpath \
> + --with-openssl=/usr \
>   --with-bsd-auth \
>   --with-perl \
>   --with-python \
> @@ -76,7 +78,7 @@ CONFIGURE_ARGS= --disable-rpath --with-o
>  # (apparently) a serious performance hit doing this.
>  
>  .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "hppa"
> -CONFIGURE_ARGS+=--disable-spinlocks
> +CONFIGURE_ARGS+= --disable-spinlocks
>  .endif
>  
>  # To avoid problems with missed floating point overflow checks.
> @@ -96,30 +98,27 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conf
>  ALL_TARGET=  world
>  INSTALL_TARGET=  install-world
>  
> -LIB_DEPENDS-main=archivers/xz \
> - converters/libiconv \
> - textproc/libxml
> -WANTLIB-main =   ${WANTLIB} iconv lzma xml2
> +LIB_DEPENDS-main=textproc/libxml
> +WANTLIB-main=${WANTLIB} xml2
>  
> -
> -LIB_DEPENDS-server= databases/postgresql=${VERSION} \
> - ${LIB_DEPENDS-main}
> -WANTLIB-server=  ${WANTLIB-main} perl pq
> -
> -RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
> -LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
> -  ${LIB_DEPENDS-main}
> +LIB_DEPENDS-server=  databases/postgresql=${VERSION} \
> + ${LIB_DEPENDS-main}
> +WANTLIB-server=  ${WANTLIB-main} perl pq
> +
> +RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
> +LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
> + ${LIB_DEPENDS-main}
>  WANTLIB-contrib= ${WANTLIB-main} perl pq
>  
>  RUN_DEPENDS-pg_upgrade=  databases/postgresql,-server=${VERSION} \
>   databases/postgresql-previous>=${PREV_MAJOR}
>  LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
> -  ${LIB_DEPENDS-main}
> + ${LIB_DEPENDS-main}
>  
> -WANTLIB-pg_upgrade = ${WANTLIB-main} pq
> +WANTLIB-pg_upgrade=  ${WANTLIB-main} pq
>  
>  LIB_DEPENDS-plpython=${MODPY_LIB_DEPENDS}
> -WANTLIB-plpython =   c m pthread util \
> +WANTLIB-plpython=c intl m pthread util \
>   ${MODPY_WANTLIB}
>  RUN_DEPENDS-plpython=databases/postgresql,-server=${VERSION}
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/postgresql/distinfo,v
> retrieving 

Re: PostgreSQL 13.1 Upgrade

2021-02-04 Thread Stuart Henderson
> >  @conflict postgresql-*
> > -@ask-update postgresql-server-<${V_MAJOR} Make sure your existing database 
> > is backed up
> > +@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
> > pg_upgrade, make sure your database is backed up
> 
> 
> yes ok pea@

Here is an updated version of the pgsql 13.1 update, based on
https://marc.info/?l=openbsd-ports=160592088315669=2 with the
above and the following other changes (some of which were mentioned
in the thread but I didn't find another full diff):

- don't bump libraries unnecessarily; only pq has a minor bump
- https homepage
- sync WANTLIB/LIB_DEPENDS
- knock out backtrace_symbols/libexecinfo (found by Mark Patruck ;)
- line up some tabs

this one is OK with me


Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.266
diff -u -p -r1.266 Makefile
--- Makefile14 Nov 2020 13:03:49 -  1.266
+++ Makefile4 Feb 2021 13:28:44 -
@@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
 COMMENT-plpython=Python procedural language for PostgreSQL
 COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
-VERSION=   12.5
-PREV_MAJOR=11
+VERSION=   13.1
+PREV_MAJOR=12
 DISTNAME=  postgresql-${VERSION}
 PKGNAME-main=  postgresql-client-${VERSION}
 PKGNAME-server=postgresql-server-${VERSION}
@@ -16,16 +16,16 @@ PKGNAME-docs=   postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 PKGNAME-plpython=postgresql-plpython-${VERSION}
 PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-server= 0
 
+DPB_PROPERTIES=parallel
 
 CATEGORIES=databases
 SHARED_LIBS=   ecpg7.10 \
ecpg_compat 4.10 \
pgtypes 4.9 \
-   pq  6.11
+   pq  6.12
 
-HOMEPAGE=  http://www.postgresql.org/
+HOMEPAGE=  https://www.postgresql.org/
 
 MAINTAINER=Pierre-Emmanuel Andre 
 
@@ -51,10 +51,12 @@ MODULES=lang/python
 MODPY_RUNDEP=  No
 
 CONFIGURE_ENV= ac_cv_path_PYTHON=${MODPY_BIN} \
+   ac_cv_search_backtrace_symbols=no \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-CONFIGURE_ARGS=--disable-rpath --with-openssl=/usr \
+CONFIGURE_ARGS=--disable-rpath \
+   --with-openssl=/usr \
--with-bsd-auth \
--with-perl \
--with-python \
@@ -76,7 +78,7 @@ CONFIGURE_ARGS=   --disable-rpath --with-o
 # (apparently) a serious performance hit doing this.
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "hppa"
-CONFIGURE_ARGS+=--disable-spinlocks
+CONFIGURE_ARGS+= --disable-spinlocks
 .endif
 
 # To avoid problems with missed floating point overflow checks.
@@ -96,30 +98,27 @@ MODGNU_CONFIG_GUESS_DIRS=   ${WRKSRC}/conf
 ALL_TARGET=world
 INSTALL_TARGET=install-world
 
-LIB_DEPENDS-main=  archivers/xz \
-   converters/libiconv \
-   textproc/libxml
-WANTLIB-main = ${WANTLIB} iconv lzma xml2
+LIB_DEPENDS-main=  textproc/libxml
+WANTLIB-main=  ${WANTLIB} xml2
 
-
-LIB_DEPENDS-server= databases/postgresql=${VERSION} \
-   ${LIB_DEPENDS-main}
-WANTLIB-server=${WANTLIB-main} perl pq
-
-RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
-LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
-${LIB_DEPENDS-main}
+LIB_DEPENDS-server=databases/postgresql=${VERSION} \
+   ${LIB_DEPENDS-main}
+WANTLIB-server=${WANTLIB-main} perl pq
+
+RUN_DEPENDS-contrib=   databases/postgresql,-server=${VERSION}
+LIB_DEPENDS-contrib=   databases/postgresql=${VERSION} \
+   ${LIB_DEPENDS-main}
 WANTLIB-contrib=   ${WANTLIB-main} perl pq
 
 RUN_DEPENDS-pg_upgrade=databases/postgresql,-server=${VERSION} \
databases/postgresql-previous>=${PREV_MAJOR}
 LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
-${LIB_DEPENDS-main}
+   ${LIB_DEPENDS-main}
 
-WANTLIB-pg_upgrade =   ${WANTLIB-main} pq
+WANTLIB-pg_upgrade=${WANTLIB-main} pq
 
 LIB_DEPENDS-plpython=  ${MODPY_LIB_DEPENDS}
-WANTLIB-plpython = c m pthread util \
+WANTLIB-plpython=  c intl m pthread util \
${MODPY_WANTLIB}
 RUN_DEPENDS-plpython=  databases/postgresql,-server=${VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.86
diff -u -p -r1.86 distinfo
--- distinfo13 Nov 2020 19:00:10 -  1.86
+++ distinfo4 Feb 2021 13:28:44 -
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.5.tar.gz) = 2IPpfP0ss7OrqUkVQdtrMM/jO7akAxzbCOxQFNBNbpY=
-SIZE (postgresql-12.5.tar.gz) = 27137095

Re: PostgreSQL 13.1 Upgrade

2021-02-04 Thread Pierre-Emmanuel Andr??
On Thu, Feb 04, 2021 at 09:33:48AM +, Stuart Henderson wrote:
> On 2021/02/03 21:22, Pierre-Emmanuel Andr?? wrote:
> > On Mon, Feb 01, 2021 at 05:00:41PM -0800, Jeremy Evans wrote:
> > > On 02/01 07:24, Daniel Jakots wrote:
> > > > Hi Pierre-Emmanuel and Jeremy,
> > > > 
> > > > Is there anything blocking the update?
> > > 
> > > Nothing for me.  pea@ can handle the commits whenever he sees fit, or if
> > > he gives his OK, I can handle the commits.
> > >
> > 
> > I will not be able to commit before this week end. If you can do it before, 
> > go ahead.
> > ok pea@
> > 
> 
> What do you think about adding this to it?
> 
> 
> Index: pkg/PLIST-server
> ===
> RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
> retrieving revision 1.40
> diff -u -p -r1.40 PLIST-server
> --- pkg/PLIST-server  24 Sep 2020 13:11:46 -  1.40
> +++ pkg/PLIST-server  4 Feb 2021 09:31:59 -
> @@ -4,7 +4,7 @@
>  @conflict postgresql-clients-*
>  @conflict postgresql-server-*
>  @conflict postgresql-*
> -@ask-update postgresql-server-<${V_MAJOR} Make sure your existing database 
> is backed up
> +@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
> pg_upgrade, make sure your database is backed up
>  @newgroup _postgresql:503
>  @newuser _postgresql:503:_postgresql:daemon:PostgreSQL 
> Manager:/var/postgresql:/bin/sh
>  @bin bin/initdb


yes ok pea@



Re: PostgreSQL 13.1 Upgrade

2021-02-04 Thread Stuart Henderson
On 2021/02/03 21:22, Pierre-Emmanuel Andr?? wrote:
> On Mon, Feb 01, 2021 at 05:00:41PM -0800, Jeremy Evans wrote:
> > On 02/01 07:24, Daniel Jakots wrote:
> > > Hi Pierre-Emmanuel and Jeremy,
> > > 
> > > Is there anything blocking the update?
> > 
> > Nothing for me.  pea@ can handle the commits whenever he sees fit, or if
> > he gives his OK, I can handle the commits.
> >
> 
> I will not be able to commit before this week end. If you can do it before, 
> go ahead.
> ok pea@
> 

What do you think about adding this to it?


Index: pkg/PLIST-server
===
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v
retrieving revision 1.40
diff -u -p -r1.40 PLIST-server
--- pkg/PLIST-server24 Sep 2020 13:11:46 -  1.40
+++ pkg/PLIST-server4 Feb 2021 09:31:59 -
@@ -4,7 +4,7 @@
 @conflict postgresql-clients-*
 @conflict postgresql-server-*
 @conflict postgresql-*
-@ask-update postgresql-server-<${V_MAJOR} Make sure your existing database is 
backed up
+@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for 
pg_upgrade, make sure your database is backed up
 @newgroup _postgresql:503
 @newuser _postgresql:503:_postgresql:daemon:PostgreSQL 
Manager:/var/postgresql:/bin/sh
 @bin bin/initdb



Re: PostgreSQL 13.1 Upgrade

2021-02-03 Thread Pierre-Emmanuel Andr??
On Mon, Feb 01, 2021 at 05:00:41PM -0800, Jeremy Evans wrote:
> On 02/01 07:24, Daniel Jakots wrote:
> > Hi Pierre-Emmanuel and Jeremy,
> > 
> > Is there anything blocking the update?
> 
> Nothing for me.  pea@ can handle the commits whenever he sees fit, or if
> he gives his OK, I can handle the commits.
>

I will not be able to commit before this week end. If you can do it before, go 
ahead.
ok pea@



Re: PostgreSQL 13.1 Upgrade

2021-02-01 Thread Jeremy Evans
On 02/01 07:24, Daniel Jakots wrote:
> Hi Pierre-Emmanuel and Jeremy,
> 
> Is there anything blocking the update?

Nothing for me.  pea@ can handle the commits whenever he sees fit, or if
he gives his OK, I can handle the commits.

Thanks,
Jeremy



Re: PostgreSQL 13.1 Upgrade

2021-02-01 Thread Daniel Jakots
Hi Pierre-Emmanuel and Jeremy,

Is there anything blocking the update?

Cheers,
Daniel



Re: PostgreSQL 13.1 Upgrade

2021-01-26 Thread Daniel Jakots
On Tue, 26 Jan 2021 11:03:25 +0100, Pierre-Emmanuel André
 wrote:

> I made this small change to database/postgresql/Makefile to fix
> WANTLIB:
> 
> @@ -99,7 +98,7 @@ INSTALL_TARGET=   install-world
>  LIB_DEPENDS-main=  archivers/xz \
> converters/libiconv \
> textproc/libxml
> -WANTLIB-main = ${WANTLIB} iconv lzma xml2
> +WANTLIB-main = ${WANTLIB} xml2
>  
>  
>  LIB_DEPENDS-server= databases/postgresql=${VERSION} \
> @@ -119,7 +118,7 @@ LIB_DEPENDS-pg_upgrade= databases/postgr
>  WANTLIB-pg_upgrade =   ${WANTLIB-main} pq
>  
>  LIB_DEPENDS-plpython=  ${MODPY_LIB_DEPENDS}
> -WANTLIB-plpython = c m pthread util \
> +WANTLIB-plpython = c intl m pthread util \
> ${MODPY_WANTLIB}
>  RUN_DEPENDS-plpython=  databases/postgresql,-server=${VERSION}

That solves it, thanks!

ok danj@ for the whole thing.

Cheers,
Daniel



Re: PostgreSQL 13.1 Upgrade

2021-01-26 Thread Pierre-Emmanuel André
On Tue, Jan 26, 2021 at 09:20:55AM +0100, Pierre-Emmanuel André wrote:
> On Mon, Jan 25, 2021 at 08:43:26PM -0500, Daniel Jakots wrote:
> > On Fri, 20 Nov 2020 17:06:13 -0800, Jeremy Evans 
> > wrote:
> > 
> > > Could we please have this tested in a bulk?  Assuming there are no
> > > problems in a bulk, OKs?
> > 
> > Thanks for the diff!
> > I updated my server to it. It works fine for me.
> > 
> > There is:
> > /usr/ports/databases/postgresql$ make port-lib-depends-check
> > 
> > postgresql-client-13.1(databases/postgresql,-main):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-server-13.1(databases/postgresql,-server):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-contrib-13.1(databases/postgresql,-contrib):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-pg_upgrade-13.1(databases/postgresql,-pg_upgrade):
> > Extra:  iconv.7 lzma.2
> > 
> > postgresql-plpython-13.1(databases/postgresql,-plpython):
> > Missing: intl.7 from gettext-runtime-0.21p0
> > (/usr/local/lib/postgresql/plpython2.so) WANTLIB +=   intl
> > *** Error 1 in target 'port-lib-depends-check' (ignored)
> > 
> > 
> > I haven't checked if the current 12.5 does the same or not, and I'm too
> > lazy to move my ports tree back to it to check (when do we switch to
> > got(1)?? :P).
> > 
> > 
> > Also it seems the current maintainer is very busy/unresponsive so
> > maybe it would make sense if you took maintainership?
> > 
> > 
> > Cheers,
> > Daniel
> 
> 
> 
> Hello,
> 
> Sorry for the late answer. It took me a long time to upgrade my biggest 
> system to pg13.
> The diff looks good for me but i have some random failures on regress tests.
> Sometimes on regproc or another times on prepared_xacts.
> You never saw that ?
> 


Nevermind it was a local issue.
I made this small change to database/postgresql/Makefile to fix WANTLIB:

@@ -99,7 +98,7 @@ INSTALL_TARGET=   install-world
 LIB_DEPENDS-main=  archivers/xz \
converters/libiconv \
textproc/libxml
-WANTLIB-main = ${WANTLIB} iconv lzma xml2
+WANTLIB-main = ${WANTLIB} xml2
 
 
 LIB_DEPENDS-server= databases/postgresql=${VERSION} \
@@ -119,7 +118,7 @@ LIB_DEPENDS-pg_upgrade= databases/postgr
 WANTLIB-pg_upgrade =   ${WANTLIB-main} pq
 
 LIB_DEPENDS-plpython=  ${MODPY_LIB_DEPENDS}
-WANTLIB-plpython = c m pthread util \
+WANTLIB-plpython = c intl m pthread util \
${MODPY_WANTLIB}
 RUN_DEPENDS-plpython=  databases/postgresql,-server=${VERSION}
 



Re: PostgreSQL 13.1 Upgrade

2021-01-26 Thread Pierre-Emmanuel André
On Mon, Jan 25, 2021 at 08:43:26PM -0500, Daniel Jakots wrote:
> On Fri, 20 Nov 2020 17:06:13 -0800, Jeremy Evans 
> wrote:
> 
> > Could we please have this tested in a bulk?  Assuming there are no
> > problems in a bulk, OKs?
> 
> Thanks for the diff!
> I updated my server to it. It works fine for me.
> 
> There is:
> /usr/ports/databases/postgresql$ make port-lib-depends-check
> 
> postgresql-client-13.1(databases/postgresql,-main):
> Extra:  iconv.7 lzma.2
> 
> postgresql-server-13.1(databases/postgresql,-server):
> Extra:  iconv.7 lzma.2
> 
> postgresql-contrib-13.1(databases/postgresql,-contrib):
> Extra:  iconv.7 lzma.2
> 
> postgresql-pg_upgrade-13.1(databases/postgresql,-pg_upgrade):
> Extra:  iconv.7 lzma.2
> 
> postgresql-plpython-13.1(databases/postgresql,-plpython):
> Missing: intl.7 from gettext-runtime-0.21p0
> (/usr/local/lib/postgresql/plpython2.so) WANTLIB +=   intl
> *** Error 1 in target 'port-lib-depends-check' (ignored)
> 
> 
> I haven't checked if the current 12.5 does the same or not, and I'm too
> lazy to move my ports tree back to it to check (when do we switch to
> got(1)?? :P).
> 
> 
> Also it seems the current maintainer is very busy/unresponsive so
> maybe it would make sense if you took maintainership?
> 
> 
> Cheers,
> Daniel



Hello,

Sorry for the late answer. It took me a long time to upgrade my biggest system 
to pg13.
The diff looks good for me but i have some random failures on regress tests.
Sometimes on regproc or another times on prepared_xacts.
You never saw that ?



Re: PostgreSQL 13.1 Upgrade

2021-01-25 Thread Daniel Jakots
On Fri, 20 Nov 2020 17:06:13 -0800, Jeremy Evans 
wrote:

> Could we please have this tested in a bulk?  Assuming there are no
> problems in a bulk, OKs?

Thanks for the diff!
I updated my server to it. It works fine for me.

There is:
/usr/ports/databases/postgresql$ make port-lib-depends-check

postgresql-client-13.1(databases/postgresql,-main):
Extra:  iconv.7 lzma.2

postgresql-server-13.1(databases/postgresql,-server):
Extra:  iconv.7 lzma.2

postgresql-contrib-13.1(databases/postgresql,-contrib):
Extra:  iconv.7 lzma.2

postgresql-pg_upgrade-13.1(databases/postgresql,-pg_upgrade):
Extra:  iconv.7 lzma.2

postgresql-plpython-13.1(databases/postgresql,-plpython):
Missing: intl.7 from gettext-runtime-0.21p0
(/usr/local/lib/postgresql/plpython2.so) WANTLIB +=   intl
*** Error 1 in target 'port-lib-depends-check' (ignored)


I haven't checked if the current 12.5 does the same or not, and I'm too
lazy to move my ports tree back to it to check (when do we switch to
got(1)?? :P).


Also it seems the current maintainer is very busy/unresponsive so
maybe it would make sense if you took maintainership?


Cheers,
Daniel



Re: PostgreSQL 13.1 Upgrade / update to TimescaleDB 2.0.0

2020-12-21 Thread Denis Fondras
Le Wed, Dec 02, 2020 at 10:15:48PM +0100, Denis Fondras a écrit :
> > 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.
> > 
> 

Here is the update to TimescaleDB 2.0.0 which supports PG13.

Index: Makefile
===
RCS file: /cvs/ports/databases/timescaledb/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile15 Nov 2020 09:12:13 -  1.1.1.1
+++ Makefile21 Dec 2020 19:09:30 -
@@ -4,7 +4,7 @@ COMMENT =   database designed to make SQL 
 
 GH_ACCOUNT =   timescale
 GH_PROJECT =   timescaledb
-GH_TAGNAME =   1.7.4
+GH_TAGNAME =   2.0.0
 
 CATEGORIES =   databases
 HOMEPAGE = https://www.timescale.com/
Index: distinfo
===
RCS file: /cvs/ports/databases/timescaledb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo15 Nov 2020 09:12:13 -  1.1.1.1
+++ distinfo21 Dec 2020 19:09:30 -
@@ -1,2 +1,2 @@
-SHA256 (timescaledb-1.7.4.tar.gz) = 
0LehU/8+AuzwM6hp7N9ChvhhDqdhQLqoSSj8OoAiPpk=
-SIZE (timescaledb-1.7.4.tar.gz) = 1974350
+SHA256 (timescaledb-2.0.0.tar.gz) = 
906+u0Rh5Odyc2FVUcz5JQ+sC973vaz1yS7jpohNd4I=
+SIZE (timescaledb-2.0.0.tar.gz) = 2210230
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/timescaledb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   15 Nov 2020 09:12:13 -  1.1.1.1
+++ pkg/PLIST   21 Dec 2020 19:09:30 -
@@ -1,50 +1,30 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2020/11/15 09:12:13 denis Exp $
-@so lib/postgresql/timescaledb-1.7.4.so
+@so lib/postgresql/timescaledb-2.0.0.so
 @so lib/postgresql/timescaledb.so
 share/doc/pkg-readmes/${PKGSTEM}
-share/postgresql/extension/timescaledb--0.1.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.10.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.10.1--1.7.4.sql
-share/postgresql/extension/timescaledb--0.11.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.12.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.12.1--1.7.4.sql
-share/postgresql/extension/timescaledb--0.2.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.3.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.4.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.4.1--1.7.4.sql
-share/postgresql/extension/timescaledb--0.4.2--1.7.4.sql
-share/postgresql/extension/timescaledb--0.5.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.6.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.6.1--1.7.4.sql
-share/postgresql/extension/timescaledb--0.7.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.7.1--1.7.4.sql
-share/postgresql/extension/timescaledb--0.8.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.9.0--1.7.4.sql
-share/postgresql/extension/timescaledb--0.9.1--1.7.4.sql
-share/postgresql/extension/timescaledb--0.9.2--1.7.4.sql
-share/postgresql/extension/timescaledb--1.0.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.0.0-rc1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.0.0-rc2--1.7.4.sql
-share/postgresql/extension/timescaledb--1.0.0-rc3--1.7.4.sql
-share/postgresql/extension/timescaledb--1.0.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.1.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.1.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.2.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.2.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.2.2--1.7.4.sql
-share/postgresql/extension/timescaledb--1.3.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.3.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.3.2--1.7.4.sql
-share/postgresql/extension/timescaledb--1.4.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.4.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.4.2--1.7.4.sql
-share/postgresql/extension/timescaledb--1.5.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.5.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.6.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.6.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.7.0--1.7.4.sql
-share/postgresql/extension/timescaledb--1.7.1--1.7.4.sql
-share/postgresql/extension/timescaledb--1.7.2--1.7.4.sql
-share/postgresql/extension/timescaledb--1.7.3--1.7.4.sql
-share/postgresql/extension/timescaledb--1.7.4.sql
+share/postgresql/extension/timescaledb--1.1.0--2.0.0.sql
+share/postgresql/extension/timescaledb--1.1.1--2.0.0.sql

Re: PostgreSQL 13.1 Upgrade

2020-12-02 Thread Denis Fondras
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/Makefile15 Nov 2020 09:12:13 -  1.1.1.1
> +++ databases/timescaledb/Makefile2 Dec 2020 20:53:33 -
> @@ -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 -   1.6
> +++ databases/postgresql-plr/Makefile 2 Dec 2020 20:46:39 -
> @@ -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 -   1.3
> +++ databases/postgresql-plr/distinfo 2 Dec 2020 20:46:44 -
> @@ -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/PLIST6 Feb 2020 00:36:59 -   
> 1.3
> +++ databases/postgresql-plr/pkg/PLIST2 Dec 2020 20:47:56 -
> @@ -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



Re: PostgreSQL 13.1 Upgrade

2020-12-02 Thread Jeremy Evans
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.

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 -  1.1.1.1
+++ databases/timescaledb/Makefile  2 Dec 2020 20:53:33 -
@@ -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 -   1.6
+++ databases/postgresql-plr/Makefile   2 Dec 2020 20:46:39 -
@@ -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 -   1.3
+++ databases/postgresql-plr/distinfo   2 Dec 2020 20:46:44 -
@@ -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 -   1.3
+++ databases/postgresql-plr/pkg/PLIST  2 Dec 2020 20:47:56 -
@@ -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



Re: PostgreSQL 13.1 Upgrade

2020-12-02 Thread Christian Weisgerber
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:

===> 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;
   ^~~~

===> 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

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



skytools [was Re: PostgreSQL 13.1 Upgrade]

2020-11-21 Thread Stuart Henderson
On 2020/11/20 17:06, Jeremy Evans wrote:
> skytools patch to fix build (dead upstream for about 3 years)

it's still actively developed, but has been reorganized into separate
projects (py-skytools, pgq, londiste, walmgr etc).

Since the current distfile is no longer available here's an update to
the most recent skytools-legacy version (the patches will still be
needed for 13.x though).. is anyone still using this that can test?

Index: Makefile
===
RCS file: /cvs/ports/databases/skytools/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile20 Mar 2020 16:44:22 -  1.32
+++ Makefile21 Nov 2020 14:06:55 -
@@ -2,44 +2,52 @@
 
 COMMENT=   PostgreSQL tools from Skype
 
-# XXX outdated; http://pgfoundry.org/frs/download.php/3622/skytools-3.2.tar.gz
-MODPY_EGG_VERSION= 3.1.1
-DISTNAME=  skytools-${MODPY_EGG_VERSION}
-REVISION=  6
+MODPY_EGG_VERSION= 3.2.6
+GH_ACCOUNT=pgq
+GH_PROJECT=skytools-legacy
+GH_TAGNAME=${MODPY_EGG_VERSION}
+PKGNAME=   skytools-${MODPY_EGG_VERSION}
 
 CATEGORIES=databases
 
-HOMEPAGE=  http://pgfoundry.org/projects/skytools
+HOMEPAGE=  https://wiki.postgresql.org/wiki/SkyTools
 
 MAINTAINER=Pierre-Emmanuel Andre 
 
 # BSD
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   c pq pthread ${MODPY_WANTLIB}
-
-MASTER_SITES=  https://github.com/downloads/markokr/skytools/
+WANTLIB=   c pq pthread ${MODPY_WANTLIB}
 
 MODULES=   lang/python
 
+MASTER_SITES0= https://github.com/markokr/libusual/archive/
+DISTFILES= ${DISTNAME}.tar.gz 
libusual-{}2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz:0
+
 BUILD_DEPENDS= databases/postgresql,-server>=12 \
-   databases/postgresql,-main>=12
+   databases/postgresql,-main>=12 \
+   textproc/asciidoc \
+   textproc/xmlto
 LIB_DEPENDS=   databases/postgresql,-main>=12
-RUN_DEPENDS=databases/py-psycopg2
+RUN_DEPENDS=   databases/py-psycopg2
 
 NO_TEST=   Yes
 USE_GMAKE= Yes
 
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-python=${MODPY_BIN}
+CONFIGURE_STYLE= autoreconf
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.16
+AUTORECONF=./autogen.sh
+CONFIGURE_ARGS=--with-python=${MODPY_BIN} \
+   --with-asciidoc
+
+MAKE_ENV=  PYTHON=${MODPY_BIN}
+MAKE_FLAGS=V=1
 
-BINFILES=  bulk_loader.py cube_dispatcher.py londiste.py \
-   pgqadm.py queue_mover.py queue_splitter.py \
-   scriptmgr.py skytools_upgrade.py table_dispatcher.py \
-   walmgr.py
+post-extract:
+   mv ${WRKDIR}/libusual-*/* ${WRKSRC}/lib/
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/doc/Makefile
find ${WRKSRC} -name '*.py' \
-exec sed -i 's,/usr/bin/env python,${MODPY_BIN},' {} +
 
Index: distinfo
===
RCS file: /cvs/ports/databases/skytools/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo17 Oct 2012 20:22:46 -  1.9
+++ distinfo21 Nov 2020 14:06:55 -
@@ -1,2 +1,4 @@
-SHA256 (skytools-3.1.1.tar.gz) = Elpb0XPfYKFPqtHGQ8RtJoVMv3UWwAWoc0GiDdQivA0=
-SIZE (skytools-3.1.1.tar.gz) = 651345
+SHA256 (libusual-2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz) = 
Kd+d00RJyiefLINSu9eBQc++igtASgPfGp9ERG6kXE8=
+SHA256 (skytools-legacy-3.2.6.tar.gz) = 
XmMDNbzxJlKtqtyNcNofqWW0teq/YofNTnr0CXX7YtY=
+SIZE (libusual-2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz) = 236130
+SIZE (skytools-legacy-3.2.6.tar.gz) = 513553
Index: patches/patch-doc_Makefile
===
RCS file: patches/patch-doc_Makefile
diff -N patches/patch-doc_Makefile
--- patches/patch-doc_Makefile  17 Oct 2012 20:22:46 -  1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-doc_Makefile,v 1.4 2012/10/17 20:22:46 pea Exp $
 doc/Makefile.orig  Tue Oct  9 12:36:51 2012
-+++ doc/Makefile   Wed Oct 17 16:00:07 2012
-@@ -35,8 +35,8 @@ FQMAN = $(FQMAN1) $(FQMAN1_SFX) $(FQMAN5)
- 
- COMMON = common.switches.txt common.config.txt
- 
--GETATTRS = $(PYTHON) ../misc/getattrs.py
--FIXMAN = $(PYTHON) ../misc/fixman.py
-+GETATTRS = ${MODPY_BIN} ../misc/getattrs.py
-+FIXMAN = ${MODPY_BIN} ../misc/fixman.py
- 
- #AFLAGS = -a linkcss
- #AFLAGS = -a stylesheet=extra.css
Index: patches/patch-sql_pgq_triggers_common_c
===
RCS file: 
/cvs/ports/databases/skytools/patches/patch-sql_pgq_triggers_common_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sql_pgq_triggers_common_c
--- patches/patch-sql_pgq_triggers_common_c 19 Feb 2019 05:11:57 -  
1.1
+++ patches/patch-sql_pgq_triggers_common_c 21 Nov 2020 14:06:55 -
@@ -13,7 +13,7 @@ Index: sql/pgq/triggers/common.c
  #include 
  #include 
  #include 
-@@ -121,9 +122,9 @@ static void 

PostgreSQL 13.1 Upgrade

2020-11-20 Thread 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.  Thankfully, the changes were less extensive
than in previous PostgreSQL major updates.

Briefly, the changes:

citus 9.0.1 -> 9.5.0
postgresql 12.5 -> 13.1
postgresql-pllua 2.0.4 -> 2.0.6
postgresql-previous 11.6 -> 12.5
skytools patch to fix build (dead upstream for about 3 years)

Could we please have this tested in a bulk?  Assuming there are no
problems in a bulk, OKs?

Thanks,
Jeremy

Index: databases/citus/Makefile
===
RCS file: /cvs/ports/databases/citus/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- databases/citus/Makefile6 Feb 2020 00:37:13 -   1.7
+++ databases/citus/Makefile20 Nov 2020 23:39:40 -
@@ -3,7 +3,7 @@
 COMMENT =  extension to horizontally scale PostgreSQL
 GH_ACCOUNT =   citusdata
 GH_PROJECT =   citus
-GH_TAGNAME =   v9.0.1
+GH_TAGNAME =   v9.5.0
 
 CATEGORIES =   databases
 HOMEPAGE = https://www.citusdata.com/
Index: databases/citus/distinfo
===
RCS file: /cvs/ports/databases/citus/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- databases/citus/distinfo6 Feb 2020 00:37:13 -   1.5
+++ databases/citus/distinfo20 Nov 2020 23:39:47 -
@@ -1,2 +1,2 @@
-SHA256 (citus-9.0.1.tar.gz) = u2mD9nDg9Ww3JQvvMgzVpq8hpfF3KLM0LmYISqMwfE8=
-SIZE (citus-9.0.1.tar.gz) = 4232025
+SHA256 (citus-9.5.0.tar.gz) = nZ0AaFh3EfXDSTGzSzHOnINOKHB5D7DxPQ1Ug7s8i+I=
+SIZE (citus-9.5.0.tar.gz) = 4703871
Index: databases/citus/pkg/PLIST
===
RCS file: /cvs/ports/databases/citus/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- databases/citus/pkg/PLIST   6 Feb 2020 00:37:13 -   1.4
+++ databases/citus/pkg/PLIST   20 Nov 2020 23:41:29 -
@@ -1,22 +1,32 @@
 @comment $OpenBSD: PLIST,v 1.4 2020/02/06 00:37:13 jeremy Exp $
 include/postgresql/server/citus_version.h
 include/postgresql/server/distributed/
+include/postgresql/server/distributed/adaptive_executor.h
+include/postgresql/server/distributed/argutils.h
 include/postgresql/server/distributed/backend_data.h
+include/postgresql/server/distributed/cancel_utils.h
 include/postgresql/server/distributed/citus_acquire_lock.h
 include/postgresql/server/distributed/citus_clauses.h
 include/postgresql/server/distributed/citus_custom_scan.h
 include/postgresql/server/distributed/citus_nodefuncs.h
 include/postgresql/server/distributed/citus_nodes.h
 include/postgresql/server/distributed/citus_ruleutils.h
+include/postgresql/server/distributed/citus_safe_lib.h
 include/postgresql/server/distributed/colocation_utils.h
+include/postgresql/server/distributed/combine_query_planner.h
 include/postgresql/server/distributed/commands.h
 include/postgresql/server/distributed/connection_management.h
+include/postgresql/server/distributed/coordinator_protocol.h
+include/postgresql/server/distributed/cte_inline.h
 include/postgresql/server/distributed/deparse_shard_query.h
 include/postgresql/server/distributed/deparser.h
+include/postgresql/server/distributed/directed_acyclic_graph_execution.h
 include/postgresql/server/distributed/distributed_deadlock_detection.h
+include/postgresql/server/distributed/distributed_execution_locks.h
 include/postgresql/server/distributed/distributed_planner.h
 include/postgresql/server/distributed/distribution_column.h
 include/postgresql/server/distributed/enterprise.h
+include/postgresql/server/distributed/error_codes.h
 include/postgresql/server/distributed/errormessage.h
 include/postgresql/server/distributed/extended_op_node_utils.h
 include/postgresql/server/distributed/foreign_key_relationship.h
@@ -25,43 +35,48 @@ include/postgresql/server/distributed/fu
 include/postgresql/server/distributed/hash_helpers.h
 include/postgresql/server/distributed/insert_select_executor.h
 include/postgresql/server/distributed/insert_select_planner.h
+include/postgresql/server/distributed/intermediate_result_pruning.h
 include/postgresql/server/distributed/intermediate_results.h
 include/postgresql/server/distributed/listutils.h
 include/postgresql/server/distributed/local_executor.h
+include/postgresql/server/distributed/local_multi_copy.h
+include/postgresql/server/distributed/local_plan_cache.h
+include/postgresql/server/distributed/locally_reserved_shared_connections.h
 include/postgresql/server/distributed/lock_graph.h
+include/postgresql/server/distributed/log_utils.h
 include/postgresql/server/distributed/maintenanced.h
-include/postgresql/server/distributed/master_metadata_utility.h
-include/postgresql/server/distributed/master_protocol.h
 include/postgresql/server/distributed/memutils.h
 include/postgresql/server/distributed/metadata_cache.h