Browse Source

upgrading package: libxml 2.4.25 -> 2.4.26

master
parent
commit
e41cb77964
  1. 55
      libxml/libxml.patch
  2. 6
      libxml/libxml.spec

55
libxml/libxml.patch

@ -1,55 +0,0 @@
This patch is from CVS and fixes a seg fault due to some bad memory
management. This will be fixed in the next release.
--- valid.c.orig Wed Oct 9 12:03:48 2002
+++ valid.c Wed Oct 9 12:06:17 2002
@@ -4551,9 +4551,9 @@
xmlElementPtr elemDecl, int warn, xmlNodePtr parent) {
int ret = 1;
#ifndef LIBXML_REGEXP_ENABLED
- xmlNodePtr last = NULL;
+ xmlNodePtr last = NULL, last = NULL, tmp;
#endif
- xmlNodePtr repl = NULL, cur, tmp;
+ xmlNodePtr cur;
xmlElementContentPtr cont;
const xmlChar *name;
@@ -4571,6 +4571,9 @@
} else {
xmlRegExecCtxtPtr exec;
+ ctxt->nodeMax = 0;
+ ctxt->nodeNr = 0;
+ ctxt->nodeTab = NULL;
exec = xmlRegNewExecCtxt(elemDecl->contModel, NULL, NULL);
if (exec != NULL) {
cur = child;
@@ -4762,9 +4765,11 @@
expr[0] = 0;
xmlSnprintfElementContent(expr, 5000, cont, 1);
list[0] = 0;
+#ifndef LIBXML_REGEXP_ENABLED
if (repl != NULL)
xmlSnprintfElements(list, 5000, repl, 1);
else
+#endif /* LIBXML_REGEXP_ENABLED */
xmlSnprintfElements(list, 5000, child, 1);
if (name != NULL) {
@@ -4797,7 +4802,6 @@
#ifndef LIBXML_REGEXP_ENABLED
done:
-#endif
/*
* Deallocate the copy if done, and free up the validation stack
*/
@@ -4811,6 +4815,7 @@
xmlFree(ctxt->vstateTab);
ctxt->vstateTab = NULL;
}
+#endif
ctxt->nodeMax = 0;
ctxt->nodeNr = 0;
if (ctxt->nodeTab != NULL) {

6
libxml/libxml.spec

@ -32,12 +32,11 @@ Packager: The OpenPKG Project
Distribution: OpenPKG [BASE]
Group: SGML
License: LGPL
Version: 2.4.25
Release: 20021010
Version: 2.4.26
Release: 20021019
# list of sources
Source0: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
Patch0: libxml.patch
# build information
Prefix: %{l_prefix}
@ -55,7 +54,6 @@ AutoReqProv: no
%prep
%setup -q -n libxml2-%{version}
%patch -p0
%build
CC="%{l_cc}" \

Loading…
Cancel
Save