Update 11 more extensions for Postgres 17 (#866)

Update the build scripting and, where denoted, upgrade the version for
the following extensions:

*   pgbouncer_fdw v1.2.0
*   pgcozy
*   pgfaceting
*   pgfincore v1.3.1
*   pghydro
*   pgjwt
*   pgl_ddl_deploy v2.2.1
*   pglogical v2.4.5
*   pglogical_ticker
*   pgmonitor

Also add pgemailaddr, which was previously deployed to trunk manually.

.github/workflows/extensions.yaml

@@ -160,7 +160,7 @@ jobs:
         if: matrix.pg == 15
         shell: bash -e {0}
         run: |
-          for val in pg_cron timescaledb pg_search pg_analytics citus plrust pg_net pg_stat_kcache pg_squeeze pg_tle pgaudit; do
+          for val in pg_cron timescaledb pg_search pg_analytics citus plrust pg_net pg_stat_kcache pg_squeeze pg_tle pgaudit pglogical; do
             if [[ "${{ matrix.ext.path }}" == *"$val"* ]]; then
               echo handling shared_preload_libraries for $val
               echo "shared_preload_libraries = '$val'" >> /var/lib/postgresql/data2/postgresql.conf

contrib/pgbouncer_fdw/Dockerfile

@@ -1,15 +1,9 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/CrunchyData/pgbouncer_fdw.git
-
-# Set project version
-ARG RELEASE=v1.1.0
-
-# Build extension
-RUN cd pgbouncer_fdw && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/CrunchyData/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}

contrib/pgbouncer_fdw/Trunk.toml

@@ -1,6 +1,6 @@
 [extension]
 name = "pgbouncer_fdw"
-version = "1.1.0"
+version = "1.2.0"
 repository = "https://github.com/CrunchyData/pgbouncer_fdw"
 license = "PostgreSQL"
 description = "PostgreSQL Foreign Data Wrapper to Connect to pgbouncer."
