@@ -1,7 +1,7 @@

 Summary:        C, C++, Objective C and Objective C++ front-end for the LLVM compiler.

 Name:           clang

 Version:        12.0.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        NCSA

 URL:            http://clang.llvm.org

 Group:          Development/Tools

@@ -34,7 +34,7 @@ Requires:       ncurses-devel

 The clang-devel package contains libraries, header files and documentation for developing applications that use clang.

 %prep

-%setup -q -n %{name}-%{version}.src

+%autosetup -n %{name}-%{version}.src -p1

 %build

 mkdir -p build

@@ -48,14 +48,14 @@ make %{?_smp_mflags}

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

 cd build

-make DESTDIR=%{buildroot} install

+make DESTDIR=%{buildroot} install %{?_smp_mflags}

 %post   -p /sbin/ldconfig

 %postun -p /sbin/ldconfig

 %check

 cd build

-make clang-check

+make clang-check %{?_smp_mflags}

 %clean

 rm -rf %{buildroot}/*

@@ -76,6 +76,8 @@ rm -rf %{buildroot}/*

 %{_includedir}/*

 %changelog

+*   Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 12.0.0-2

+-   Release bump up to use libxml2 2.9.12-1.

 *   Mon Apr 12 2021 Gerrit Photon <photon-checkins@vmware.com> 12.0.0-1

 -   Automatic Version Bump

 *   Tue Mar 16 2021 Michael Paquier <mpaquier@vmware.com> 11.0.1-2

@@ -1,7 +1,7 @@

 Summary:        Creates a common metadata repository

 Name:           createrepo_c

 Version:        0.16.0

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        GPLv2+

 Group:          System Environment/Base

 Vendor:         VMware, Inc.

@@ -84,6 +84,8 @@ ln -sf %{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo

 %{_lib64dir}/pkgconfig/%{name}.pc

 %changelog

+* Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 0.16.0-4

+- Release bump up to use libxml2 2.9.12-1.

 * Tue Nov 16 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 0.16.0-3

 - Bump up release for openssl

 * Fri Aug 20 2021 Shreenidhi Shedi <sshedi@vmware.com> 0.16.0-2

@@ -1,7 +1,7 @@

 Summary:        Docbook-xml-4.5

 Name:           docbook-xml

 Version:        4.5

-Release:        8%{?dist}

+Release:        9%{?dist}

 License:        MIT

 URL:            http://www.docbook.org

 Source0:        http://www.docbook.org/xml/4.5/%{name}-%{version}.zip

@@ -15,12 +15,12 @@ BuildRequires:  unzip

 BuildArch:      noarch

 %description

-The DocBook XML DTD-4.5 package contains document type definitions for 

-verification of XML data files against the DocBook rule set. These are 

-useful for structuring books and software documentation to a standard 

+The DocBook XML DTD-4.5 package contains document type definitions for

+verification of XML data files against the DocBook rule set. These are

+useful for structuring books and software documentation to a standard

 allowing you to utilize transformations already written for that standard.

 %prep

-%setup -c -T

+%autosetup -c -T -p1

 unzip %{SOURCE0}

 if [ `id -u` -eq 0 ]; then

   chown -R root.root .

@@ -135,7 +135,7 @@ if [ $1 -eq 0 ] ; then

     if [ -f /etc/xml/docbook ]; then

         xmlcatalog --noout --del \

         "file:///usr/share/xml/docbook/docbook-xml-4.5" /etc/xml/docbook

-        

+

         for DTDVERSION in 4.1.2 4.2 4.3 4.4 %{version}

         do

             xmlcatalog --noout --del \

@@ -160,7 +160,10 @@ fi

 %defattr(-,root,root)

 /usr/share/xml/docbook/%{name}-%{version}

 /etc/xml

+

 %changelog

+*   Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 4.5-9

+-   Release bump up to use libxml2 2.9.12-1.

 *   Thu May 18 2017 Xiaolin Li <xiaolinl@vmware.com> 4.5-8

 -   Remove libxml2-python from requires.

 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.5-7

@@ -1,7 +1,7 @@

 Summary:	Docbook-xsl-1.79.1

 Name:		docbook-xsl

 Version:	1.79.1

-Release:	7%{?dist}

+Release:	8%{?dist}

 License:	Apache License

 URL:		http://www.docbook.org

 Source0:	http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.bz2

@@ -9,7 +9,9 @@ Source0:	http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.bz2

 Group:		Development/Tools

 Vendor:		VMware, Inc.

 Distribution:	Photon

+

 Requires:	libxml2

+

 BuildRequires:	libxml2

 BuildRequires:  zip

 BuildArch:      noarch

@@ -20,7 +22,7 @@ verification of XML data files against the DocBook rule set. These are

 useful for structuring books and software documentation to a standard

 allowing you to utilize transformations already written for that standard.

 %prep

-%setup -q

+%autosetup -p1

 %build

 zip -d tools/lib/jython.jar Lib/distutils/command/wininst-6.exe

@@ -91,6 +93,8 @@ fi

 %{_docdir}/*

 %changelog

+*       Mon Nov 08 2021 Nitesh Kumar <kunitesh@vmware.com> 1.79.1-8

+-       Release bump up to use libxml2 2.9.12-1.

 *       Fri Jan 18 2019 Tapas Kundu <tkundu@vmware.com> 1.79.1-7

 -       Removed saxon jar files while installing

 *	Tue Dec 04 2018 Ashwin H<ashwinh@vmware.com> 1.79.1-6

@@ -1,7 +1,7 @@

 Summary:        Itstool-2.0.6

 Name:           itstool

 Version:        2.0.6

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv3+

 URL:            http://itstool.org

 Source0:        http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2

@@ -23,20 +23,23 @@ Itstool extracts messages from XML files and outputs PO template files, then mer

 translations from MO files to create translated XML files. It determines what

 to translate and how to chunk it into messages using the W3C Internationalization Tag Set (ITS).

 %prep

-%setup -q

+%autosetup -p1

 %build

 export PYTHON=/usr/bin/python3

 %configure

 make %{?_smp_mflags}

 %install

-make DESTDIR=%{buildroot} install

+make DESTDIR=%{buildroot} install %{?_smp_mflags}

 %files

 %defattr(-,root,root)

 %{_bindir}/*

 /usr/share/%{name}/*

 %{_mandir}/man1/*

+

 %changelog

+*   Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 2.0.6-3

+-   Release bump up to use libxml2 2.9.12-1.

 *   Mon Jul 20 2020 Tapas Kundu <tkundu@vmware.com> 2.0.6-2

 -   Build with python3

 -   Mass removal python2

@@ -1,7 +1,7 @@

 Summary:        Libical — an implementation of iCalendar protocols and data formats

 Name:           libical

 Version:        3.0.10

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        MPL-2.0

 Group:          System Environment/Libraries

 Vendor:         VMware, Inc.

@@ -29,17 +29,17 @@ The libical-devel package contains libraries and header files for developing

 applications that use libical.

 %prep

-%setup -q

+%autosetup -p1

 %build

 mkdir build

 cd build

 cmake -DENABLE_GTK_DOC=OFF ..

-make

+make %{?_smp_mflags}

 %install

 cd build

-make DESTDIR=%{buildroot} install

+make DESTDIR=%{buildroot} install %{?_smp_mflags}

 %check

 make %{?_smp_mflags} -k check

@@ -61,6 +61,8 @@ make %{?_smp_mflags} -k check

 /usr/local/lib64/pkgconfig/*.pc

 %changelog

+* Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 3.0.10-3

+- Release bump up to use libxml2 2.9.12-1.

 * Wed Jun 30 2021 Tapas Kundu <tkundu@vmware.com> 3.0.10-2

 - Need libxml2 in requires

 * Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 3.0.10-1

@@ -1,7 +1,7 @@

 Summary:         libsoup HTTP client/server library

 Name:            libsoup

 Version:         2.72.0

-Release:         1%{?dist}

+Release:         2%{?dist}

 License:         GPLv2

 URL:             http://wiki.gnome.org/LibSoup

 Group:           System Environment/Development

@@ -64,8 +64,7 @@ Requires:        %{name} = %{version}-%{release}

 These are the additional language files of libsoup.

 %prep

-%setup -q

-%patch0 -p1

+%autosetup -p1

 %build

 mkdir build

@@ -104,6 +103,8 @@ ninja test

 %defattr(-,root,root)

 %changelog

+*   Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 2.72.0-2

+-   Release bump up to use libxml2 2.9.12-1.

 *   Mon Sep 21 2020 Gerrit Photon <photon-checkins@vmware.com> 2.72.0-1

 -   Automatic Version Bump

 *   Wed Sep 09 2020 Gerrit Photon <photon-checkins@vmware.com> 2.71.1-1

@@ -1,7 +1,7 @@

 Summary:        Virtualization API library that supports KVM, QEMU, Xen, ESX etc

 Name:           libvirt

 Version:        7.5.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        LGPL

 URL:            http://libvirt.org/

 Source0:        http://libvirt.org/sources/%{name}-%{version}.tar.xz

@@ -194,6 +194,8 @@ find %{buildroot} -name '*.la' -delete

 %{_datadir}/libvirt/test-screenshot.png

 %changelog

+* Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 7.5.0-2

+- Release bump up to use libxml2 2.9.12-1.

 * Wed Jul 14 2021 Susant Sahani <ssahani@vmware.com> 7.5.0-1

 - Version Bump and switch to meson

 * Mon May 03 2021 Gerrit Photon <photon-checkins@vmware.com> 7.3.0-1

new file mode 100644

@@ -0,0 +1,208 @@

+From 85b1792e37b131e7a51af98a37f92472e8de5f3f Mon Sep 17 00:00:00 2001

+From: Nick Wellnhofer <wellnhofer@aevum.de>

+Date: Tue, 18 May 2021 20:08:28 +0200

+Subject: [PATCH] Work around lxml API abuse

+

+Make xmlNodeDumpOutput and htmlNodeDumpFormatOutput work with corrupted

+parent pointers. This used to work with the old recursive code but the

+non-recursive rewrite required parent pointers to be set correctly.

+

+Unfortunately, lxml relies on the old behavior and passes subtrees with

+a corrupted structure. Fall back to a recursive function call if an

+invalid parent pointer is detected.

+

+Fixes #255.

+---

+ HTMLtree.c | 46 ++++++++++++++++++++++++++++------------------

+ xmlsave.c  | 31 +++++++++++++++++++++----------

+ 2 files changed, 49 insertions(+), 28 deletions(-)

+

+diff --git a/HTMLtree.c b/HTMLtree.c

+index 24434d453..bdd639c7f 100644

+--- a/HTMLtree.c

+@@ -744,7 +744,7 @@ void

+ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+ 	                 xmlNodePtr cur, const char *encoding ATTRIBUTE_UNUSED,

+                          int format) {

+-    xmlNodePtr root;

++    xmlNodePtr root, parent;

+     xmlAttrPtr attr;

+     const htmlElemDesc * info;

+ 

+@@ -755,6 +755,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+     }

+ 

+     root = cur;

++    parent = cur->parent;

+     while (1) {

+         switch (cur->type) {

+         case XML_HTML_DOCUMENT_NODE:

+@@ -762,13 +763,25 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+             if (((xmlDocPtr) cur)->intSubset != NULL) {

+                 htmlDtdDumpOutput(buf, (xmlDocPtr) cur, NULL);

+             }

+-            if (cur->children != NULL) {

++            /* Always validate cur->parent when descending. */

