PG15.6 release.

3 files changed, 18 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b92f1077466..122b864e9541 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = postgresql15
 	pkgdesc = Sophisticated object-relational DBMS
-	pkgver = 15.5
-	pkgrel = 5
+	pkgver = 15.6
+	pkgrel = 1
 	url = https://www.postgresql.org/
 	arch = x86_64
 	license = custom:PostgreSQL
@@ -20,24 +20,22 @@ pkgbase = postgresql15
 	makedepends = libxslt
 	optdepends = perl: perl support requires recompile with --with-perl
 	provides = postgresql
-	source = https://ftp.postgresql.org/pub/source/v15.5/postgresql-15.5.tar.bz2
-	source = postgresql-run-socket.patch
-	source = postgresql-perl-rpath.patch
-	source = postgresql-xml.patch
+	source = https://ftp.postgresql.org/pub/source/v15.6/postgresql-15.6.tar.bz2
 	source = postgresql.service
 	source = postgresql-check-db-dir
 	source = postgresql.sysusers
 	source = postgresql.tmpfiles
 	source = pgenv.sh
-	sha256sums = 8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6
-	sha256sums = 02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a
-	sha256sums = af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb
-	sha256sums = 344a1ef322bccdbdec465ddd2d6752f453e6e349551fcf31d92b168d602da141
+	source = postgresql-run-socket.patch
+	source = postgresql-perl-rpath.patch
+	sha256sums = 8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb
 	sha256sums = fe19a0f68a9f10435fe09efbe7407de8cbe9bf16686d63524778e90dad67f863
 	sha256sums = 8426f2ad548fb00452b340a631ab070899c0d44e7a88c8c3eec087c75ce32e6e
 	sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
 	sha256sums = fddc68565151077b4f514345087c38ca069d049b8a17dbf7eef2826f49ccbc7b
 	sha256sums = 1ea08f0f7819c9ef965ef7851a2262ae6f4837242d7fde2b6a8098b969d1133e
+	sha256sums = 02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a
+	sha256sums = af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb
 
 pkgname = postgresql15-libs
 	pkgdesc = Libraries for use with PostgreSQL
@@ -60,7 +58,7 @@ pkgname = postgresql15-docs
 pkgname = postgresql15
 	pkgdesc = Sophisticated object-relational DBMS
 	install = postgresql.install
-	depends = postgresql15-libs>=15.5
+	depends = postgresql15-libs>=15.6
 	depends = krb5
 	depends = libxml2
 	depends = readline>=6.0
diff --git a/PKGBUILD b/PKGBUILD
index 66fc85b4977d..f256186526a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Marc Rechté <marc4@rechte.fr>
 
 pkgbase=postgresql15
-pkgver=15.5
+pkgver=15.6
 _majorver=${pkgver%.*}
 pkgname=("${pkgbase}-libs" "${pkgbase}-docs" "${pkgbase}")
-pkgrel=5
+pkgrel=1
 pkgdesc='Sophisticated object-relational DBMS'
 url='https://www.postgresql.org/'
 arch=('x86_64')
@@ -14,29 +14,26 @@ makedepends=('krb5' 'libxml2' 'python' 'tcl>=8.6.0' 'openssl>=1.0.0'
              'pam' 'zlib' 'icu' 'systemd' 'libldap' 'llvm' 'clang' 'libxslt')
 optdepends=('perl: perl support requires recompile with --with-perl')
 source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        postgresql-run-socket.patch
-        postgresql-perl-rpath.patch
-        postgresql-xml.patch
         postgresql.service
         postgresql-check-db-dir
         postgresql.sysusers
         postgresql.tmpfiles
-        pgenv.sh)
-sha256sums=('8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6'
-            '02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a'
-            'af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb'
-            '344a1ef322bccdbdec465ddd2d6752f453e6e349551fcf31d92b168d602da141'
+        pgenv.sh
+        postgresql-run-socket.patch
+        postgresql-perl-rpath.patch)
+sha256sums=('8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb'
             'fe19a0f68a9f10435fe09efbe7407de8cbe9bf16686d63524778e90dad67f863'
             '8426f2ad548fb00452b340a631ab070899c0d44e7a88c8c3eec087c75ce32e6e'
             '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
             'fddc68565151077b4f514345087c38ca069d049b8a17dbf7eef2826f49ccbc7b'
-            '1ea08f0f7819c9ef965ef7851a2262ae6f4837242d7fde2b6a8098b969d1133e')
+            '1ea08f0f7819c9ef965ef7851a2262ae6f4837242d7fde2b6a8098b969d1133e'
+            '02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a'
+            'af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb')
 
 prepare() {
   cd postgresql-${pkgver}
   patch -p1 < ../postgresql-run-socket.patch
   patch -p1 < ../postgresql-perl-rpath.patch
-  patch -p1 < ../postgresql-xml.patch
 }
 
 build() {
diff --git a/postgresql-xml.patch b/postgresql-xml.patch
deleted file mode 100644
index 4f6eaa12ab24..000000000000
--- a/postgresql-xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- postgresql-15.5_ori/src/backend/utils/adt/xml.c	2023-11-06 23:06:45.000000000 +0100
-+++ postgresql-15.5/src/backend/utils/adt/xml.c	2023-12-19 14:04:26.288122882 +0100
-@@ -119,7 +119,7 @@
- 
- static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID,
- 										   xmlParserCtxtPtr ctxt);
--static void xml_errorHandler(void *data, xmlErrorPtr error);
-+static void xml_errorHandler(void *data, const xmlError *error);
- static void xml_ereport_by_code(int level, int sqlcode,
- 								const char *msg, int errcode);
- static void chopStringInfoNewlines(StringInfo str);
-@@ -1749,7 +1749,7 @@
-  * Error handler for libxml errors and warnings
-  */
- static void
--xml_errorHandler(void *data, xmlErrorPtr error)
-+xml_errorHandler(void *data, const xmlError *error)
- {
- 	PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data;
- 	xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;