#3 updated to 2.9.7
Closed 2 years ago by ignatenkobrain. Opened 2 years ago by kloczek.
rpms/ kloczek/libxml2 master  into  master

@@ -1,54 +0,0 @@ 

- From 3157cf4e53c03bc3da604472c015c63141907db8 Mon Sep 17 00:00:00 2001

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

- Date: Wed, 20 Sep 2017 16:13:29 +0200

- Subject: [PATCH] Report undefined XPath variable error message

- MIME-Version: 1.0

- Content-Type: text/plain; charset=UTF-8

- Content-Transfer-Encoding: 8bit

- 

- Commit c851970 removed a redundant error message if XPath evaluation

- failed. This uncovered a case where an undefined XPath variable error

- wasn't reported correctly.

- 

- Thanks to Petr Pisar for the report.

- 

- Fixes bug 787941.

- 

- Signed-off-by: Petr Písař <ppisar@redhat.com>

- ---

-  xpath.c | 12 ++++--------

-  1 file changed, 4 insertions(+), 8 deletions(-)

- 

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

- index 2c1b2681..94815075 100644

- --- a/xpath.c

- +++ b/xpath.c

- @@ -13531,10 +13531,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)

-                          xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);

-                  if (op->value5 == NULL) {

-  		    val = xmlXPathVariableLookup(ctxt->context, op->value4);

- -		    if (val == NULL) {

- -			ctxt->error = XPATH_UNDEF_VARIABLE_ERROR;

- -			return(0);

- -		    }

- +		    if (val == NULL)

- +			XP_ERROR0(XPATH_UNDEF_VARIABLE_ERROR);

-                      valuePush(ctxt, val);

-  		} else {

-                      const xmlChar *URI;

- @@ -13549,10 +13547,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)

-                      }

-  		    val = xmlXPathVariableLookupNS(ctxt->context,

-                                                         op->value4, URI);

- -		    if (val == NULL) {

- -			ctxt->error = XPATH_UNDEF_VARIABLE_ERROR;

- -			return(0);

- -		    }

- +		    if (val == NULL)

- +			XP_ERROR0(XPATH_UNDEF_VARIABLE_ERROR);

-                      valuePush(ctxt, val);

-                  }

-                  return (total);

- -- 

- 2.13.5

- 

@@ -0,0 +1,191 @@ 

+ Make the XML entity recursion check more precise.

+ 

+ libxml doesn't detect entity recursion specifically but has a variety

+ of related checks, such as entities not expanding too deeply or

+ producing exponential blow-ups in content.

+ 

+ Because entity declarations are parsed in a separate context with

+ their own element recursion budget, a recursive entity can overflow

+ the stack using a lot of open elements (but within the per-context

+ limit) as it slowly consumes (but does not exhaust) the entity depth

+ budget.

+ 

+ This adds a specific, precise check for recursive entities that

+ detects entity recursion specifically and fails immediately.

+ 

+ The existing entity expansion depth checks are still relevant for long

+ chains of different entities.

+ 

+ BUG=628581

+ 

+ Review-Url: https://codereview.chromium.org/2539003002

+ Cr-Commit-Position: refs/heads/master@{#436899}

+ 

+ 

+ Index: libxml2-2.9.4/entities.c

+ ===================================================================

+ --- libxml2-2.9.4.orig/entities.c

+ +++ libxml2-2.9.4/entities.c

+ @@ -159,6 +159,7 @@ xmlCreateEntity(xmlDictPtr dict, const x

+      memset(ret, 0, sizeof(xmlEntity));

+      ret->type = XML_ENTITY_DECL;

+      ret->checked = 0;

+ +    ret->guard = XML_ENTITY_NOT_BEING_CHECKED;

+  

+      /*

+       * fill the structure.

+ @@ -931,6 +932,7 @@ xmlCopyEntity(xmlEntityPtr ent) {

+  	cur->orig = xmlStrdup(ent->orig);

+      if (ent->URI != NULL)

+  	cur->URI = xmlStrdup(ent->URI);

+ +    cur->guard = 0;

+      return(cur);

+  }

+  

+ Index: libxml2-2.9.4/include/libxml/entities.h

+ ===================================================================

+ --- libxml2-2.9.4.orig/include/libxml/entities.h

+ +++ libxml2-2.9.4/include/libxml/entities.h

+ @@ -30,6 +30,11 @@ typedef enum {

+      XML_INTERNAL_PREDEFINED_ENTITY = 6

+  } xmlEntityType;

+  

+ +typedef enum {

+ +  XML_ENTITY_NOT_BEING_CHECKED,

+ +  XML_ENTITY_BEING_CHECKED              /* entity check is in progress */

+ +} xmlEntityRecursionGuard;

+ +

+  /*

+   * An unit of storage for an entity, contains the string, the value

+   * and the linkind data needed for the linking in the hash table.

+ @@ -60,6 +65,7 @@ struct _xmlEntity {

+  					/* this is also used to count entities

+  					 * references done from that entity

+  					 * and if it contains '<' */

+ +     xmlEntityRecursionGuard guard;

+  };