++            if ((cur->parent == parent) && (cur->children != NULL)) {

++                parent = cur;

+                 cur = cur->children;

+                 continue;

+             }

+             break;

+ 

+         case XML_ELEMENT_NODE:

++            /*

++             * Some users like lxml are known to pass nodes with a corrupted

++             * tree structure. Fall back to a recursive call to handle this

++             * case.

++             */

++            if ((cur->parent != parent) && (cur->children != NULL)) {

++                htmlNodeDumpFormatOutput(buf, doc, cur, encoding, format);

++                break;

++            }

++

+             /*

+              * Get specific HTML info for that node.

+              */

+@@ -817,6 +830,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+                     (cur->name != NULL) &&

+                     (cur->name[0] != 'p')) /* p, pre, param */

+                     xmlOutputBufferWriteString(buf, "\n");

++                parent = cur;

+                 cur = cur->children;

+                 continue;

+             }

+@@ -825,9 +839,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+                 (info != NULL) && (!info->isinline)) {

+                 if ((cur->next->type != HTML_TEXT_NODE) &&

+                     (cur->next->type != HTML_ENTITY_REF_NODE) &&

+-                    (cur->parent != NULL) &&

+-                    (cur->parent->name != NULL) &&

+-                    (cur->parent->name[0] != 'p')) /* p, pre, param */

++                    (parent != NULL) &&

++                    (parent->name != NULL) &&

++                    (parent->name[0] != 'p')) /* p, pre, param */

