From 0676281421ffbd9458d7f5c2ce4016c4db75203b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 31 Dec 2015 16:43:04 +0100
Subject: [PATCH] - fix for new libxml2 - rel 4

---
 postgresql-libxml2.patch | 77 ++++++++++++++++++++++++++++++++++++++++
 postgresql.spec          |  4 ++-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 postgresql-libxml2.patch

diff --git a/postgresql-libxml2.patch b/postgresql-libxml2.patch
new file mode 100644
index 0000000..6b97017
--- /dev/null
+++ b/postgresql-libxml2.patch
@@ -0,0 +1,77 @@
+diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
+index 9b7b393..72f0be3 100644
+--- a/src/test/regress/expected/xml.out
++++ b/src/test/regress/expected/xml.out
+@@ -9,8 +9,6 @@ ERROR:  invalid XML content
+ LINE 1: INSERT INTO xmltest VALUES (3, '<wrong');
+                                        ^
+ DETAIL:  line 1: Couldn't find end of Start Tag wrong line 1
+-<wrong
+-      ^
+ SELECT * FROM xmltest;
+  id |        data        
+ ----+--------------------
+@@ -63,8 +61,6 @@ ERROR:  invalid XML content
+ LINE 1: SELECT xmlconcat('bad', '<syntax');
+                                 ^
+ DETAIL:  line 1: Couldn't find end of Start Tag syntax line 1
+-<syntax
+-       ^
+ SELECT xmlconcat('<foo/>', NULL, '<?xml version="1.1" standalone="no"?><bar/>');
+   xmlconcat   
+ --------------
+@@ -212,16 +208,12 @@ DETAIL:  line 1: xmlParseEntityRef: no name
+ <invalidentity>&</invalidentity>
+                 ^
+ line 1: chunk is not well balanced
+-<invalidentity>&</invalidentity>
+-                                ^
+ SELECT xmlparse(content '<undefinedentity>&idontexist;</undefinedentity>');
+ ERROR:  invalid XML content
+ DETAIL:  line 1: Entity 'idontexist' not defined
+ <undefinedentity>&idontexist;</undefinedentity>
+                              ^
+ line 1: chunk is not well balanced
+-<undefinedentity>&idontexist;</undefinedentity>
+-                                               ^
+ SELECT xmlparse(content '<invalidns xmlns=''&lt;''/>');
+          xmlparse          
+ ---------------------------
+@@ -240,11 +232,7 @@ DETAIL:  line 1: Entity 'idontexist' not defined
+ <twoerrors>&idontexist;</unbalanced>
+                        ^
+ line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
+-<twoerrors>&idontexist;</unbalanced>
+-                                    ^
+ line 1: chunk is not well balanced
+-<twoerrors>&idontexist;</unbalanced>
+-                                    ^
+ SELECT xmlparse(content '<nosuchprefix:tag/>');
+       xmlparse       
+ ---------------------
+@@ -268,16 +256,12 @@ DETAIL:  line 1: xmlParseEntityRef: no name
+ <invalidentity>&</abc>
+                 ^
+ line 1: Opening and ending tag mismatch: invalidentity line 1 and abc
+-<invalidentity>&</abc>
+-                      ^
+ SELECT xmlparse(document '<undefinedentity>&idontexist;</abc>');
+ ERROR:  invalid XML document
+ DETAIL:  line 1: Entity 'idontexist' not defined
+ <undefinedentity>&idontexist;</abc>
+                              ^
+ line 1: Opening and ending tag mismatch: undefinedentity line 1 and abc
+-<undefinedentity>&idontexist;</abc>
+-                                   ^
+ SELECT xmlparse(document '<invalidns xmlns=''&lt;''/>');
+          xmlparse          
+ ---------------------------
+@@ -296,8 +280,6 @@ DETAIL:  line 1: Entity 'idontexist' not defined
+ <twoerrors>&idontexist;</unbalanced>
+                        ^
+ line 1: Opening and ending tag mismatch: twoerrors line 1 and unbalanced
+-<twoerrors>&idontexist;</unbalanced>
+-                                    ^
+ SELECT xmlparse(document '<nosuchprefix:tag/>');
+       xmlparse       
+ ---------------------
diff --git a/postgresql.spec b/postgresql.spec
index d3f819e..8721f98 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -33,7 +33,7 @@ Summary(uk.UTF-8):	PostgreSQL - система керування базами 
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql
 Version:	%{mver}.5
-Release:	3
+Release:	4
 License:	BSD
 Group:		Applications/Databases
 Source0:	ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
@@ -52,6 +52,7 @@ Patch3:		%{name}-ac_version.patch
 Patch4:		%{name}-disable_horology_test.patch
 Patch5:		%{name}-heimdal.patch
 Patch6:		%{name}-ossp_uuid.patch
+Patch7:		%{name}-libxml2.patch
 URL:		http://www.postgresql.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -769,6 +770,7 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch
-- 
2.44.0