fix FTBFS caused by update of libxml2
Resolves: rhbz:#1286692 Version: 9.4.5-5
This commit is contained in:
parent
bda5fb8479
commit
10326645ae
77
postgresql-fix-xml2.patch
Normal file
77
postgresql-fix-xml2.patch
Normal file
@ -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=''<''/>');
|
||||||
|
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=''<''/>');
|
||||||
|
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
|
||||||
|
---------------------
|
@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
|
|||||||
Name: postgresql
|
Name: postgresql
|
||||||
%global majorversion 9.4
|
%global majorversion 9.4
|
||||||
Version: 9.4.5
|
Version: 9.4.5
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
|
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
|
||||||
# recognizes it as an independent license, so we do as well.
|
# recognizes it as an independent license, so we do as well.
|
||||||
@ -118,6 +118,7 @@ Patch5: postgresql-var-run-socket.patch
|
|||||||
Patch6: postgresql-man.patch
|
Patch6: postgresql-man.patch
|
||||||
Patch7: postgresql-perl-5.22-test-fail.patch
|
Patch7: postgresql-perl-5.22-test-fail.patch
|
||||||
Patch8: postgresql-python3.5-tests.patch
|
Patch8: postgresql-python3.5-tests.patch
|
||||||
|
Patch9: postgresql-fix-xml2.patch
|
||||||
|
|
||||||
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
|
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
|
||||||
BuildRequires: perl(ExtUtils::Embed), perl-devel
|
BuildRequires: perl(ExtUtils::Embed), perl-devel
|
||||||
@ -359,6 +360,7 @@ benchmarks.
|
|||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
|
||||||
# We used to run autoconf here, but there's no longer any real need to,
|
# We used to run autoconf here, but there's no longer any real need to,
|
||||||
# since Postgres ships with a reasonably modern configure script.
|
# since Postgres ships with a reasonably modern configure script.
|
||||||
@ -1188,6 +1190,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 16 2015 Pavel Kajaba <pkajaba@redhat.com> - 9.4.5-5
|
||||||
|
- fixed problem with xml2 test (rhbz#1286692)
|
||||||
|
|
||||||
* Thu Dec 3 2015 Pavel Kajaba <pkajaba@redhat.com> - 9.4.5-4
|
* Thu Dec 3 2015 Pavel Kajaba <pkajaba@redhat.com> - 9.4.5-4
|
||||||
- fixed short-circuit build
|
- fixed short-circuit build
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user