From 0c9bdd4a4973c5c3664c896f15f3c0b62c6952a5 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 30 Sep 2023 10:23:01 +0000 Subject: [PATCH 1/5] graphviz: fix build --- build/graphviz/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/graphviz/build.sh b/build/graphviz/build.sh index 5bfffc8b7..cefa030d9 100755 --- a/build/graphviz/build.sh +++ b/build/graphviz/build.sh @@ -41,6 +41,9 @@ XFORM_ARGS=" -DPKGROOT=$PROG " +# groff 1.23.0 has issues building the docs which we don't even package +export GROFF=$USRBIN/true + CONFIGURE_OPTS=" --prefix=$PREFIX --disable-static From 7b3416aa3ba588bb3ccd0f1c15a1f274bfa2f6bb Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 30 Sep 2023 10:36:56 +0000 Subject: [PATCH 2/5] mysql_fdw: update to 2.9.1 --- build/pg_extension/mysql_fdw/build.sh | 4 ++-- doc/packages.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pg_extension/mysql_fdw/build.sh b/build/pg_extension/mysql_fdw/build.sh index 18420e0f0..1494474f1 100755 --- a/build/pg_extension/mysql_fdw/build.sh +++ b/build/pg_extension/mysql_fdw/build.sh @@ -12,13 +12,13 @@ # http://www.illumos.org/license/CDDL. # }}} -# Copyright 2022 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2021 OmniOS Community Edition (OmniOSce) Association. . ../../../lib/build.sh PROG=mysql_fdw PKG=ooce/database/postgresql-XX/mysql_fdw -VER=2.9.0 +VER=2.9.1 SUMMARY="MySQL PostgreSQL XX foreign data wrapper" DESC="Allow PostgreSQL XX to access data in a MySQL database" diff --git a/doc/packages.md b/doc/packages.md index 6da5d0712..688d4a917 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -44,7 +44,7 @@ | ooce/database/postgresql-15 | 15.4 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-16 | 16.0 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-XX/citus | 11.2.0 | https://github.com/citusdata/citus/releases | [omniosorg](https://github.com/omniosorg) -| ooce/database/postgresql-XX/mysql_fdw | 2.9.0 | https://github.com/EnterpriseDB/mysql_fdw/releases | [omniosorg](https://github.com/omniosorg) +| ooce/database/postgresql-XX/mysql_fdw | 2.9.1 | https://github.com/EnterpriseDB/mysql_fdw/releases | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-XX/pg_repack | 1.4.8 | https://github.com/reorg/pg_repack/tags | [omniosorg](https://github.com/omniosorg) | ooce/database/rrdtool | 1.8.0 | https://github.com/oetiker/rrdtool-1.x/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/autoconf-archive | 2023.02.20 | https://ftp.gnu.org/gnu/autoconf-archive/ | [omniosorg](https://github.com/omniosorg) From 267ffbed20637ef081283d628146f1ec2e5206db Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 30 Sep 2023 11:11:07 +0000 Subject: [PATCH 3/5] citus: update to 12.1.0 --- build/pg_extension/citus/build.sh | 4 +++- build/pg_extension/citus/files/ctf.ignore | 1 + .../citus/patches/relationgetsmfr.patch | 22 ------------------- build/pg_extension/citus/patches/series | 1 - doc/packages.md | 2 +- 5 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 build/pg_extension/citus/patches/relationgetsmfr.patch diff --git a/build/pg_extension/citus/build.sh b/build/pg_extension/citus/build.sh index 2d8ac0502..6c282254d 100755 --- a/build/pg_extension/citus/build.sh +++ b/build/pg_extension/citus/build.sh @@ -18,7 +18,7 @@ PROG=citus PKG=ooce/database/postgresql-XX/citus -VER=11.2.0 +VER=12.1.0 SUMMARY="Citus PostgreSQL XX extension" DESC="Transforms PostgreSQL XX into a distributed database" @@ -34,6 +34,8 @@ download_source $PROG v$VER patch_source for v in $PGVERSIONS; do + # citus 12 is not compatible with postgres 13 + ((v <= 13)) && continue PREFIX=$OPREFIX/pgsql-$v # Make sure the right pg_config is used. diff --git a/build/pg_extension/citus/files/ctf.ignore b/build/pg_extension/citus/files/ctf.ignore index 4beb6988e..ca64d3176 100644 --- a/build/pg_extension/citus/files/ctf.ignore +++ b/build/pg_extension/citus/files/ctf.ignore @@ -2,3 +2,4 @@ ruleutils_12.c ruleutils_13.c ruleutils_14.c ruleutils_15.c +ruleutils_16.c diff --git a/build/pg_extension/citus/patches/relationgetsmfr.patch b/build/pg_extension/citus/patches/relationgetsmfr.patch deleted file mode 100644 index 1e49077b1..000000000 --- a/build/pg_extension/citus/patches/relationgetsmfr.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h -index fcb857c..e6ecfed 100644 ---- a/src/include/pg_version_compat.h -+++ b/src/include/pg_version_compat.h -@@ -55,17 +55,6 @@ pg_strtoint64(char *s) - } - - --static inline SMgrRelation --RelationGetSmgr(Relation rel) --{ -- if (unlikely(rel->rd_smgr == NULL)) -- { -- smgrsetowner(&(rel->rd_smgr), smgropen(rel->rd_node, rel->rd_backend)); -- } -- return rel->rd_smgr; --} -- -- - #define CREATE_SEQUENCE_COMMAND \ - "CREATE SEQUENCE IF NOT EXISTS %s AS %s INCREMENT BY " INT64_FORMAT \ - " MINVALUE " INT64_FORMAT " MAXVALUE " INT64_FORMAT \ diff --git a/build/pg_extension/citus/patches/series b/build/pg_extension/citus/patches/series index 6e6dd2eb9..411769af1 100644 --- a/build/pg_extension/citus/patches/series +++ b/build/pg_extension/citus/patches/series @@ -1,3 +1,2 @@ sys_stat.patch fix-build-in-zone.patch -relationgetsmfr.patch diff --git a/doc/packages.md b/doc/packages.md index 688d4a917..fc16424e5 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -43,7 +43,7 @@ | ooce/database/postgresql-14 | 14.9 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-15 | 15.4 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-16 | 16.0 | https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg) -| ooce/database/postgresql-XX/citus | 11.2.0 | https://github.com/citusdata/citus/releases | [omniosorg](https://github.com/omniosorg) +| ooce/database/postgresql-XX/citus | 12.1.0 | https://github.com/citusdata/citus/releases | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-XX/mysql_fdw | 2.9.1 | https://github.com/EnterpriseDB/mysql_fdw/releases | [omniosorg](https://github.com/omniosorg) | ooce/database/postgresql-XX/pg_repack | 1.4.8 | https://github.com/reorg/pg_repack/tags | [omniosorg](https://github.com/omniosorg) | ooce/database/rrdtool | 1.8.0 | https://github.com/oetiker/rrdtool-1.x/releases | [omniosorg](https://github.com/omniosorg) From a3e8505022652bdbdc9a2487a0d2ea7e371d3fe3 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 30 Sep 2023 15:29:16 +0000 Subject: [PATCH 4/5] apache-24: fix build --- build/apache/build-24.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/apache/build-24.sh b/build/apache/build-24.sh index 442eeee19..4ec7ecc9b 100755 --- a/build/apache/build-24.sh +++ b/build/apache/build-24.sh @@ -68,6 +68,8 @@ CONFIGURE_OPTS=" --enable-md " +LDFLAGS[amd64]+=" -R$OPREFIX/${LIBDIRS[amd64]}" + init download_source $PROG httpd $VER patch_source From 864f80c67c214acb4f402b2492d42e5b617363ef Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sun, 1 Oct 2023 09:31:38 +0000 Subject: [PATCH 5/5] fix baseline --- doc/baseline | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/baseline b/doc/baseline index dfb01e338..faadc56f4 100644 --- a/doc/baseline +++ b/doc/baseline @@ -105,8 +105,8 @@ extra.omnios ooce/developer/subversion extra.omnios ooce/developer/valgrind extra.omnios ooce/developer/yasm extra.omnios ooce/developer/zig r -extra.omnios ooce/developer/zig-09 extra.omnios ooce/developer/zig-011 +extra.omnios ooce/developer/zig-09 extra.omnios ooce/driver/fuse extra.omnios ooce/editor/emacs extra.omnios ooce/editor/helix @@ -175,6 +175,7 @@ extra.omnios ooce/library/tiff extra.omnios ooce/library/unbound extra.omnios ooce/library/unistring extra.omnios ooce/multimedia/dav1d +extra.omnios ooce/multimedia/dcraw extra.omnios ooce/multimedia/exif extra.omnios ooce/multimedia/ffmpeg extra.omnios ooce/multimedia/minidlna