Browse code
libxml2: Upgrading to 2.9.8
Change-Id: Ie3aef388c66d660018bd03be8c62610bdb075f4c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6323
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Dweep Advani authored on 2018/12/07 21:36:02Showing 3 changed files
- SPECS/libxml2/Fix_nullptr_deref_with_XPath_logic_ops.patch
- SPECS/libxml2/libxml2-2.9.4-remove-_PyVerify_fd-call.patch
- SPECS/libxml2/libxml2.spec
| ... | ... |
@@ -1,7 +1,6 @@ |
| 1 |
-diff -ru a/xpath.c b/xpath.c |
|
| 2 | 1 |
--- a/xpath.c 2017-10-26 07:54:40.000000000 +0000 |
| 3 |
-+++ b/xpath.c 2018-10-26 19:59:15.725601177 +0000 |
|
| 4 |
-@@ -13337,9 +13337,8 @@ |
|
| 2 |
+@@ -13297,9 +13297,8 @@ xmlXPathCompOpEval(xmlXPathParserContext |
|
| 5 | 3 |
return(0); |
| 6 | 4 |
} |
| 7 | 5 |
xmlXPathBooleanFunction(ctxt, 1); |
| ... | ... |
@@ -13,7 +12,7 @@ diff -ru a/xpath.c b/xpath.c |
| 13 | 13 |
xmlXPathReleaseObject(ctxt->context, arg2); |
| 14 | 14 |
return (total); |
| 15 | 15 |
case XPATH_OP_OR: |
| 16 |
-@@ -13363,9 +13362,8 @@ |
|
| 16 |
+@@ -13323,9 +13322,8 @@ xmlXPathCompOpEval(xmlXPathParserContext |
|
| 17 | 17 |
return(0); |
| 18 | 18 |
} |
| 19 | 19 |
xmlXPathBooleanFunction(ctxt, 1); |
| 20 | 20 |
deleted file mode 100644 |
| ... | ... |
@@ -1,18 +0,0 @@ |
| 1 |
-diff -rup libxml2-2.9.4/python/types.c libxml2-2.9.4-new/python/types.c |
|
| 2 |
-+++ libxml2-2.9.4-new/python/types.c 2017-10-02 14:35:58.021494879 -0700 |
|
| 3 |
-@@ -31,8 +31,12 @@ libxml_PyFileGet(PyObject *f) {
|
|
| 4 |
- const char *mode; |
|
| 5 |
- |
|
| 6 |
- fd = PyObject_AsFileDescriptor(f); |
|
| 7 |
-- if (!_PyVerify_fd(fd)) |
|
| 8 |
-- return(NULL); |
|
| 9 |
-+ /* |
|
| 10 |
-+ * https://bugzilla.gnome.org/show_bug.cgi?id=776815 |
|
| 11 |
-+ * if (!_PyVerify_fd(fd)) |
|
| 12 |
-+ * return(NULL); |
|
| 13 |
-+ */ |
|
| 14 |
-+ |
|
| 15 |
- /* |
|
| 16 |
- * Get the flags on the fd to understand how it was opened |
|
| 17 |
- */ |
| ... | ... |
@@ -3,8 +3,8 @@ |
| 3 | 3 |
|
| 4 | 4 |
Summary: Libxml2 |
| 5 | 5 |
Name: libxml2 |
| 6 |
-Version: 2.9.7 |
|
| 7 |
-Release: 2%{?dist}
|
|
| 6 |
+Version: 2.9.8 |
|
| 7 |
+Release: 1%{?dist}
|
|
| 8 | 8 |
License: MIT |
| 9 | 9 |
URL: http://xmlsoft.org/ |
| 10 | 10 |
Group: System Environment/General Libraries |
| ... | ... |
@@ -12,9 +12,8 @@ Vendor: VMware, Inc. |
| 12 | 12 |
Distribution: Photon |
| 13 | 13 |
Source0: ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
|
| 14 | 14 |
#https://bugs.python.org/issue23524 |
| 15 |
-Patch0: libxml2-2.9.4-remove-_PyVerify_fd-call.patch |
|
| 16 |
-Patch1: Fix_nullptr_deref_with_XPath_logic_ops.patch |
|
| 17 |
-%define sha1 libxml2=ab3325e6cdda50ab2382fdfe0bdb6f7d1b9224a6 |
|
| 15 |
+Patch0: Fix_nullptr_deref_with_XPath_logic_ops.patch |
|
| 16 |
+%define sha1 libxml2=66bcefd98a6b7573427cf66f9d3841b59eb5b8c3 |
|
| 18 | 17 |
Provides: pkgconfig(libxml-2.0) |
| 19 | 18 |
|
| 20 | 19 |
%description |
| ... | ... |
@@ -52,17 +51,9 @@ Static libraries and header files for the support library for libxml |
| 52 | 52 |
%prep |
| 53 | 53 |
%setup -q |
| 54 | 54 |
%patch0 -p1 |
| 55 |
-%patch1 -p1 |
|
| 56 |
-sed \ |
|
| 57 |
- -e /xmlInitializeCatalog/d \ |
|
| 58 |
- -e 's/((ent->checked =.*&&/(((ent->checked == 0) ||\ |
|
| 59 |
- ((ent->children == NULL) \&\& (ctxt->options \& XML_PARSE_NOENT))) \&\&/' \ |
|
| 60 |
- -i parser.c |
|
| 55 |
+ |
|
| 61 | 56 |
%build |
| 62 |
-./configure \ |
|
| 63 |
- --prefix=%{_prefix} \
|
|
| 64 |
- --bindir=%{_bindir} \
|
|
| 65 |
- --libdir=%{_libdir} \
|
|
| 57 |
+%configure \ |
|
| 66 | 58 |
--disable-static \ |
| 67 | 59 |
--with-history |
| 68 | 60 |
make %{?_smp_mflags}
|
| ... | ... |
@@ -74,10 +65,7 @@ find %{buildroot}/%{_libdir} -name '*.la' -delete
|
| 74 | 74 |
%{_fixperms} %{buildroot}/*
|
| 75 | 75 |
|
| 76 | 76 |
make clean |
| 77 |
-./configure \ |
|
| 78 |
- --prefix=%{_prefix} \
|
|
| 79 |
- --bindir=%{_bindir} \
|
|
| 80 |
- --libdir=%{_libdir} \
|
|
| 77 |
+%configure \ |
|
| 81 | 78 |
--disable-static \ |
| 82 | 79 |
--with-python=/usr/bin/python3 |
| 83 | 80 |
make %{?_smp_mflags}
|
| ... | ... |
@@ -117,6 +105,8 @@ rm -rf %{buildroot}/*
|
| 117 | 117 |
%{_libdir}/cmake/libxml2/libxml2-config.cmake
|
| 118 | 118 |
|
| 119 | 119 |
%changelog |
| 120 |
+* Fri Dec 07 2018 Dweep Advani <dadvani@vmware.com> 2.9.8-1 |
|
| 121 |
+- Upgrading to 2.9.8 |
|
| 120 | 122 |
* Fri Oct 26 2018 Siju Maliakkal <smaliakkal@vmware.com> 2.9.7-2 |
| 121 | 123 |
- Apply patch for CVE-2018-14404 |
| 122 | 124 |
* Mon Feb 12 2018 Xiaolin Li <xiaolinl@vmware.com> 2.9.7-1 |