Merge pull request #1556 from hadfl/vaultwarden

vaultwarden: fix build
omniosorg · Dec 13, 2024 · 8bff312 · 8bff312
2 parents aa5a864 + c3310ac
commit 8bff312
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/build/pg_extension/citus/build.sh b/build/pg_extension/citus/build.sh
@@ -12,13 +12,13 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../../lib/build.sh
 
 PROG=citus
 PKG=ooce/database/postgresql-XX/citus
-VER=12.1.0
+VER=12.1.5
 SUMMARY="Citus PostgreSQL XX extension"
 DESC="Transforms PostgreSQL XX into a distributed database"
 
@@ -36,6 +36,8 @@ patch_source
 for v in $PGVERSIONS; do
     # citus 12 is not compatible with postgres 13
     ((v <= 13)) && continue
+    # citus does not yet support postgres 17
+    ((v >= 17)) && continue
     PREFIX=$OPREFIX/pgsql-$v
 
     # Make sure the right pg_config is used.

diff --git 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 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../../lib/build.sh
 
 PROG=mysql_fdw
 PKG=ooce/database/postgresql-XX/mysql_fdw
-VER=2.9.1
+VER=2.9.2
 SUMMARY="MySQL PostgreSQL XX foreign data wrapper"
 DESC="Allow PostgreSQL XX to access data in a MySQL database"
 

diff --git a/build/vaultwarden/patches/Cargo.toml.patch b/build/vaultwarden/patches/Cargo.toml.patch
diff --git a/build/vaultwarden/patches/series b/build/vaultwarden/patches/series
diff --git a/doc/packages.md b/doc/packages.md
@@ -45,8 +45,8 @@
 | ooce/database/postgresql-15	| 15.10		| https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg)
 | ooce/database/postgresql-16	| 16.6		| https://www.postgresql.org/ftp/source/ | [omniosorg](https://github.com/omniosorg)
 | ooce/database/postgresql-17	| 17.2		| https://www.postgresql.org/ftp/source/ | [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/citus	| 12.1.5	| https://github.com/citusdata/citus/releases | [omniosorg](https://github.com/omniosorg)
+| ooce/database/postgresql-XX/mysql_fdw	| 2.9.2	| https://github.com/EnterpriseDB/mysql_fdw/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/database/postgresql-XX/pg_repack	| 1.5.0	| https://github.com/reorg/pg_repack/tags | [omniosorg](https://github.com/omniosorg)
 | ooce/database/rrdtool		| 1.9.0		| https://github.com/oetiker/rrdtool-1.x/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/database/victoriametrics	| 1.102.8	| https://github.com/VictoriaMetrics/VictoriaMetrics | [gkoh](https://github.com/gkoh)