postgresql: updated to 16.1, 15.5, 14.10, 13.13, 12.17, and 11.22

Security Issues

CVE-2023-5868: Memory disclosure in aggregate function calls
CVE-2023-5869: Buffer overrun from integer overflow in array modification
CVE-2023-5870: Role pg_signal_backend can signal certain superuser processes

Bug Fixes and Improvements

This update fixes over 55 bugs that were reported in the last several months. The issues listed below affect PostgreSQL 16. Some of these issues may also affect other supported versions of PostgreSQL.

Fix issue where GiST indexes had an incorrect behavior during a "page split" operation that could lead to incorrect results in subsequent index searches. Please reindex GiST indexes after installing this update.
Fix issue where B-tree indexes would incorrectly de-duplicate interval columns. Please reindex any B-tree index that includes an interval column after installing this update.
Provide more efficient indexing of date, timestamptz, and timestamp values in BRIN indexes when using a minmax_multi opsclass. While not required, we recommend reindexing BRIN indexes that include these data types after installing this update.
Fix for bulk table insertion into partitioned tables.
Fix for hash-partitioned tables with multiple partition keys during step generation and runtime pruning that could lead to crashes in some cases.
Throw the correct error if pgrowlocks() is applied to a partitioned table

Fix inconsistent rechecking of concurrently-updated rows during MERGE when using READ COMMITTED mode.