+                     xmlOutputBufferWriteString(buf, "\n");

+             }

+ 

+@@ -842,9 +856,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+                 break;

+             if (((cur->name == (const xmlChar *)xmlStringText) ||

+                  (cur->name != (const xmlChar *)xmlStringTextNoenc)) &&

+-                ((cur->parent == NULL) ||

+-                 ((xmlStrcasecmp(cur->parent->name, BAD_CAST "script")) &&

+-                  (xmlStrcasecmp(cur->parent->name, BAD_CAST "style"))))) {

++                ((parent == NULL) ||

++                 ((xmlStrcasecmp(parent->name, BAD_CAST "script")) &&

++                  (xmlStrcasecmp(parent->name, BAD_CAST "style"))))) {

+                 xmlChar *buffer;

+ 

+                 buffer = xmlEncodeEntitiesReentrant(doc, cur->content);

+@@ -902,13 +916,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+                 break;

+             }

+ 

+-            /*

+-             * The parent should never be NULL here but we want to handle

+-             * corrupted documents gracefully.

+-             */

+-            if (cur->parent == NULL)

+-                return;

+-            cur = cur->parent;

++            cur = parent;

++            /* cur->parent was validated when descending. */

++            parent = cur->parent;

+ 

+             if ((cur->type == XML_HTML_DOCUMENT_NODE) ||

+                 (cur->type == XML_DOCUMENT_NODE)) {

+@@ -939,9 +949,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,

+                     (cur->next != NULL)) {

+                     if ((cur->next->type != HTML_TEXT_NODE) &&

+                         (cur->next->type != HTML_ENTITY_REF_NODE) &&

+-                        (cur->parent != NULL) &&

+-                        (cur->parent->name != NULL) &&

+-                        (cur->parent->name[0] != 'p')) /* p, pre, param */

++                        (parent != NULL) &&

++                        (parent->name != NULL) &&

++                        (parent->name[0] != 'p')) /* p, pre, param */

