Accepting request 145538 from home:posophe:branches:devel:libraries:c_c++

update to 2.9.0

OBS-URL: https://build.opensuse.org/request/show/145538
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxml2?expand=0&rev=75

fix-perl.diff

@@ -11,9 +11,9 @@ Date:   Thu Jan 26 19:11:02 2012 +0800
 
 Index: SAX2.c
 ===================================================================
---- SAX2.c.orig
+--- SAX2.c.orig	2012-09-11 08:01:01.000000000 +0200
-+++ SAX2.c
++++ SAX2.c	2012-12-15 16:32:27.353560391 +0100
-@@ -2162,7 +2162,6 @@ xmlSAX2StartElementNs(void *ctx,
+@@ -2188,7 +2188,6 @@
      xmlNodePtr parent;
      xmlNsPtr last = NULL, ns;
      const xmlChar *uri, *pref;
@@ -21,7 +21,7 @@ Index: SAX2.c
      int i, j;
  
      if (ctx == NULL) return;
-@@ -2182,20 +2181,6 @@ xmlSAX2StartElementNs(void *ctx,
+@@ -2208,20 +2207,6 @@
      }
  
      /*
@@ -42,7 +42,7 @@ Index: SAX2.c
       * allocate the node
       */
      if (ctxt->freeElems != NULL) {
-@@ -2208,10 +2193,7 @@ xmlSAX2StartElementNs(void *ctx,
+@@ -2234,10 +2219,7 @@
  	if (ctxt->dictNames)
  	    ret->name = localname;
  	else {
@@ -54,20 +54,20 @@ Index: SAX2.c
  	    if (ret->name == NULL) {
  	        xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs");
  		return;
-@@ -2223,11 +2205,8 @@ xmlSAX2StartElementNs(void *ctx,
+@@ -2249,11 +2231,8 @@
  	if (ctxt->dictNames)
- 	    ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL, 
+ 	    ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
  	                               (xmlChar *) localname, NULL);
 -	else if (lname == NULL)
 -	    ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL);
  	else
--	    ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL, 
+-	    ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL,
 -	                               (xmlChar *) lname, NULL);
 +	    ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL);
  	if (ret == NULL) {
  	    xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs");
  	    return;
-@@ -2334,33 +2313,8 @@ xmlSAX2StartElementNs(void *ctx,
+@@ -2360,31 +2339,6 @@
       */
      if (nb_attributes > 0) {
          for (j = 0,i = 0;i < nb_attributes;i++,j+=5) {
@@ -97,11 +97,9 @@ Index: SAX2.c
 -		}
 -	    }
  	    xmlSAX2AttributeNs(ctxt, attributes[j], attributes[j+1],
--			       attributes[j+3], attributes[j+4]);
+ 			       attributes[j+3], attributes[j+4]);
-+	                       attributes[j+3], attributes[j+4]);
  	}
-     }
+
- 
 Index: result/namespaces/err_7.xml
 ===================================================================
 --- result/namespaces/err_7.xml.orig

libxml2-2.8.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a
-size 4915203

libxml2-2.9.0-CVE-2012-5134.patch

@@ -0,0 +1,11 @@
+--- libxml2-2.9.0.orig/parser.c	2012-09-11 06:24:08.000000000 +0200
++++ libxml2-2.9.0/parser.c	2012-12-15 16:12:27.441609871 +0100
+@@ -4075,7 +4075,7 @@
+         goto error;
+ 
+     if ((in_space) && (normalize)) {
+-        while (buf[len - 1] == 0x20) len--;
++        while ((len > 0) && (buf[len - 1] == 0x20)) len--;
+     }
+     buf[len] = 0;
+     if (RAW == '<') {

libxml2-2.9.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad25d91958b7212abdc12b9611cfb4dc4e5cddb6d1e9891532f48aacee422b82
+size 5161069

libxml2-CVE-2012-5134.patch

@@ -1,19 +0,0 @@
-From 6a36fbe3b3e001a8a840b5c1fdd81cefc9947f0d Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Mon, 29 Oct 2012 02:39:55 +0000
-Subject: Fix potential out of bound access
-
----
-Index: libxml2-2.8.0/parser.c
-===================================================================
---- libxml2-2.8.0.orig/parser.c	2012-05-18 09:30:30.000000000 +0200
-+++ libxml2-2.8.0/parser.c	2012-12-07 12:00:57.111732279 +0100
-@@ -3931,7 +3931,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr
- 	c = CUR_CHAR(l);
-     }
-     if ((in_space) && (normalize)) {
--        while (buf[len - 1] == 0x20) len--;
-+        while ((len > 0) && (buf[len - 1] == 0x20)) len--;
-     }
-     buf[len] = 0;
-     if (RAW == '<') {

libxml2.spec

@@ -19,7 +19,7 @@
 %define lname libxml2-2
 
 Name:           libxml2
-Version:        2.8.0
+Version:        2.9.0
 Release:        0
 Summary:        A Library to Manipulate XML Files
 License:        MIT
@@ -30,7 +30,7 @@ Source:         ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf
 Patch0:         fix-perl.diff
 # PATCH-FIX-UPSTREAM CVE-2012-5134 (bnc#793334)
-Patch1:         libxml2-CVE-2012-5134.patch
+Patch1:         libxml2-2.9.0-CVE-2012-5134.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
@@ -104,9 +104,7 @@ to develop applications that require these.
 Summary:        A Library to Manipulate XML Files
 Group:          System/Libraries
 Requires:       %{lname} = %{version}
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 
 %description doc
 The XML C library was initially developed for the GNOME project. It is

python-libxml2.changes

@@ -1,8 +1,17 @@
+-------------------------------------------------------------------
+Sat Dec 15 15:55:26 UTC 2012 - p.drouand@gmail.com
+
+- update to 2.9.0 version:
+  * please see the Changelog
+- Updated patchs to get working with new version:
+  * libxml2-2.9.0-CVE-2012-5134.patch ( libxml2-CVE-2012-5134.patch )
+  * fix-perl.diff 
+  
 -------------------------------------------------------------------
 Tue Jun 12 18:10:07 UTC 2012 - chris@computersalat.de
 
 - update to 2.8.0
-  * please se ChangeLog for more info
+  * please see ChangeLog for more info
 
 -------------------------------------------------------------------
 Sat Feb 25 08:47:58 UTC 2012 - coolo@suse.com

python-libxml2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           python-libxml2
-Version:        2.8.0
+Version:        2.9.0
 Release:        0
 Summary:        Python Bindings for libxml2
 License:        MIT