up to 16.2

diff --git a/ac.patch b/ac.patch
index 6e8bca00e022dbfa72edb989914e4f218a1626b8..25a40c77f4d156bf022f9d4cc751e7affb813974 100644 (file)
--- a/ac.patch
+++ b/ac.patch
@@ -2,7 +2,7 @@
 +++ postgresql-14.0/configure.ac       2021-11-09 09:38:45.296275820 +0100
 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un
  
- AC_INIT([PostgreSQL], [16.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [16.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/libxml2-2.12.patch b/libxml2-2.12.patch
deleted file mode 100644 (file)
index 6c45f20..0000000
--- a/libxml2-2.12.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- postgresql-16.1/src/backend/utils/adt/xml.c.orig   2023-11-06 23:04:27.000000000 +0100
-+++ postgresql-16.1/src/backend/utils/adt/xml.c        2023-12-22 01:16:10.408867469 +0100
-@@ -123,7 +123,11 @@
-                                                                                  xmlParserCtxtPtr ctxt);
- static void xml_errsave(Node *escontext, PgXmlErrorContext *errcxt,
-                                               int sqlcode, const char *msg);
-+#if defined(LIBXML_VERSION) && LIBXML_VERSION >= 21200
-+static void xml_errorHandler(void *data, const xmlError *error);
-+#else
- static void xml_errorHandler(void *data, xmlErrorPtr error);
-+#endif
- static int    errdetail_for_xml_code(int code);
- static void chopStringInfoNewlines(StringInfo str);
- static void appendStringInfoLineSeparator(StringInfo str);
-@@ -2001,8 +2005,13 @@
- /*
-  * Error handler for libxml errors and warnings
-  */
-+#if defined(LIBXML_VERSION) && LIBXML_VERSION >= 21200
-+static void
-+xml_errorHandler(void *data, const xmlError *error)
-+#else
- static void
- xml_errorHandler(void *data, xmlErrorPtr error)
-+#endif
- {
-       PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data;
-       xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;

diff --git a/postgresql.spec b/postgresql.spec
index 6d5f7e5a380b83988ff0cc624192381710451192..27c869752f18f704e9ab535f8a186a7149ee6681 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -33,12 +33,12 @@ Summary(tr.UTF-8):  Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):     PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
-Version:       %{mver}.1
+Version:       %{mver}.2
 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       https://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 9cbfb9076ed06384471802b850698a6d
+# Source0-md5: 3d19d93434666db5d33e692472915ae5
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -50,7 +50,6 @@ Patch0:               %{name}-conf.patch
 Patch1:                %{name}-absolute_dbpaths.patch
 Patch2:                %{name}-ecpg-includedir.patch
 Patch3:                ac.patch
-Patch4:                libxml2-2.12.patch
 Patch5:                %{name}-heimdal.patch
 Patch6:                %{name}-link.patch
 URL:           https://www.postgresql.org/
@@ -803,7 +802,6 @@ Różne moduły dołączone do PostgreSQL-a.
 %{?with_absolute_dbpaths:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1