+                         xmlOutputBufferWriteString(buf, "\n");

+                 }

+             }

+diff --git a/xmlsave.c b/xmlsave.c

+index 61a40459b..aedbd5e70 100644

+--- a/xmlsave.c

+@@ -847,7 +847,7 @@ htmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {

+ static void

+ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {

+     int format = ctxt->format;

+-    xmlNodePtr tmp, root, unformattedNode = NULL;

++    xmlNodePtr tmp, root, unformattedNode = NULL, parent;

+     xmlAttrPtr attr;

+     xmlChar *start, *end;

+     xmlOutputBufferPtr buf;

+@@ -856,6 +856,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {

+     buf = ctxt->buf;

+ 

+     root = cur;

++    parent = cur->parent;

+     while (1) {

+         switch (cur->type) {

+         case XML_DOCUMENT_NODE:

+@@ -868,7 +869,9 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {

+             break;

+ 

+         case XML_DOCUMENT_FRAG_NODE:

+-            if (cur->children != NULL) {

++            /* Always validate cur->parent when descending. */

++            if ((cur->parent == parent) && (cur->children != NULL)) {

++                parent = cur;

+                 cur = cur->children;

+                 continue;

+             }

+@@ -887,7 +890,18 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {

+             break;

+ 

+         case XML_ELEMENT_NODE:

+-	    if ((cur != root) && (ctxt->format == 1) && (xmlIndentTreeOutput))

++            /*

++             * Some users like lxml are known to pass nodes with a corrupted

++             * tree structure. Fall back to a recursive call to handle this

++             * case.

++             */

++            if ((cur->parent != parent) && (cur->children != NULL)) {

++                xmlNodeDumpOutputInternal(ctxt, cur);

++                break;

++            }

++

++	    if ((ctxt->level > 0) && (ctxt->format == 1) &&

++                (xmlIndentTreeOutput))

+ 		xmlOutputBufferWrite(buf, ctxt->indent_size *

+ 				     (ctxt->level > ctxt->indent_nr ?

+ 				      ctxt->indent_nr : ctxt->level),

+@@ -942,6 +956,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {

+                 xmlOutputBufferWrite(buf, 1, ">");

+                 if (ctxt->format == 1) xmlOutputBufferWrite(buf, 1, "\n");

+                 if (ctxt->level >= 0) ctxt->level++;

++                parent = cur;

+                 cur = cur->children;

+                 continue;

+             }

+@@ -1058,13 +1073,9 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {

+                 break;

+             }

+ 

+-            /*

+-             * The parent should never be NULL here but we want to handle

+-             * corrupted documents gracefully.

+-             */

+-            if (cur->parent == NULL)

+-                return;

+-            cur = cur->parent;

++            cur = parent;

++            /* cur->parent was validated when descending. */

++            parent = cur->parent;

+ 

+             if (cur->type == XML_ELEMENT_NODE) {

+                 if (ctxt->level > 0) ctxt->level--;

deleted file mode 100644

@@ -1,33 +0,0 @@

-From 7ffcd44d7e6c46704f8af0321d9314cd26e0e18a Mon Sep 17 00:00:00 2001

-From: Zhipeng Xie <xiezhipeng1@huawei.com>

-Date: Tue, 20 Aug 2019 16:33:06 +0800

-Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream

-

-When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun

-alloc a new schema for ctxt->schema and set vctxt->xsiAssemble

-to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize

-vctxt->xsiAssemble to 0 again which cause the alloced schema

-can not be freed anymore.

-

-Found with libFuzzer.

-

-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>

- xmlschemas.c | 1 -

- 1 file changed, 1 deletion(-)

-

-diff --git a/xmlschemas.c b/xmlschemas.c

-index 301c84499..39d92182f 100644

-+++ b/xmlschemas.c

-@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) {

-     vctxt->nberrors = 0;

-     vctxt->depth = -1;

-     vctxt->skipDepth = -1;

--    vctxt->xsiAssemble = 0;

-     vctxt->hasKeyrefs = 0;

- #ifdef ENABLE_IDC_NODE_TABLES_TEST

-     vctxt->createIDCNodeTables = 1;

-GitLab

-

deleted file mode 100644

@@ -1,36 +0,0 @@

-From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001

-From: Nick Wellnhofer <wellnhofer@aevum.de>

-Date: Fri, 7 Aug 2020 21:54:27 +0200

-Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout'

-

-Make sure that truncated UTF-8 sequences don't cause an out-of-bounds

-array access.

-

-Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for

-the report.

-

-Fixes #178.

- xmllint.c | 6 ++++++

- 1 file changed, 6 insertions(+)

-

-diff --git a/xmllint.c b/xmllint.c

-index f6a8e4636..c647486f3 100644

-+++ b/xmllint.c

-@@ -528,6 +528,12 @@ static void

- xmlHTMLEncodeSend(void) {

-     char *result;

- 

-+    /*

-+     * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might

-+     * end with a truncated UTF-8 sequence. This is a hack to at least avoid

-+     * an out-of-bounds read.

-+     */

-+    memset(&buffer[sizeof(buffer)-4], 0, 4);

-     result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer);

-     if (result) {

- 	xmlGenericError(xmlGenericErrorContext, "%s", result);

-GitLab

-

deleted file mode 100644

@@ -1,32 +0,0 @@

-From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001

-From: Zhipeng Xie <xiezhipeng1@huawei.com>

-Date: Thu, 12 Dec 2019 17:30:55 +0800

-Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities

-

-When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef

-return NULL which cause a infinite loop in xmlStringLenDecodeEntities

-

-Found with libFuzzer.

-

-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>

- parser.c | 3 ++-

- 1 file changed, 2 insertions(+), 1 deletion(-)

-

-diff --git a/parser.c b/parser.c

-index d1c31963..a34bb6cd 100644

-+++ b/parser.c

-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,

-     else

-         c = 0;

-     while ((c != 0) && (c != end) && /* non input consuming loop */

--	   (c != end2) && (c != end3)) {

-+           (c != end2) && (c != end3) &&

-+           (ctxt->instate != XML_PARSER_EOF)) {

- 

- 	if (c == 0) break;

-         if ((c == '&') && (str[1] == '#')) {

-2.24.1

-

deleted file mode 100644

@@ -1,91 +0,0 @@

-From edc7b6abb0c125eeb888748c334897f60aab0854 Mon Sep 17 00:00:00 2001

-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

-Date: Fri, 28 Feb 2020 12:48:14 +0100

-Subject: [PATCH] Parenthesize Py<type>_Check() in ifs

-

-In C, if expressions should be parenthesized.

-PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized

-expression before, but that's not API to rely on.

-

-Since Python 3.9.0a4 it needs to be parenthesized explicitly.

-

-Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149

- python/libxml.c |  4 ++--

- python/types.c  | 12 ++++++------

- 2 files changed, 8 insertions(+), 8 deletions(-)

-

-diff --git a/python/libxml.c b/python/libxml.c

-index bc676c4e0..81e709f34 100644

-+++ b/python/libxml.c

-@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {

- 	lenread = PyBytes_Size(ret);

- 	data = PyBytes_AsString(ret);

- #ifdef PyUnicode_Check

--    } else if PyUnicode_Check (ret) {

-+    } else if (PyUnicode_Check (ret)) {

- #if PY_VERSION_HEX >= 0x03030000

-         Py_ssize_t size;

- 	const char *tmp;

-@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {

- 	lenread = PyBytes_Size(ret);

- 	data = PyBytes_AsString(ret);

- #ifdef PyUnicode_Check

--    } else if PyUnicode_Check (ret) {

-+    } else if (PyUnicode_Check (ret)) {

- #if PY_VERSION_HEX >= 0x03030000

-         Py_ssize_t size;

- 	const char *tmp;

-diff --git a/python/types.c b/python/types.c

-index c2bafeb19..ed284ec74 100644

-+++ b/python/types.c

-@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)

-     if (obj == NULL) {

-         return (NULL);

-     }

--    if PyFloat_Check (obj) {

-+    if (PyFloat_Check (obj)) {

-         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));

--    } else if PyLong_Check(obj) {

-+    } else if (PyLong_Check(obj)) {

- #ifdef PyLong_AS_LONG

-         ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));

- #else

-         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));

- #endif

- #ifdef PyBool_Check

--    } else if PyBool_Check (obj) {

-+    } else if (PyBool_Check (obj)) {

- 

-         if (obj == Py_True) {

-           ret = xmlXPathNewBoolean(1);

-@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)

-           ret = xmlXPathNewBoolean(0);

-         }

- #endif

--    } else if PyBytes_Check (obj) {

-+    } else if (PyBytes_Check (obj)) {

-         xmlChar *str;

- 

-         str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),

-                          PyBytes_GET_SIZE(obj));

-         ret = xmlXPathWrapString(str);

- #ifdef PyUnicode_Check

--    } else if PyUnicode_Check (obj) {

-+    } else if (PyUnicode_Check (obj)) {

- #if PY_VERSION_HEX >= 0x03030000

-         xmlChar *str;

- 	const char *tmp;

-@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)

- 	ret = xmlXPathWrapString(str);

- #endif

- #endif

--    } else if PyList_Check (obj) {

-+    } else if (PyList_Check (obj)) {

-         int i;

-         PyObject *node;

-         xmlNodePtr cur;

-GitLab

@@ -2,20 +2,17 @@

 Summary:        Libxml2

 Name:           libxml2

-Version:        2.9.10

-Release:        6%{?dist}

+Version:        2.9.12

+Release:        1%{?dist}

 License:        MIT

 URL:            http://xmlsoft.org/

 Group:          System Environment/General Libraries

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz

-%define sha1    libxml2=db6592ec9ca9708c4e71bf6bfd907bbb5cd40644

-Patch0:         CVE-2020-7595.patch

-Patch1:         CVE-2020-24977.patch

-Patch2:         fix_build_with_python3.9.patch

-Patch3:         CVE-2019-20388.patch

+%define sha1    libxml2=339fe5bb2a7d0c13f068c26d8f7cd194c13f9a2a

+Patch0:         0001-Work-around-lxml-API.patch

 BuildRequires:  python3-devel

 BuildRequires:  python3-libs

 BuildRequires:  zlib

@@ -43,48 +40,30 @@ Requires:   %{name} = %{version}

 Static libraries and header files for the support library for libxml

 %prep

-%setup -q

-%patch0 -p1

-%patch1 -p1

-%patch2 -p1

-%patch3 -p1

+%autosetup -p1

 %build

-%configure \

-    --disable-static \

-    --with-history

+%configure --disable-static --with-history --with-python=%{_bindir}/python3

 make %{?_smp_mflags}

 %install

-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*

-make DESTDIR=%{buildroot} install

+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*

+make DESTDIR=%{buildroot} install %{?_smp_mflags}

 find %{buildroot}/%{_libdir} -name '*.la' -delete

-%{_fixperms} %{buildroot}/*

-

-make clean

-%configure \

-    --disable-static \

-    --with-python=/usr/bin/python3

-make %{?_smp_mflags}

-make install DESTDIR=%{buildroot}

 %check

 make %{?_smp_mflags} check

-%post   -p /sbin/ldconfig

-%postun -p /sbin/ldconfig

+%ldconfig_scriptlets

+

 %clean

 rm -rf %{buildroot}/*

+

 %files

 %defattr(-,root,root)

-%{_docdir}/*

 %{_libdir}/libxml*

 %{_libdir}/xml2Conf.sh

 %{_bindir}/*

-%{_datadir}/aclocal/*

-%{_datadir}/gtk-doc/*

-%{_mandir}/man1/*

-

 %files -n python3-libxml2

 %defattr(-,root,root)

@@ -96,8 +75,14 @@ rm -rf %{buildroot}/*

 %{_mandir}/man3/*

 %{_libdir}/pkgconfig/libxml-2.0.pc

 %{_libdir}/cmake/libxml2/libxml2-config.cmake

+%{_docdir}/*

+%{_datadir}/gtk-doc/*

+%{_mandir}/man1/*

+%{_datadir}/aclocal/*

 %changelog

+*   Fri Oct 29 2021 Nitesh Kumar <kunitesh@vmware.com> 2.9.12-1

+-   Version Upgrade to 2.9.12 also optmizing the packages.

 *   Tue Dec 15 2020 Shreenidhi Shedi <sshedi@vmware.com> 2.9.10-6

 -   Fix build with new rpm

 *   Sat Nov 07 2020 Prashant S Chauhan <psinghchauha@vmware.com> 2.9.10-5

@@ -1,7 +1,7 @@

 Summary:        Libxslt

 Name:           libxslt

 Version:        1.1.34

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        MIT

 URL:            http:/http://xmlsoft.org/libxslt/

 Group:          System Environment/General Libraries

@@ -24,7 +24,7 @@ Requires:       libxslt = %{version}-%{release}

 Header files for doing development with libxslt.

 %prep

-%setup -q

+%autosetup -p1

 sed -i 's/int xsltMaxDepth = 3000/int xsltMaxDepth = 5000/g' libxslt/transform.c

 %build

@@ -35,7 +35,7 @@ sed -i 's/int xsltMaxDepth = 3000/int xsltMaxDepth = 5000/g' libxslt/transform.c

 make %{?_smp_mflags}

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

-make DESTDIR=%{buildroot} install

+make DESTDIR=%{buildroot} install %{?_smp_mflags}

 find %{buildroot} -name '*.la' -delete

 %{_fixperms} %{buildroot}/*

@@ -64,6 +64,8 @@ rm -rf %{buildroot}/*

 %{_mandir}/man3/*

 %changelog

+*   Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 1.1.34-4

+-   Release bump up to use libxml2 2.9.12-1.

 *   Fri Feb 19 2021 Shreyas B. <shreyasb@vmware.com> 1.1.34-3

 -   Increase the maximum number of nested template calls for xml.

 *   Fri Dec 18 2020 Shreenidhi Shedi <sshedi@vmware.com> 1.1.34-2

@@ -1,7 +1,7 @@

 Name: 		likewise-open

 Summary: 	Likewise Open

 Version: 	6.2.11.13

-Release: 	7%{?dist}

+Release: 	8%{?dist}

 Group:   	Development/Libraries

 Vendor: 	VMware, Inc.

 License: 	GPL 2.0,LGPL 2.1

@@ -311,6 +311,8 @@ rm -rf %{buildroot}/*

 /opt/likewise/lib64/pkgconfig/libedit.pc

 %changelog

+*   Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 6.2.11.13-8

+-   Release bump up to use libxml2 2.9.12-1.

 *   Mon Jul 12 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 6.2.11.13-7

 -   openssl 3.0.0 compatibility

 *   Mon May 24 2021 Shreenidhi Shedi <sshedi@vmware.com> 6.2.11.13-6

@@ -3,7 +3,7 @@

 Summary:        A next generation, high-performance debugger.

 Name:           lldb

 Version:        12.0.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        NCSA

 URL:            http://lldb.llvm.org

 Group:          Development/Tools

@@ -45,7 +45,7 @@ Requires:       python3-six

 The package contains the LLDB Python3 module.

 %prep

-%setup -q -n %{name}-%{version}.src

+%autosetup -n %{name}-%{version}.src -p1

 %build

 mkdir -p build

@@ -62,7 +62,7 @@ make %{?_smp_mflags}

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

 cd build

-make DESTDIR=%{buildroot} install

+make DESTDIR=%{buildroot} install %{?_smp_mflags}

 #Remove bundled python-six files

 rm -f %{buildroot}%{python3_sitelib}/six.*

@@ -93,6 +93,8 @@ rm -rf %{buildroot}/*

 %{python3_sitelib}/*

 %changelog

+*   Wed Nov 17 2021 Nitesh Kumar <kunitesh@vmware.com> 12.0.0-2

+-   Release bump up to use libxml2 2.9.12-1.

 *   Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 12.0.0-1

 -   Automatic Version Bump

 *   Thu Feb 04 2021 Shreenidhi Shedi <sshedi@vmware.com> 11.0.1-1

@@ -1,7 +1,7 @@

 Summary:        A collection of modular and reusable compiler and toolchain technologies.

 Name:           llvm

 Version:        12.0.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        NCSA

 URL:            http://lldb.llvm.org

 Group:          Development/Tools

@@ -36,7 +36,7 @@ Group:          System Environment/Libraries

 The libllvm package contains shared libraries for llvm

 %prep

-%setup -q -n %{name}-%{version}.src

+%autosetup -n %{name}-%{version}.src -p1

 %build

 mkdir -p build

@@ -53,7 +53,7 @@ make %{?_smp_mflags}