Browse code
libxml2: Upgrading to version 2.9.9
Change-Id: Ib28b96af2f90c73123becf9e6f803d47dabf2773
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6928
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
dweepadvani authored on 2019/03/27 01:25:07Showing 2 changed files
| 1 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,26 +0,0 @@ |
| 1 |
-+++ b/xpath.c 2018-12-06 17:26:45.633305896 -0800 |
|
| 2 |
-@@ -13297,9 +13297,8 @@ xmlXPathCompOpEval(xmlXPathParserContext |
|
| 3 |
- return(0); |
|
| 4 |
- } |
|
| 5 |
- xmlXPathBooleanFunction(ctxt, 1); |
|
| 6 |
-- arg1 = valuePop(ctxt); |
|
| 7 |
-- arg1->boolval &= arg2->boolval; |
|
| 8 |
-- valuePush(ctxt, arg1); |
|
| 9 |
-+ if (ctxt->value != NULL) |
|
| 10 |
-+ ctxt->value->boolval &= arg2->boolval; |
|
| 11 |
- xmlXPathReleaseObject(ctxt->context, arg2); |
|
| 12 |
- return (total); |
|
| 13 |
- case XPATH_OP_OR: |
|
| 14 |
-@@ -13323,9 +13322,8 @@ xmlXPathCompOpEval(xmlXPathParserContext |
|
| 15 |
- return(0); |
|
| 16 |
- } |
|
| 17 |
- xmlXPathBooleanFunction(ctxt, 1); |
|
| 18 |
-- arg1 = valuePop(ctxt); |
|
| 19 |
-- arg1->boolval |= arg2->boolval; |
|
| 20 |
-- valuePush(ctxt, arg1); |
|
| 21 |
-+ if (ctxt->value != NULL) |
|
| 22 |
-+ ctxt->value->boolval |= arg2->boolval; |
|
| 23 |
- xmlXPathReleaseObject(ctxt->context, arg2); |
|
| 24 |
- return (total); |
|
| 25 |
- case XPATH_OP_EQUAL: |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
|
| 4 | 4 |
Summary: Libxml2 |
| 5 | 5 |
Name: libxml2 |
| 6 |
-Version: 2.9.8 |
|
| 6 |
+Version: 2.9.9 |
|
| 7 | 7 |
Release: 1%{?dist}
|
| 8 | 8 |
License: MIT |
| 9 | 9 |
URL: http://xmlsoft.org/ |
| ... | ... |
@@ -12,8 +12,7 @@ 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: Fix_nullptr_deref_with_XPath_logic_ops.patch |
|
| 16 |
-%define sha1 libxml2=66bcefd98a6b7573427cf66f9d3841b59eb5b8c3 |
|
| 15 |
+%define sha1 libxml2=96686d1dd9fddf3b35a28b1e2e4bbacac889add3 |
|
| 17 | 16 |
Provides: pkgconfig(libxml-2.0) |
| 18 | 17 |
|
| 19 | 18 |
%description |
| ... | ... |
@@ -50,7 +49,6 @@ Static libraries and header files for the support library for libxml |
| 50 | 50 |
|
| 51 | 51 |
%prep |
| 52 | 52 |
%setup -q |
| 53 |
-%patch0 -p1 |
|
| 54 | 53 |
|
| 55 | 54 |
%build |
| 56 | 55 |
%configure \ |
| ... | ... |
@@ -105,6 +103,8 @@ rm -rf %{buildroot}/*
|
| 105 | 105 |
%{_libdir}/cmake/libxml2/libxml2-config.cmake
|
| 106 | 106 |
|
| 107 | 107 |
%changelog |
| 108 |
+* Tue Mar 26 2019 Dweep Advani <dadvani@vmware.com> 2.9.9-1 |
|
| 109 |
+- Upgraded to 2.9.9 |
|
| 108 | 110 |
* Fri Dec 07 2018 Dweep Advani <dadvani@vmware.com> 2.9.8-1 |
| 109 | 111 |
- Upgrading to 2.9.8 |
| 110 | 112 |
* Fri Oct 26 2018 Siju Maliakkal <smaliakkal@vmware.com> 2.9.7-2 |