On 08/11 10:48, Stuart Henderson wrote:
> This is only used for the @ask-update line in the plist, so you can just set
> "UPDATE_PLIST_ARGS = -i V_MAJOR", then you don't need to fight update-plist.
Thanks for letting me know. Here's a new diff with that change:
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.295
diff -u -p -r1.295 Makefile
--- Makefile 19 May 2023 17:10:09 -0000 1.295
+++ Makefile 11 Aug 2023 14:29:19 -0000
@@ -5,7 +5,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
-VERSION= 15.3
+VERSION= 15.4
PREV_MAJOR= 14
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
@@ -35,6 +35,7 @@ MAKE_FILE= GNUmakefile
V_MAJOR= ${VERSION:R}
SUBST_VARS= VERSION V_MAJOR PREV_MAJOR
+UPDATE_PLIST_ARGS= -i V_MAJOR
USE_GMAKE= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.97
diff -u -p -r1.97 distinfo
--- distinfo 19 May 2023 17:10:09 -0000 1.97
+++ distinfo 10 Aug 2023 14:17:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql-15.3.tar.gz) = CG04Uz4odHlmpNXx546kMuM6ePIdy5EzAQ7LUYn62Yw=
-SIZE (postgresql-15.3.tar.gz) = 29946539
+SHA256 (postgresql-15.4.tar.gz) = DhHu5yPdflmmNAUrwb/JvmBeVcHMo/Zun8JdOjlPsDA=
+SIZE (postgresql-15.4.tar.gz) = 29978353
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
retrieving revision 1.110
diff -u -p -r1.110 PLIST-docs
--- pkg/PLIST-docs 19 May 2023 17:10:10 -0000 1.110
+++ pkg/PLIST-docs 11 Aug 2023 14:29:37 -0000
@@ -715,10 +715,11 @@ share/doc/postgresql/html/regress-run.ht
share/doc/postgresql/html/regress-tap.html
share/doc/postgresql/html/regress-variant.html
share/doc/postgresql/html/regress.html
-share/doc/postgresql/html/release-15.html
share/doc/postgresql/html/release-15-1.html
share/doc/postgresql/html/release-15-2.html
share/doc/postgresql/html/release-15-3.html
+share/doc/postgresql/html/release-15-4.html
+share/doc/postgresql/html/release-15.html
share/doc/postgresql/html/release-prior.html
share/doc/postgresql/html/release.html
share/doc/postgresql/html/replication-origins.html
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 10 August 2023 16:46:56 Jeremy Evans <jer...@openbsd.org> wrote:
>
> > Simple update to the latest release of PostgreSQL. Release announcement at:
> > https://www.postgresql.org/about/news/postgresql-154-149-1312-1216-1121-and-postgresql-16-beta-3-released-2689/
> >
> > Fixes a couple CVEs:
> >
> > CVE-2023-39417: Extension script @substitutions@ within quoting allow
> > SQL injection.
> >
> > CVE-2023-39418: MERGE fails to enforce UPDATE or SELECT row security
> > policies.
> >
> > Tested on amd64. I will backport to -stable after committing to -current.
> >
> > Only significant port change is to stop fighting update-plist and use
> > the substitution.
> >
> > OKs?
> >
> > Thanks,
> > Jeremy
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/databases/postgresql/Makefile,v
> > retrieving revision 1.295
> > diff -u -p -r1.295 Makefile
> > --- Makefile 19 May 2023 17:10:09 -0000 1.295
> > +++ Makefile 10 Aug 2023 14:16:40 -0000
> > @@ -5,7 +5,7 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
> > COMMENT-plpython=Python procedural language for PostgreSQL
> > COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous
> > version
> >
> > -VERSION= 15.3
> > +VERSION= 15.4
> > PREV_MAJOR= 14
> > DISTNAME= postgresql-${VERSION}
> > PKGNAME-main= postgresql-client-${VERSION}
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/databases/postgresql/distinfo,v
> > retrieving revision 1.97
> > diff -u -p -r1.97 distinfo
> > --- distinfo 19 May 2023 17:10:09 -0000 1.97
> > +++ distinfo 10 Aug 2023 14:17:34 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (postgresql-15.3.tar.gz) =
> > CG04Uz4odHlmpNXx546kMuM6ePIdy5EzAQ7LUYn62Yw=
> > -SIZE (postgresql-15.3.tar.gz) = 29946539
> > +SHA256 (postgresql-15.4.tar.gz) =
> > DhHu5yPdflmmNAUrwb/JvmBeVcHMo/Zun8JdOjlPsDA=
> > +SIZE (postgresql-15.4.tar.gz) = 29978353
> > Index: pkg/PLIST-docs
> > ===================================================================
> > RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-docs,v
> > retrieving revision 1.110
> > diff -u -p -r1.110 PLIST-docs
> > --- pkg/PLIST-docs 19 May 2023 17:10:10 -0000 1.110
> > +++ pkg/PLIST-docs 10 Aug 2023 14:33:04 -0000
> > @@ -715,10 +715,11 @@ share/doc/postgresql/html/regress-run.ht
> > share/doc/postgresql/html/regress-tap.html
> > share/doc/postgresql/html/regress-variant.html
> > share/doc/postgresql/html/regress.html
> > -share/doc/postgresql/html/release-15.html
> > -share/doc/postgresql/html/release-15-1.html
> > -share/doc/postgresql/html/release-15-2.html
> > -share/doc/postgresql/html/release-15-3.html
> > +share/doc/postgresql/html/release-${V_MAJOR}-1.html
> > +share/doc/postgresql/html/release-${V_MAJOR}-2.html
> > +share/doc/postgresql/html/release-${V_MAJOR}-3.html
> > +share/doc/postgresql/html/release-${V_MAJOR}-4.html
> > +share/doc/postgresql/html/release-${V_MAJOR}.html
> > share/doc/postgresql/html/release-prior.html
> > share/doc/postgresql/html/release.html
> > share/doc/postgresql/html/replication-origins.html
>