Correctly identify the target table in an inherited UPDATE/DELETE/MERGE even when the parent table is excluded by constraints.
Fix over-allocation of a constructed tsvector.
Fix ALTER SUBSCRIPTION to apply changes in the run_as_owner option.
Several fixes for COPY FROM,
Several fixes for handling torn reads with pg_control.
Fix "could not find pathkey item to sort" errors occurring while planning aggregate functions with ORDER BY or DISTINCT options.
When track_io_timing is enabled, include the time taken by relation extension operations as write time.
Track the dependencies of cached CALL statements, and re-plan them when needed.
Treat out-of-memory failures as FATAL while reading WAL.
Fix pg_dump to dump the new run_as_owner option of subscriptions.
Fix pg_restore so that selective restores will include both table-level and column-level ACLs for selected tables.
Add logic to pg_upgrade to check for use of obsolete data types abstime, reltime, and tinterval.
Fix vacuumdb to have multiple -N switches actually exclude tables in multiple schemas.
amcheck will no longer report interrupted page deletion as corruption.
Fix btree_gin indexes on interval columns to properly return data when using the < and <= operators.
This commit is contained in:
adam 2023-11-13 20:22:03 +00:00
parent e5a992f9b3
commit de7d4e3f96
70 changed files with 120 additions and 143 deletions

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.32 2023/11/08 13:18:29 wiz Exp $
# $NetBSD: Makefile,v 1.33 2023/11/13 20:22:03 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-client-/}
PKGREVISION= 2
COMMENT= PostgreSQL database client programs
.include "../../databases/postgresql11/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.29 2023/11/08 13:18:29 wiz Exp $
# $NetBSD: Makefile,v 1.30 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-contrib-/}
PKGREVISION= 2
COMMENT= Contrib subtree of tools and plug-ins
.include "../../databases/postgresql11/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.23 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.24 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-docs-/}
PKGREVISION= 1
COMMENT= PostgreSQL database documentation
.include "../../databases/postgresql11/Makefile.common"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.22 2023/08/11 05:58:00 adam Exp $
@comment $NetBSD: PLIST,v 1.23 2023/11/13 20:22:04 adam Exp $
man/man1/clusterdb.1
man/man1/createdb.1
man/man1/createuser.1
@ -968,6 +968,7 @@ share/doc/postgresql/html/release-11-19.html
share/doc/postgresql/html/release-11-2.html
share/doc/postgresql/html/release-11-20.html
share/doc/postgresql/html/release-11-21.html
share/doc/postgresql/html/release-11-22.html
share/doc/postgresql/html/release-11-3.html
share/doc/postgresql/html/release-11-4.html
share/doc/postgresql/html/release-11-5.html

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.29 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.30 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-plperl-/}
PKGREVISION= 2
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.32 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.33 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-plpython-/}
PKGREVISION= 3
COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.27 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.28 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-pltcl-/}
PKGREVISION= 2
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql11-server>=${PKGVERSION_NOREV}:../../databases/postgresql11-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.30 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.31 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-server-/}
PKGREVISION= 2
COMMENT= PostgreSQL database server programs
# mips has no TAS implementation

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.32 2023/11/08 13:18:29 wiz Exp $
# $NetBSD: Makefile,v 1.33 2023/11/13 20:22:03 adam Exp $
PKGNAME= ${DISTNAME:S/-/11-/}
PKGREVISION= 3
COMMENT= Robust, next generation, object-relational DBMS
DEPENDS+= postgresql11-client>=${PKGVERSION_NOREV}:../../databases/postgresql11-client

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.34 2023/08/11 05:58:00 adam Exp $
# $NetBSD: Makefile.common,v 1.35 2023/11/13 20:22:03 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -16,7 +16,7 @@
# used by databases/postgresql11-pltcl/Makefile
# used by databases/postgresql11-server/Makefile
DISTNAME= postgresql-11.21
DISTNAME= postgresql-11.22
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.28 2023/08/11 05:58:00 adam Exp $
$NetBSD: distinfo,v 1.29 2023/11/13 20:22:03 adam Exp $
BLAKE2s (postgresql-11.21.tar.bz2) = dc56b4428b50739a2468185bd32a2ee06258f4dd405d6a665d6c579c513f873f
SHA512 (postgresql-11.21.tar.bz2) = 2c76859b50ac9c6373624e5ca25a94bbb2a3b6af014304508969f2ae21760b072826c393822b33de50ab9dbb84cd5168b9f5e7d8e057a1d573223180934d7899
Size (postgresql-11.21.tar.bz2) = 20467892 bytes
BLAKE2s (postgresql-11.22.tar.bz2) = 49164bd72b712a23b9d0d7f43a3b17aef84229b6ca9e3a40ce438e18078fd28b
SHA512 (postgresql-11.22.tar.bz2) = 2e4f7322235ed616d10d1e720fa72b8700cb1ebd9fec2e65d63662fca874c8df519b5b2184b32ee63f2060f6f6f620956b790cc6b24dbb06eb0b07d2710a8278
Size (postgresql-11.22.tar.bz2) = 20482994 bytes
SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.34 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.35 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-client-/}
PKGREVISION= 2
COMMENT= PostgreSQL database client programs
.include "../../databases/postgresql12/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.29 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.30 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-contrib-/}
PKGREVISION= 2
COMMENT= Contrib subtree of tools and plug-ins
.include "../../databases/postgresql12/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.23 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.24 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-docs-/}
PKGREVISION= 1
COMMENT= PostgreSQL database documentation
.include "../../databases/postgresql12/Makefile.common"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.17 2023/08/11 05:58:01 adam Exp $
@comment $NetBSD: PLIST,v 1.18 2023/11/13 20:22:05 adam Exp $
man/man1/clusterdb.1
man/man1/createdb.1
man/man1/createuser.1
@ -970,6 +970,7 @@ share/doc/postgresql/html/release-12-13.html
share/doc/postgresql/html/release-12-14.html
share/doc/postgresql/html/release-12-15.html
share/doc/postgresql/html/release-12-16.html
share/doc/postgresql/html/release-12-17.html
share/doc/postgresql/html/release-12-2.html
share/doc/postgresql/html/release-12-3.html
share/doc/postgresql/html/release-12-4.html

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.29 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.30 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-plperl-/}
PKGREVISION= 2
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.30 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.31 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-plpython-/}
PKGREVISION= 3
COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.27 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.28 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-pltcl-/}
PKGREVISION= 2
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql12-server>=${PKGVERSION_NOREV}:../../databases/postgresql12-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.29 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.30 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-server-/}
PKGREVISION= 2
COMMENT= PostgreSQL database server programs
# mips has no TAS implementation

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.31 2023/11/08 13:18:30 wiz Exp $
# $NetBSD: Makefile,v 1.32 2023/11/13 20:22:04 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-/}
PKGREVISION= 3
COMMENT= Robust, next generation, object-relational DBMS
DEPENDS+= postgresql12-client>=${PKGVERSION_NOREV}:../../databases/postgresql12-client

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.27 2023/08/11 05:58:00 adam Exp $
# $NetBSD: Makefile.common,v 1.28 2023/11/13 20:22:04 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -16,7 +16,7 @@
# used by databases/postgresql12-pltcl/Makefile
# used by databases/postgresql12-server/Makefile
DISTNAME= postgresql-12.16
DISTNAME= postgresql-12.17
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.21 2023/08/11 05:58:00 adam Exp $
$NetBSD: distinfo,v 1.22 2023/11/13 20:22:04 adam Exp $
BLAKE2s (postgresql-12.16.tar.bz2) = 4e36b70f07bc2055aaceeb7a470a0c4c7c4e601d51623d9fdbb624913a11eddf
SHA512 (postgresql-12.16.tar.bz2) = 37c1e5c87e6e3437b9f3de1219a8df2085b1dfb6f687980dd0e9c8691f2caac34ac58a6c119fe69a61888b80a9cbce89ebc9dbb345d6d141a8e4ea9b1b37fa89
Size (postgresql-12.16.tar.bz2) = 21140532 bytes
BLAKE2s (postgresql-12.17.tar.bz2) = ff611570be67a59f0ec43f5e501de6d5929c15853641b2d0f80e2b1183df4ef8
SHA512 (postgresql-12.17.tar.bz2) = 8bf67475db4ec5baf058ca976ea3e416df39cd9d15131be3fa3c161edbfa93f74251d33b29d23b3084c95bbb73fb6606f4615e528129674047a75a86e7417373
Size (postgresql-12.17.tar.bz2) = 21181616 bytes
SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.28 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.29 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-client-/}
PKGREVISION= 2
COMMENT= PostgreSQL database client programs
.include "../../databases/postgresql13/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.22 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.23 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-contrib-/}
PKGREVISION= 2
COMMENT= Contrib subtree of tools and plug-ins
.include "../../databases/postgresql13/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.19 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.20 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-docs-/}
PKGREVISION= 1
COMMENT= PostgreSQL database documentation
.include "../../databases/postgresql13/Makefile.common"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.13 2023/08/11 05:58:01 adam Exp $
@comment $NetBSD: PLIST,v 1.14 2023/11/13 20:22:06 adam Exp $
man/man1/clusterdb.1
man/man1/createdb.1
man/man1/createuser.1
@ -974,6 +974,7 @@ share/doc/postgresql/html/release-13-1.html
share/doc/postgresql/html/release-13-10.html
share/doc/postgresql/html/release-13-11.html
share/doc/postgresql/html/release-13-12.html
share/doc/postgresql/html/release-13-13.html
share/doc/postgresql/html/release-13-2.html
share/doc/postgresql/html/release-13-3.html
share/doc/postgresql/html/release-13-4.html

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.24 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.25 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-plperl-/}
PKGREVISION= 2
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.24 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.25 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-plpython-/}
PKGREVISION= 3
COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.21 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.22 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-pltcl-/}
PKGREVISION= 2
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql13-server>=${PKGVERSION_NOREV}:../../databases/postgresql13-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.21 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.22 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-server-/}
PKGREVISION= 2
COMMENT= PostgreSQL database server programs
# mips has no TAS implementation

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.22 2023/11/08 13:18:31 wiz Exp $
# $NetBSD: Makefile,v 1.23 2023/11/13 20:22:05 adam Exp $
PKGNAME= ${DISTNAME:S/-/13-/}
PKGREVISION= 3
COMMENT= Robust, next generation, object-relational DBMS
DEPENDS+= postgresql13-client>=${PKGVERSION_NOREV}:../../databases/postgresql13-client

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.20 2023/08/11 05:58:01 adam Exp $
# $NetBSD: Makefile.common,v 1.21 2023/11/13 20:22:05 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -16,7 +16,7 @@
# used by databases/postgresql13-pltcl/Makefile
# used by databases/postgresql13-server/Makefile
DISTNAME= postgresql-13.12
DISTNAME= postgresql-13.13
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.19 2023/08/11 05:58:01 adam Exp $
$NetBSD: distinfo,v 1.20 2023/11/13 20:22:05 adam Exp $
BLAKE2s (postgresql-13.12.tar.bz2) = 0724c0d67fa3864ffcfc7b11ced3256632f8b7d8f70313e794b759c7803d84a1
SHA512 (postgresql-13.12.tar.bz2) = 6b6f6de998016b33f0954d4ed8233b84d98abd2dc9b50f5e959f403d1d87a7e9c3b8c8c2ed456806578c2610982f41be3169d9afd4221c52c320b1a2795043e4
Size (postgresql-13.12.tar.bz2) = 21542293 bytes
BLAKE2s (postgresql-13.13.tar.bz2) = de7adb4945155deb57dd1a6623a89810447a3f9aa74ee4c429f15d0d8bf1538d
SHA512 (postgresql-13.13.tar.bz2) = d7b1076cdc406ac83440c75d18e6dc6db9af709615344978ba0135b45a127082b1d3c6ad6d8cd6259d67ddf38cfcee37dd78dcfbf8e4a710b724c67cf36170a7
Size (postgresql-13.13.tar.bz2) = 21563452 bytes
SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.18 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.19 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-client-/}
PKGREVISION= 2
COMMENT= PostgreSQL database client programs
.include "../../databases/postgresql14/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.14 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.15 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-contrib-/}
PKGREVISION= 2
COMMENT= Contrib subtree of tools and plug-ins
.include "../../databases/postgresql14/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.14 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.15 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-docs-/}
PKGREVISION= 1
COMMENT= PostgreSQL database documentation
.include "../../databases/postgresql14/Makefile.common"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.10 2023/08/11 05:58:02 adam Exp $
@comment $NetBSD: PLIST,v 1.11 2023/11/13 20:22:06 adam Exp $
man/man1/clusterdb.1
man/man1/createdb.1
man/man1/createuser.1
@ -987,6 +987,7 @@ 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-14-1.html
share/doc/postgresql/html/release-14-10.html
share/doc/postgresql/html/release-14-2.html
share/doc/postgresql/html/release-14-3.html
share/doc/postgresql/html/release-14-4.html

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.17 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.18 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-plperl-/}
PKGREVISION= 2
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql14-server>=${PKGVERSION_NOREV}:../../databases/postgresql14-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.16 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.17 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-plpython-/}
PKGREVISION= 3
COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql14-server>=${PKGVERSION_NOREV}:../../databases/postgresql14-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.14 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.15 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-pltcl-/}
PKGREVISION= 2
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql14-server>=${PKGVERSION_NOREV}:../../databases/postgresql14-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.14 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.15 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-server-/}
PKGREVISION= 2
COMMENT= PostgreSQL database server programs
# mips has no TAS implementation

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.17 2023/11/08 13:18:32 wiz Exp $
# $NetBSD: Makefile,v 1.18 2023/11/13 20:22:06 adam Exp $
PKGNAME= ${DISTNAME:S/-/14-/}
PKGREVISION= 3
COMMENT= Robust, next generation, object-relational DBMS
DEPENDS+= postgresql14-client>=${PKGVERSION_NOREV}:../../databases/postgresql14-client

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.12 2023/08/11 05:58:01 adam Exp $
# $NetBSD: Makefile.common,v 1.13 2023/11/13 20:22:06 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -16,7 +16,7 @@
# used by databases/postgresql14-pltcl/Makefile
# used by databases/postgresql14-server/Makefile
DISTNAME= postgresql-14.9
DISTNAME= postgresql-14.10
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.12 2023/08/11 05:58:01 adam Exp $
$NetBSD: distinfo,v 1.13 2023/11/13 20:22:06 adam Exp $
BLAKE2s (postgresql-14.9.tar.bz2) = 4603ff52dae562ed1d63a968dcfb4ac20e972cc972d81761281c40551db93ccf
SHA512 (postgresql-14.9.tar.bz2) = 8a7f74c5fd1ec5339085f357b3044dd0d763e3368bd42b5d68497eba5cbf71e9c76a329580d8aa3145aa98a157f28df548c4a6dc2d880db5c0156baa231f5d24
Size (postgresql-14.9.tar.bz2) = 22207374 bytes
BLAKE2s (postgresql-14.10.tar.bz2) = a496cab7728b6af59a5a6aa53027aa9472ed97ec68c371a737c85093fecd8c55
SHA512 (postgresql-14.10.tar.bz2) = f546e62eb158efdeecf091271ee60945604ca7f3683f0b259ee18eb682431158e282bf4f81d8df304c956919788f8077e72aa47c467d32d6aef1ccfe470862a5
Size (postgresql-14.10.tar.bz2) = 22298652 bytes
SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.7 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.8 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-client-/}
PKGREVISION= 2
COMMENT= PostgreSQL database client programs
.include "../../databases/postgresql15/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.7 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.8 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-contrib-/}
PKGREVISION= 2
COMMENT= Contrib subtree of tools and plug-ins
.include "../../databases/postgresql15/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.7 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.8 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-docs-/}
PKGREVISION= 1
COMMENT= PostgreSQL database documentation
.include "../../databases/postgresql15/Makefile.common"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.5 2023/08/11 05:58:02 adam Exp $
@comment $NetBSD: PLIST,v 1.6 2023/11/13 20:22:07 adam Exp $
man/man1/clusterdb.1
man/man1/createdb.1
man/man1/createuser.1
@ -1003,6 +1003,7 @@ 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-5.html
share/doc/postgresql/html/release-15.html
share/doc/postgresql/html/release-prior.html
share/doc/postgresql/html/release.html

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.9 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.10 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-plperl-/}
PKGREVISION= 2
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql15-server>=${PKGVERSION_NOREV}:../../databases/postgresql15-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.8 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.9 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-plpython-/}
PKGREVISION= 3
COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql15-server>=${PKGVERSION_NOREV}:../../databases/postgresql15-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.7 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.8 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-pltcl-/}
PKGREVISION= 2
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql15-server>=${PKGVERSION_NOREV}:../../databases/postgresql15-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.7 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.8 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-server-/}
PKGREVISION= 2
COMMENT= PostgreSQL database server programs
# mips has no TAS implementation

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2023/02/15 20:51:01 adam Exp $
@comment $NetBSD: PLIST,v 1.5 2023/11/13 20:22:08 adam Exp $
bin/postgres
bin/postmaster
include/postgresql/server/plpgsql.h
@ -777,6 +777,7 @@ ${PLIST.nls}share/locale/it/LC_MESSAGES/postgres-15.mo
${PLIST.nls}share/locale/ja/LC_MESSAGES/plpgsql-15.mo
${PLIST.nls}share/locale/ja/LC_MESSAGES/postgres-15.mo
${PLIST.nls}share/locale/ka/LC_MESSAGES/plpgsql-15.mo
${PLIST.nls}share/locale/ka/LC_MESSAGES/postgres-15.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/plpgsql-15.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/postgres-15.mo
${PLIST.nls}share/locale/pl/LC_MESSAGES/plpgsql-15.mo

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.8 2023/11/08 13:18:33 wiz Exp $
# $NetBSD: Makefile,v 1.9 2023/11/13 20:22:07 adam Exp $
PKGNAME= ${DISTNAME:S/-/15-/}
PKGREVISION= 3
COMMENT= Robust, next generation, object-relational DBMS
DEPENDS+= postgresql15-client>=${PKGVERSION_NOREV}:../../databases/postgresql15-client

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.6 2023/08/11 05:58:02 adam Exp $
# $NetBSD: Makefile.common,v 1.7 2023/11/13 20:22:07 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -16,7 +16,7 @@
# used by databases/postgresql15-pltcl/Makefile
# used by databases/postgresql15-server/Makefile
DISTNAME= postgresql-15.4
DISTNAME= postgresql-15.5
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.5 2023/08/11 05:58:02 adam Exp $
$NetBSD: distinfo,v 1.6 2023/11/13 20:22:07 adam Exp $
BLAKE2s (postgresql-15.4.tar.bz2) = ba407a81347b16e47d9f9dad541a08c21fcb075f91457098db836035c1d54ff0
SHA512 (postgresql-15.4.tar.bz2) = 37dd3e8b644d10c4f55963e07344ff4b0079adbae60052306f230f15e4ef4662b89e84a63dacc87cbf926c80b186d064a391283dd16e29ab47f7acc8a9860d0b
Size (postgresql-15.4.tar.bz2) = 22850355 bytes
BLAKE2s (postgresql-15.5.tar.bz2) = 28c68867eaa76753b02c6a4e5063e55d821e0425d382f434eec0d8e5291ebaa2
SHA512 (postgresql-15.5.tar.bz2) = 9ed9d160b3cef99954ccd47a970c107b7e3b0196a7d848f740bf3c52a1c626f6f457814c97f37b9f0467bb07734e19806a15bd9cf3c39445e1d89e75b37064cc
Size (postgresql-15.5.tar.bz2) = 23091780 bytes
SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9

