PG14.11 release.

3 files changed, 22 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed83acf6b303..99db63e040cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = postgresql14
 	pkgdesc = Sophisticated object-relational DBMS
-	pkgver = 14.10
-	pkgrel = 3
+	pkgver = 14.11
+	pkgrel = 1
 	url = https://www.postgresql.org/
 	arch = x86_64
 	license = custom:PostgreSQL
 	makedepends = krb5
 	makedepends = libxml2
 	makedepends = python
+	makedepends = perl
 	makedepends = tcl>=8.6.0
 	makedepends = openssl>=1.0.0
 	makedepends = pam
@@ -18,25 +19,22 @@ pkgbase = postgresql14
 	makedepends = llvm15
 	makedepends = clang15
 	makedepends = libxslt
-	optdepends = perl
-	source = https://ftp.postgresql.org/pub/source/v14.10/postgresql-14.10.tar.bz2
-	source = postgresql-run-socket.patch
-	source = postgresql-perl-rpath.patch
-	source = postgresql-xml.patch
+	source = https://ftp.postgresql.org/pub/source/v14.11/postgresql-14.11.tar.bz2
 	source = postgresql.service
 	source = postgresql-check-db-dir
 	source = postgresql.sysusers
 	source = postgresql.tmpfiles
 	source = pgenv.sh
-	sha256sums = c99431c48e9d470b0d0ab946eb2141a3cd19130c2fb4dc4b3284a7774ecc8399
-	sha256sums = 02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a
-	sha256sums = af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb
-	sha256sums = 344a1ef322bccdbdec465ddd2d6752f453e6e349551fcf31d92b168d602da141
+	source = postgresql-run-socket.patch
+	source = postgresql-perl-rpath.patch
+	sha256sums = a670bd7dce22dcad4297b261136b3b1d4a09a6f541719562aa14ca63bf2968a8
 	sha256sums = 5f45d2ad3a93f5ea87ea40bc82a5377e5b8faca9586bfa84d4efe05bdd90ebb6
 	sha256sums = e0445d31cbafe6a06af38224d4e6ff976cc8977d140adadc99a2e11f2152a485
 	sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
 	sha256sums = 665c692161edee50ca0d8c3aae4a39a39c96ce2878cab30dbac4c6f4443c0cbc
 	sha256sums = c0e84a98a6241fad578ea6e862e24637fec1ed9e820ce1f3826af1c2869ba55d
+	sha256sums = 02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a
+	sha256sums = af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb
 
 pkgname = postgresql14-libs
 	pkgdesc = Libraries for use with PostgreSQL
@@ -59,7 +57,7 @@ pkgname = postgresql14-docs
 pkgname = postgresql14
 	pkgdesc = Sophisticated object-relational DBMS
 	install = postgresql.install
-	depends = postgresql14-libs>=14.10
+	depends = postgresql14-libs>=14.11
 	depends = krb5
 	depends = libxml2
 	depends = readline>=6.0
diff --git a/PKGBUILD b/PKGBUILD
index 984bc46d14a7..2411d5b926c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,38 @@
 # Maintainer: Marc Rechté <marc4@rechte.fr>
 
 pkgbase=postgresql14
-pkgver=14.10
+pkgver=14.11
 _majorver=${pkgver%.*}
 pkgname=("${pkgbase}-libs" "${pkgbase}-docs" "${pkgbase}")
-pkgrel=3
+pkgrel=1
 pkgdesc='Sophisticated object-relational DBMS'
 url='https://www.postgresql.org/'
 arch=('x86_64')
 license=('custom:PostgreSQL')
 # see bug 17943, which requires llvm15/clang15 instead of current version 16: https://www.postgresql.org/message-id/17943-56bb8c6bd4409b9f%40postgresql.org
-makedepends=('krb5' 'libxml2' 'python' 'tcl>=8.6.0' 'openssl>=1.0.0'
+makedepends=('krb5' 'libxml2' 'python' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0'
              'pam' 'zlib' 'icu' 'systemd' 'libldap' 'llvm15' 'clang15' 'libxslt')
-optdepends=('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=('c99431c48e9d470b0d0ab946eb2141a3cd19130c2fb4dc4b3284a7774ecc8399'
-            '02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a'
-            'af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb'
-            '344a1ef322bccdbdec465ddd2d6752f453e6e349551fcf31d92b168d602da141'
+        pgenv.sh
+        postgresql-run-socket.patch
+        postgresql-perl-rpath.patch)
+sha256sums=('a670bd7dce22dcad4297b261136b3b1d4a09a6f541719562aa14ca63bf2968a8'
             '5f45d2ad3a93f5ea87ea40bc82a5377e5b8faca9586bfa84d4efe05bdd90ebb6'
             'e0445d31cbafe6a06af38224d4e6ff976cc8977d140adadc99a2e11f2152a485'
             '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
             '665c692161edee50ca0d8c3aae4a39a39c96ce2878cab30dbac4c6f4443c0cbc'
-            'c0e84a98a6241fad578ea6e862e24637fec1ed9e820ce1f3826af1c2869ba55d')
+            'c0e84a98a6241fad578ea6e862e24637fec1ed9e820ce1f3826af1c2869ba55d'
+            '02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a'
+            'af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb')
 
 prepare() {
   cd postgresql-${pkgver}
   patch -p1 < ../postgresql-run-socket.patch
   patch -p1 < ../postgresql-perl-rpath.patch
-  patch -p1 < ../postgresql-xml.patch
 }
 
 build() {
@@ -47,7 +43,7 @@ build() {
     --with-gssapi
     --with-libxml
     --with-openssl
-#    --with-perl
+    --with-perl
     --with-python
     --with-tcl
     --with-pam
@@ -69,7 +65,7 @@ build() {
 }
 
 _postgres_check() {
-  make "${1}" || (find . -name regression.diffs | \
+  LANG=C make "${1}" || (find . -name regression.diffs | \
     while read -r line; do
       echo "make ${1} failure: ${line}"
       cat "${line}"
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;