+  

+  /*

+ Index: libxml2-2.9.4/parser.c

+ ===================================================================

+ --- libxml2-2.9.4.orig/parser.c

+ +++ libxml2-2.9.4/parser.c

+ @@ -133,6 +133,10 @@ xmlParserEntityCheck(xmlParserCtxtPtr ct

+      if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)

+          return (1);

+  

+ +	if ((ent != NULL) && (ent->guard == XML_ENTITY_BEING_CHECKED)) {

+ +        xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);

+ +        return (1);

+ +    }

+      /*

+       * This may look absurd but is needed to detect

+       * entities problems

+ @@ -143,12 +147,14 @@ xmlParserEntityCheck(xmlParserCtxtPtr ct

+  	unsigned long oldnbent = ctxt->nbentities;

+  	xmlChar *rep;

+  

+ +    ent->guard = XML_ENTITY_BEING_CHECKED;

+  	ent->checked = 1;

+  

+          ++ctxt->depth;

+  	rep = xmlStringDecodeEntities(ctxt, ent->content,

+  				  XML_SUBSTITUTE_REF, 0, 0, 0);

+          --ctxt->depth;

+ +	ent->guard = XML_ENTITY_NOT_BEING_CHECKED;

+  	if (ctxt->errNo == XML_ERR_ENTITY_LOOP) {

+  	    ent->content[0] = 0;

+  	}

+ @@ -7337,23 +7343,28 @@ xmlParseReference(xmlParserCtxtPtr ctxt)

+  	 * if its replacement text matches the production labeled

+  	 * content.

+  	 */

+ -	if (ent->etype == XML_INTERNAL_GENERAL_ENTITY) {

+ -	    ctxt->depth++;

+ -	    ret = xmlParseBalancedChunkMemoryInternal(ctxt, ent->content,

+ -	                                              user_data, &list);

+ -	    ctxt->depth--;

+ -

+ -	} else if (ent->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY) {

+ -	    ctxt->depth++;

+ -	    ret = xmlParseExternalEntityPrivate(ctxt->myDoc, ctxt, ctxt->sax,

+ -	                                   user_data, ctxt->depth, ent->URI,

+ -					   ent->ExternalID, &list);

+ -	    ctxt->depth--;

+ -	} else {

+ -	    ret = XML_ERR_ENTITY_PE_INTERNAL;

+ -	    xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR,

+ -			 "invalid entity type found\n", NULL);

+ -	}

+ +    if (ent->guard == XML_ENTITY_BEING_CHECKED) {

+ +        ret = XML_ERR_ENTITY_LOOP;

+ +    } else {

+ +        ent->guard = XML_ENTITY_BEING_CHECKED;

+ +        if (ent->etype == XML_INTERNAL_GENERAL_ENTITY) {

+ +            ctxt->depth++;

+ +            ret = xmlParseBalancedChunkMemoryInternal(ctxt, ent->content,

+ +                                                      user_data, &list);

+ +            ctxt->depth--;

+ +        } else if (ent->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY) {

+ +            ctxt->depth++;

+ +            ret = xmlParseExternalEntityPrivate(ctxt->myDoc, ctxt, ctxt->sax,

+ +                                           user_data, ctxt->depth, ent->URI,

+ +                                           ent->ExternalID, &list);

+ +            ctxt->depth--;

+ +        } else {

+ +            ret = XML_ERR_ENTITY_PE_INTERNAL;

+ +            xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR,

+ +                         "invalid entity type found\n", NULL);

+ +        }

+ +        ent->guard = XML_ENTITY_NOT_BEING_CHECKED;

+ +    }

+  