View File

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.1 2022/10/19 13:16:45 adam Exp $
# $NetBSD: options.mk,v 1.2 2023/11/13 20:22:07 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql15
PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam lz4
@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --with-ldap
# LLVM based JIT support
.if !empty(PKG_OPTIONS:Mllvm)
. include "../../lang/llvm/buildlink3.mk"
. include "../../wip/llvm/buildlink3.mk"
CONFIGURE_ARGS+= --with-llvm
CONFIGURE_ENV+= CLANG=${CC} # XXX: make it be better
PLIST.llvm= yes

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.4 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-client-/}
PKGREVISION= 2
COMMENT= PostgreSQL database client programs
.include "../../databases/postgresql16/Makefile.common"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2023/09/17 08:53:21 adam Exp $
@comment $NetBSD: PLIST,v 1.2 2023/11/13 20:22:08 adam Exp $
bin/clusterdb
bin/createdb
bin/createuser
@ -1105,6 +1105,7 @@ ${PLIST.nls}share/locale/ko/LC_MESSAGES/ecpg-16.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/ecpglib6-16.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/initdb-16.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/libpq5-16.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_amcheck-16.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_archivecleanup-16.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_basebackup-16.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_checksums-16.mo
@ -1271,8 +1272,24 @@ ${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_waldump-16.mo
${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pgscripts-16.mo
${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/psql-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/ecpg-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/ecpglib6-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/initdb-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/libpq5-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_amcheck-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_archivecleanup-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_basebackup-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_checksums-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_config-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_controldata-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_ctl-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_dump-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_resetwal-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_rewind-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_test_fsync-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_test_timing-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_upgrade-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_verifybackup-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_waldump-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/psql-16.mo
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.4 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-contrib-/}
PKGREVISION= 2
COMMENT= Contrib subtree of tools and plug-ins
.include "../../databases/postgresql16/Makefile.common"

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.2 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.3 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-docs-/}
PKGREVISION= 1
COMMENT= PostgreSQL database documentation
.include "../../databases/postgresql16/Makefile.common"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2023/09/17 08:53:21 adam Exp $
@comment $NetBSD: PLIST,v 1.2 2023/11/13 20:22:08 adam Exp $
man/man1/clusterdb.1
man/man1/createdb.1
man/man1/createuser.1
@ -998,6 +998,7 @@ share/doc/postgresql/html/regress-run.html
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-16-1.html
share/doc/postgresql/html/release-16.html
share/doc/postgresql/html/release-prior.html
share/doc/postgresql/html/release.html

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.4 2023/11/13 20:22:09 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-plperl-/}
PKGREVISION= 2
COMMENT= PL/Perl procedural language for the PostgreSQL backend
DEPENDS+= postgresql16-server>=${PKGVERSION_NOREV}:../../databases/postgresql16-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.4 2023/11/13 20:22:09 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-plpython-/}
PKGREVISION= 2
COMMENT= PL/Python procedural language for the PostgreSQL backend
DEPENDS+= postgresql16-server>=${PKGVERSION_NOREV}:../../databases/postgresql16-server

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2023/09/17 08:53:21 adam Exp $
@comment $NetBSD: PLIST,v 1.2 2023/11/13 20:22:09 adam Exp $
include/postgresql/server/plpy_cursorobject.h
include/postgresql/server/plpy_elog.h
include/postgresql/server/plpy_exec.h
@ -35,6 +35,7 @@ ${PLIST.nls}share/locale/tr/LC_MESSAGES/plpython-16.mo
${PLIST.nls}share/locale/uk/LC_MESSAGES/plpython-16.mo
${PLIST.nls}share/locale/vi/LC_MESSAGES/plpython-16.mo
${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/plpython-16.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/plpython-16.mo
share/postgresql/extension/hstore_plpython3u--1.0.sql
share/postgresql/extension/hstore_plpython3u.control
${PLIST.py2x}share/postgresql/extension/plpython2u--1.0.sql

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/11/08 13:18:35 wiz Exp $
# $NetBSD: Makefile,v 1.4 2023/11/13 20:22:09 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-pltcl-/}
PKGREVISION= 2
COMMENT= PL/Tcl procedural language for the PostgreSQL backend
DEPENDS+= postgresql16-server>=${PKGVERSION_NOREV}:../../databases/postgresql16-server

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/11/08 13:18:35 wiz Exp $
# $NetBSD: Makefile,v 1.4 2023/11/13 20:22:09 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-server-/}
PKGREVISION= 2
COMMENT= PostgreSQL database server programs
# mips has no TAS implementation

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.3 2023/11/08 13:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.4 2023/11/13 20:22:08 adam Exp $
PKGNAME= ${DISTNAME:S/-/16-/}
PKGREVISION= 2
COMMENT= Robust, next generation, object-relational DBMS
DEPENDS+= postgresql16-client>=${PKGVERSION_NOREV}:../../databases/postgresql16-client

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.2 2023/09/20 11:39:40 adam Exp $
# $NetBSD: Makefile.common,v 1.3 2023/11/13 20:22:08 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -16,7 +16,7 @@
# used by databases/postgresql16-pltcl/Makefile
# used by databases/postgresql16-server/Makefile
DISTNAME= postgresql-16.0
DISTNAME= postgresql-16.1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2

View File

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.1 2023/09/17 08:53:21 adam Exp $
$NetBSD: distinfo,v 1.2 2023/11/13 20:22:08 adam Exp $
BLAKE2s (postgresql-16.0.tar.bz2) = 8b7d764bb1b5194c12191af8246c1c3f49b854f668e18d93e5450ef88b61a241
SHA512 (postgresql-16.0.tar.bz2) = c66b72d2d9bc503b9ad19c67384517ae921c494b2916f32157c2528dcbb38aefeb4a8cd5003fd40ba8a19612ea64511d534ff5d99e7a1b266024232f983bcf39
Size (postgresql-16.0.tar.bz2) = 24528207 bytes
BLAKE2s (postgresql-16.1.tar.bz2) = 9ee0564bc27659694ba7e536d75ae453d44a4f4d6d98763463ba6028e445a027
SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918
Size (postgresql-16.1.tar.bz2) = 24605482 bytes
SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
SHA1 (patch-config_perl.m4) = 9c4bf707b6aded63b2e0cff375465693cad1dea9
SHA1 (patch-configure) = 3392111516ca65ad7980ee39246c4210ec020c34