aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--postgresql-xml.patch20
3 files changed, 27 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 137e56417a46..ed83acf6b303 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = postgresql14
pkgdesc = Sophisticated object-relational DBMS
pkgver = 14.10
- pkgrel = 2
+ pkgrel = 3
url = https://www.postgresql.org/
arch = x86_64
license = custom:PostgreSQL
@@ -22,6 +22,7 @@ pkgbase = postgresql14
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 = postgresql.service
source = postgresql-check-db-dir
source = postgresql.sysusers
@@ -30,6 +31,7 @@ pkgbase = postgresql14
sha256sums = c99431c48e9d470b0d0ab946eb2141a3cd19130c2fb4dc4b3284a7774ecc8399
sha256sums = 02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a
sha256sums = af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb
+ sha256sums = 344a1ef322bccdbdec465ddd2d6752f453e6e349551fcf31d92b168d602da141
sha256sums = 5f45d2ad3a93f5ea87ea40bc82a5377e5b8faca9586bfa84d4efe05bdd90ebb6
sha256sums = e0445d31cbafe6a06af38224d4e6ff976cc8977d140adadc99a2e11f2152a485
sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
diff --git a/PKGBUILD b/PKGBUILD
index e27665d8a0e7..984bc46d14a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=postgresql14
pkgver=14.10
_majorver=${pkgver%.*}
pkgname=("${pkgbase}-libs" "${pkgbase}-docs" "${pkgbase}")
-pkgrel=2
+pkgrel=3
pkgdesc='Sophisticated object-relational DBMS'
url='https://www.postgresql.org/'
arch=('x86_64')
@@ -16,6 +16,7 @@ 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
@@ -24,6 +25,7 @@ source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.ta
sha256sums=('c99431c48e9d470b0d0ab946eb2141a3cd19130c2fb4dc4b3284a7774ecc8399'
'02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a'
'af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb'
+ '344a1ef322bccdbdec465ddd2d6752f453e6e349551fcf31d92b168d602da141'
'5f45d2ad3a93f5ea87ea40bc82a5377e5b8faca9586bfa84d4efe05bdd90ebb6'
'e0445d31cbafe6a06af38224d4e6ff976cc8977d140adadc99a2e11f2152a485'
'7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
@@ -34,6 +36,7 @@ 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
new file mode 100644
index 000000000000..4f6eaa12ab24
--- /dev/null
+++ b/postgresql-xml.patch
@@ -0,0 +1,20 @@
+--- 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;