+  	/*

+  	 * Store the number of entities needing parsing for this entity

+ @@ -7456,23 +7467,29 @@ xmlParseReference(xmlParserCtxtPtr ctxt)

+  	    else

+  		user_data = ctxt->userData;

+  

+ -	    if (ent->etype == XML_INTERNAL_GENERAL_ENTITY) {

+ -		ctxt->depth++;

+ -		ret = xmlParseBalancedChunkMemoryInternal(ctxt,

+ -				   ent->content, user_data, NULL);

+ -		ctxt->depth--;

+ -	    } else if (ent->etype ==

+ -		       XML_EXTERNAL_GENERAL_PARSED_ENTITY) {

+ -		ctxt->depth++;

+ -		ret = xmlParseExternalEntityPrivate(ctxt->myDoc, ctxt,

+ -			   ctxt->sax, user_data, ctxt->depth,

+ -			   ent->URI, ent->ExternalID, NULL);

+ -		ctxt->depth--;

+ -	    } else {

+ -		ret = XML_ERR_ENTITY_PE_INTERNAL;

+ -		xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR,

+ -			     "invalid entity type found\n", NULL);

+ -	    }

+ +        if (ent->guard == XML_ENTITY_BEING_CHECKED) {

+ +            ret = XML_ERR_ENTITY_LOOP;

+ +        } else {

+ +            ent->guard = XML_ENTITY_BEING_CHECKED;

+ +            if (ent->etype == XML_INTERNAL_GENERAL_ENTITY) {

+ +                ctxt->depth++;

+ +                ret = xmlParseBalancedChunkMemoryInternal(ctxt,

+ +                                   ent->content, user_data, NULL);

+ +                ctxt->depth--;

+ +            } else if (ent->etype ==

+ +                       XML_EXTERNAL_GENERAL_PARSED_ENTITY) {

+ +                ctxt->depth++;

+ +                ret = xmlParseExternalEntityPrivate(ctxt->myDoc, ctxt,

+ +                           ctxt->sax, user_data, ctxt->depth,

+ +                           ent->URI, ent->ExternalID, NULL);

+ +                ctxt->depth--;

+ +            } else {

+ +                ret = XML_ERR_ENTITY_PE_INTERNAL;

+ +                xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR,

+ +                             "invalid entity type found\n", NULL);

+ +            }

+ +            ent->guard = XML_ENTITY_NOT_BEING_CHECKED;

+ +        }

+  	    if (ret == XML_ERR_ENTITY_LOOP) {

+  		xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);

+  		return;

file modified
+122 -155

@@ -1,186 +1,139 @@ 

- %global with_python3 1

- 

- Summary: Library providing XML and HTML support

- Name: libxml2

- Version: 2.9.5

- Release: 2%{?dist}%{?extra_release}

- License: MIT

- Group: Development/Libraries

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

- BuildRoot: %{_tmppath}/%{name}-%{version}-root

- BuildRequires: python-devel

- %if 0%{?with_python3}

- BuildRequires: python3-devel

- %endif # with_python3

- BuildRequires: zlib-devel

- BuildRequires: pkgconfig

- BuildRequires: xz-devel

- URL: http://xmlsoft.org/

- Patch0: libxml2-multilib.patch

- Patch1: libxml2-2.9.0-do-not-check-crc.patch

+ %bcond_without	python3			# enable build python3 subpackage

+ 

+ Summary:	Library providing XML and HTML support

+ Name:		libxml2

+ Version:	2.9.7

+ Release:	1%{?dist}%{?extra_release}

+ License:	MIT

+ URL:		http://xmlsoft.org/

+ Source:		ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz

+ BuildRequires:	python-devel

+ %if %{with python3}

+ BuildRequires:	python3-devel

+ %endif

+ BuildRequires:	pkgconfig

+ BuildRequires:	xz-devel

+ BuildRequires:	zlib-devel

+ Patch0:		%{name}-multilib.patch

+ Patch1:		%{name}-2.9.0-do-not-check-crc.patch

  # In python3.6 _PyVerify_fd is no more

  #  http://bugs.python.org/issue23524

- Patch2: libxml2-2.9.4-remove-pyverify_fd.patch

- # Fix reporting error about undefined XPath variables, bug #1493613,

- # Gnome bug #787941, fixed in upstream after 2.9.5

- Patch3: libxml2-2.9.5-Report-undefined-XPath-variable-error-message.patch

+ Patch2:		%{name}-2.9.4-remove-pyverify_fd.patch

+ Patch3:		%{name}-CVE-2016-9597.patch

+ Obsoletes:	libxml2-static

  

  %description

- This library allows to manipulate XML files. It includes support

- to read, modify and write XML and HTML files. There is DTDs support

- this includes parsing and validation even with complex DtDs, either

- at parse time or later once the document has been modified. The output

- can be a simple SAX stream or and in-memory DOM like representations.

- In this case one can use the built-in XPath and XPointer implementation

- to select sub nodes or ranges. A flexible Input/Output mechanism is

- available, with existing HTTP and FTP modules and combined to an

- URI library.

+ This library allows to manipulate XML files. It includes support to read,

+ modify and write XML and HTML files. There is DTDs support this includes

+ parsing and validation even with complex DtDs, either at parse time or

+ later once the document has been modified. The output can be a simple SAX

+ stream or and in-memory DOM like representations. In this case one can

+ use the built-in XPath and XPointer implementation to select sub nodes or

+ ranges. A flexible Input/Output mechanism is available, with existing

+ HTTP and FTP modules and combined to an URI library.

  

  %package devel

- Summary: Libraries, includes, etc. to develop XML and HTML applications

- Group: Development/Libraries

- Requires: libxml2 = %{version}-%{release}

- Requires: zlib-devel

- Requires: xz-devel

- Requires: pkgconfig

+ Summary:	Libraries, includes, etc. to develop XML and HTML applications

+ Requires:	%{name}%{?_isa} = %{version}-%{release}

  

  %description devel

  Libraries, include files, etc you can use to develop XML applications.

- This library allows to manipulate XML files. It includes support

- to read, modify and write XML and HTML files. There is DTDs support

- this includes parsing and validation even with complex DtDs, either

- at parse time or later once the document has been modified. The output

- can be a simple SAX stream or and in-memory DOM like representations.

- In this case one can use the built-in XPath and XPointer implementation

- to select sub nodes or ranges. A flexible Input/Output mechanism is

- available, with existing HTTP and FTP modules and combined to an

- URI library.

- 

- %package static

- Summary: Static library for libxml2

- Group: Development/Libraries

- Requires: libxml2 = %{version}-%{release}

- 

- %description static

- Static library for libxml2 provided for specific uses or shaving a few

- microseconds when parsing, do not link to them for generic purpose packages.

+ This library allows to manipulate XML files. It includes support to read,

+ modify and write XML and HTML files. There is DTDs support this includes

+ parsing and validation even with complex DtDs, either at parse time or

+ later once the document has been modified. The output can be a simple SAX

+ stream or and in-memory DOM like representations. In this case one can

+ use the built-in XPath and XPointer implementation to select sub nodes or

+ ranges. A flexible Input/Output mechanism is available, with existing

+ HTTP and FTP modules and combined to an URI library.

  

  %package -n python2-%{name}

  %{?python_provide:%python_provide python2-%{name}}

- Summary: Python bindings for the libxml2 library

- Group: Development/Libraries

- Requires: libxml2 = %{version}-%{release}

- Obsoletes: %{name}-python < %{version}-%{release}

- Provides: %{name}-python = %{version}-%{release}

+ Summary:	Python bindings for the libxml2 library

+ Requires:	%{name}%{?_isa} = %{version}-%{release}

+ Obsoletes:	%{name}-python < %{version}-%{release}

+ Provides:	%{name}-python = %{version}-%{release}

  

  %description -n python2-%{name}

- The libxml2-python package contains a Python 2 module that permits applications

- written in the Python programming language, version 2, to use the interface

- supplied by the libxml2 library to manipulate XML files.

+ The libxml2-python package contains a Python 2 module that permits

+ applications written in the Python programming language, version 2, to

+ use the interface supplied by the libxml2 library to manipulate XML

+ files.

  

- This library allows to manipulate XML files. It includes support

- to read, modify and write XML and HTML files. There is DTDs support

- this includes parsing and validation even with complex DTDs, either

- at parse time or later once the document has been modified.

+ This library allows to manipulate XML files. It includes support to read,

+ modify and write XML and HTML files. There is DTDs support this includes

+ parsing and validation even with complex DTDs, either at parse time or

+ later once the document has been modified.

  

- %if 0%{?with_python3}

  %package -n python3-%{name}

- Summary: Python 3 bindings for the libxml2 library

- Group: Development/Libraries

- Requires: libxml2 = %{version}-%{release}

- Obsoletes: %{name}-python3 < %{version}-%{release}

- Provides: %{name}-python3 = %{version}-%{release}

+ Summary:	Python 3 bindings for the libxml2 library

+ Requires:	%{name}%{?_isa} = %{version}-%{release}

+ Obsoletes:	%{name}-python3 < %{version}-%{release}

+ Provides:	%{name}-python3 = %{version}-%{release}

  

  %description -n python3-%{name}

  The libxml2-python3 package contains a Python 3 module that permits

- applications written in the Python programming language, version 3, to use the

- interface supplied by the libxml2 library to manipulate XML files.

+ applications written in the Python programming language, version 3, to

+ use the interface supplied by the libxml2 library to manipulate XML

+ files.

  

- This library allows to manipulate XML files. It includes support

- to read, modify and write XML and HTML files. There is DTDs support

- this includes parsing and validation even with complex DTDs, either

- at parse time or later once the document has been modified.

- %endif # with_python3

+ This library allows to manipulate XML files. It includes support to read,

+ modify and write XML and HTML files. There is DTDs support this includes

+ parsing and validation even with complex DTDs, either at parse time or

+ later once the document has been modified.

  

  %prep

- %setup -q

- %patch0 -p1

- # workaround for #877567 - Very weird bug gzip decompression bug in "recent" libxml2 versions

- %patch1 -p1 -b .do-not-check-crc

- %if 0%{?fedora} > 25

- %patch2 -p1

- %endif

- %patch3 -p1

+ %autosetup -p1

  

  mkdir py3doc

  cp doc/*.py py3doc

  sed -i 's|#!/usr/bin/python |#!%{__python3} |' py3doc/*.py

  

  %build

- %configure

- make %{_smp_mflags}

+ %configure \

+ 	--disable-static

+ %{make_build}

  

  find doc -type f -exec chmod 0644 \{\} \;

  

  %install

- rm -fr %{buildroot}

- 

- make install DESTDIR=%{buildroot}

- 

- %if 0%{?with_python3}

- make clean

- %configure --with-python=%{__python3}

- make install DESTDIR=%{buildroot}

- %endif # with_python3

+ %{make_install}

+ 

+ %if %{with python3}

+ %{__make} clean -C python

+ %configure \

+ 	--disable-static \

+ 	--with-python=%{__python3}

+ %{make_install} -C python

+ %endif

  

  # multiarch crazyness on timestamp differences or Makefile/binaries for examples

- touch -m --reference=$RPM_BUILD_ROOT/%{_includedir}/libxml2/libxml/parser.h $RPM_BUILD_ROOT/%{_bindir}/xml2-config

+ touch -m --reference=%{buildroot}%{_includedir}/libxml2/libxml/parser.h %{buildroot}%{_bindir}/xml2-config

  

- rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

- rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a

- rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la

- rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libxml2-%{version}/*

- rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libxml2-python-%{version}/*

+ rm -f %{buildroot}%{_libdir}/*.la

+ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la

+ rm -rf %{buildroot}%{_datadir}/doc/libxml2-%{version}/*

+ rm -rf %{buildroot}%{_datadir}/doc/libxml2-python-%{version}/*

  (cd doc/examples ; make clean ; rm -rf .deps Makefile)

- gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz

  

  %check

- make runtests

- 

- %clean

- rm -fr %{buildroot}

- 

- %post -p /sbin/ldconfig

+ %{__make} runtests

  

+ %post   -p /sbin/ldconfig

  %postun -p /sbin/ldconfig

  

  %files

- %defattr(-, root, root)

- 

- %{!?_licensedir:%global license %%doc}

  %license Copyright

- %doc AUTHORS NEWS README TODO

- %doc %{_mandir}/man1/xmllint.1*

- %doc %{_mandir}/man1/xmlcatalog.1*

- %doc %{_mandir}/man3/libxml.3*

- 

  %{_libdir}/lib*.so.*

  %{_bindir}/xmllint

  %{_bindir}/xmlcatalog

+ %{_mandir}/man1/xmllint.1*

+ %{_mandir}/man1/xmlcatalog.1*

  

  %files devel

- %defattr(-, root, root)

- 

- %doc %{_mandir}/man1/xml2-config.1*

- %doc AUTHORS NEWS README Copyright

- %doc doc/*.html doc/html doc/*.gif doc/*.png

- %doc doc/tutorial doc/libxml2-api.xml.gz

- %doc doc/examples

- %doc %dir %{_datadir}/gtk-doc/html/libxml2

- %doc %{_datadir}/gtk-doc/html/libxml2/*.devhelp

- %doc %{_datadir}/gtk-doc/html/libxml2/*.html

- %doc %{_datadir}/gtk-doc/html/libxml2/*.png

- %doc %{_datadir}/gtk-doc/html/libxml2/*.css

+ %doc AUTHORS NEWS README

+ %doc doc/{*.{html,gif,png},{examples,tutorial}}

+ %doc %{_datadir}/gtk-doc/html/libxml2

  

  %{_libdir}/lib*.so

  %{_libdir}/*.sh

@@ -188,40 +141,54 @@ 

  %{_bindir}/xml2-config

  %{_datadir}/aclocal/libxml.m4

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

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

- 

- %files static

- %defattr(-, root, root)

- 

- %{_libdir}/*a

+ %{_libdir}/cmake/libxml2

+ %{_mandir}/man1/xml2-config.1*

+ %{_mandir}/man3/*

  

  %files -n python2-%{name}

- %defattr(-, root, root)

- 

+ %doc python/{TODO,libxml2class.txt} doc/{*.py,python.html}

  %{_libdir}/python2*/site-packages/libxml2.py*

  %{_libdir}/python2*/site-packages/drv_libxml2.py*

  %{_libdir}/python2*/site-packages/libxml2mod*