@@ -9,12 +9,7 @@ documentation = "https://access.crunchydata.com/documentation/pgbouncer_fdw/late
 categories = ["connectors"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgbouncer_fdw && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C pgbouncer_fdw install"

contrib/pgcozy/Dockerfile

@@ -1,10 +1,12 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/vventirozos/pgcozy.git
-
-# Build extension
-RUN cd pgcozy && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+# ARG EXTENSION_VERSION
+ARG RELEASE=1f36036
+RUN git clone https://github.com/vventirozos/${EXTENSION_NAME}.git \
+    && cd ${EXTENSION_NAME} \
+    && git checkout ${RELEASE} \
+    && make

contrib/pgcozy/Trunk.toml

@@ -8,12 +8,7 @@ documentation = "https://github.com/vventirozos/pgcozy"
 categories = ["index_table_optimizations"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgcozy && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C pgcozy install"

contrib/pgemailaddr/Dockerfile

@@ -0,0 +1,12 @@
+# Set PostgreSQL version
+ARG PG_VERSION
+FROM quay.io/coredb/c-builder:pg${PG_VERSION}
+
+# Clone and build the extension.
+ARG EXTENSION_NAME
+# ARG EXTENSION_VERSION
+ARG RELEASE=77266f2
+RUN git clone https://github.com/petere/${EXTENSION_NAME}.git \
+    && cd ${EXTENSION_NAME} \
+    && git checkout ${RELEASE} \
+    && make

contrib/pgemailaddr/Trunk.toml

@@ -0,0 +1,14 @@
+[extension]
+name = "pgemailaddr"
+version = "1.0.0"
+repository = "https://github.com/petere/pgemailaddr"
+license = "PostgreSQL"
+description = "Email address type for PostgreSQL."
+documentation = "https://github.com/petere/pgemailaddr"
+categories = ["data_transformations"]
+
+[build]
+postgres_version = "17"
+platform = "linux/amd64"
+dockerfile = "Dockerfile"
+install_command = "make -C pgemailaddr install"

contrib/pgfaceting/Dockerfile

@@ -1,20 +1,9 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
-# Extension build dependencies
-RUN apt-get update && apt-get install -y \
-    cmake
-
-# Clone repository
-RUN git clone https://github.com/cybertec-postgresql/pgfaceting.git
-
-# Set project version
-ARG RELEASE=v0.2.0
-
-# Build extension
-RUN cd pgfaceting && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/cybertec-postgresql/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}

contrib/pgfaceting/Trunk.toml

@@ -11,12 +11,7 @@ categories = ["search"]
 apt = ["libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgfaceting && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C pgfaceting install"

contrib/pgfincore/Dockerfile

@@ -1,12 +1,8 @@
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/klando/pgfincore.git
-
-ARG RELEASE=1.2.4
-
-RUN cd pgfincore && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "${EXTENSION_VERSION}" https://github.com/klando/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}

contrib/pgfincore/Trunk.toml

@@ -1,6 +1,6 @@
 [extension]
 name = "pgfincore"
-version = "1.2.0"
+version = "1.3.1"
 repository = "https://github.com/klando/pgfincore"
 license = "Copyright"
 description = "Use mincore to explore linux (or BSD) cache memory."
@@ -11,12 +11,7 @@ categories = ["tooling_admin"]
 apt = ["libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgfincore && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C pgfincore install"

contrib/pghydro/Dockerfile

@@ -1,12 +1,9 @@
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/pghydro/pghydro.git
-
-ARG RELEASE=v.6.6
-
-# Build extension
-RUN cd pghydro && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE}
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v.$(perl -E 'print shift =~ s/[.]0$//gr' "${EXTENSION_VERSION}")" https://github.com/${EXTENSION_NAME}/${EXTENSION_NAME}.git \
+    && printf "EXTENSION = pghydro\nDATA = \$(wildcard pghydro--*.sql)\nPGXS := \$(shell pg_config --pgxs)\ninclude \$(PGXS)\n" > ${EXTENSION_NAME}/Makefile \
+    && make -C ${EXTENSION_NAME}

contrib/pghydro/Trunk.toml

@@ -9,11 +9,7 @@ categories = ["data_transformations"]
 preload_libraries = ["pghydro, postgis"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pghydro
-    set -x
-    mv pghydro* /usr/share/postgresql/15/extension
-    """
+install_command = "make -C pghydro install"

contrib/pgjwt/Dockerfile

@@ -1,10 +1,12 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/michelp/pgjwt.git
-
-# Build extension
-RUN cd pgjwt && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+# ARG EXTENSION_VERSION
+ARG RELEASE=f3d82fd
+RUN git clone https://github.com/michelp/${EXTENSION_NAME}.git \
+    && cd ${EXTENSION_NAME} \
+    && git checkout ${RELEASE} \
+    && make

contrib/pgjwt/Trunk.toml

@@ -8,12 +8,7 @@ documentation = "https://github.com/michelp/pgjwt"
 categories = ["security"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgjwt && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C pgjwt install"

contrib/pgl_ddl_deploy/Dockerfile

@@ -1,15 +1,9 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/enova/pgl_ddl_deploy.git
-
-# Set project version
-ARG RELEASE=v2.1.0
-
-# Build extension
-RUN cd pgl_ddl_deploy && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/enova/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}

contrib/pgl_ddl_deploy/Trunk.toml

@@ -1,19 +1,14 @@
 [extension]
 name = "pgl_ddl_deploy"
-version = "2.1.0"
+version = "2.2.1"
 repository = "https://github.com/enova/pgl_ddl_deploy"
 license = "MIT"
 description = "Transparent Logical DDL Replication."
 documentation = "https://github.com/enova/pgl_ddl_deploy"
 categories = ["orchestration"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgl_ddl_deploy && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C pgl_ddl_deploy install"

contrib/pglogical/Dockerfile

@@ -1,9 +1,9 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
 # Extension build dependencies
+USER root
 RUN apt-get update && apt-get install -y \
     libkrb5-dev \
     libselinux1-dev \
@@ -13,14 +13,8 @@ RUN apt-get update && apt-get install -y \
     libpam0g-dev \
     zlib1g-dev
 
-# Clone repository
-RUN git clone https://github.com/2ndQuadrant/pglogical.git
-
-# Set project version
-ARG RELEASE=REL2_4_3
-
-# Build extension
-RUN cd pglogical && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "REL$(perl -E 'print shift =~ s/\./_/gr' "${EXTENSION_VERSION}")" https://github.com/2ndQuadrant/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}

contrib/pglogical/Trunk.toml

@@ -1,6 +1,6 @@
 [extension]
 name = "pglogical"
-version = "2.4.3"
+version = "2.4.5"
 repository = "https://github.com/2ndQuadrant/pglogical"
 license = "PostgreSQL"
 description = "PostgreSQL Logical Replication."
@@ -15,10 +15,4 @@ apt = ["libpq5", "libc6"]
 postgres_version = "15"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pglogical && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
-
+install_command = "make -C pglogical install"

contrib/pglogical_ticker/Dockerfile

@@ -1,15 +1,9 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/enova/pglogical_ticker.git
-
-# Set project version
-ARG RELEASE=v1.4.1
-
-# Build extension
-RUN cd pglogical_ticker && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/enova/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}