- %doc python/TODO

- %doc python/libxml2class.txt

- %doc doc/*.py

- %doc doc/python.html

  

- %if 0%{?with_python3}

+ %if %{with python3}

  %files -n python3-%{name}

- %defattr(-, root, root)

- 

+ %doc python/{TODO,libxml2class.txt} py3doc/*.py doc/python.html

  %{_libdir}/python3*/site-packages/libxml2.py*

  %{_libdir}/python3*/site-packages/drv_libxml2.py*

  %{_libdir}/python3*/site-packages/__pycache__/*py*

  %{_libdir}/python3*/site-packages/libxml2mod*

- %doc python/TODO

- %doc python/libxml2class.txt

- %doc py3doc/*.py

- %doc doc/python.html

- %endif # with_python3

- 

+ %endif

  

  %changelog

+ * Tue Dec 26 2017 Tomasz Kłoczko <kloczek@fedoraproject.org> - 2.9.7-1

+ - removed Group fields (https://fedoraproject.org/wiki/Packaging:Guidelines#Tags_and_Sections)

+ - remove %%defattr from %%files (no longer needed)

+ - do not build and package libxml2 static library as none of the other packages

+   is using static libxml2 librarys (https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries)

+ - removed 2nd copy of the libxml2 API documentation (doc/html it is

+   the same as in %%{_datadir}/gtk-doc/html/libxml2) and 3rd copy in source xml

+   (devel package is now 30% smaller)

+ - remove not needed %%ifing

+ - man pages do not need %%doc token as those files are by definition %%doc

+ - use %%bcond instead %%global to enable build python3 subpackage

+ - remove BuildRoot, %%clear section and clean build root on beginning

+   %%install as it is no longer needed

+ - remove static zlib-devel, xz-devel and pkgconfig Requires in devel

+   (none of the libxml2 header files is using zlib or xz headers and

+   provide .pc file does not mean that package needs pkgconfig)

+ - remove all <=f25 hacks (f25 is now EOS)

+ - simplifications in %%files

+ - add %%{_libdir}/cmake/libxml2 directory to devel %%files

+ - add use more macros

+ - simplify build the python3 module (to build python3 module is not necessary to

+   rebuild the whole libxml2)

+ - indent spec

+ - add use %%{?_isa} macro in Requires

+ - move man3 man pages to devel

+ - updated to 2.9.7

+ - added CVE-2016-9597 patch

+ 

  * Fri Sep 22 2017 Petr Pisar <ppisar@redhat.com> - 2.9.5-2

  - Fix reporting error about undefined XPath variables (bug #1493613)

  

no initial comment

2 new commits added

    • added CVE-2016-9597 patch
    • updated %changelog entry
2 years ago

Pull-Request has been closed by ignatenkobrain

2 years ago