Hello community,
here is the log from the commit of package yast2-xml
checked in at Tue Aug 29 18:04:18 CEST 2006.
--------
--- yast2-xml/yast2-xml.changes 2006-06-01 15:10:26.000000000 +0200
+++ yast2-xml/yast2-xml.changes 2006-08-28 17:51:45.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Aug 28 17:42:17 CEST 2006 - mvidner@suse.cz
+
+- Do not try to interpret entities in YCP strings (#187618).
+ Fixes autoyast profiles that are supposed to contain "&", like
+ "iso:" add-on URLs.
+- 2.13.3
+
+-------------------------------------------------------------------
Old:
----
yast2-xml-2.13.2.tar.bz2
New:
----
yast2-xml-2.13.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-xml.spec ++++++
--- /var/tmp/diff_new_pack.p42dby/_old 2006-08-29 18:03:37.000000000 +0200
+++ /var/tmp/diff_new_pack.p42dby/_new 2006-08-29 18:03:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-xml (Version 2.13.2)
+# spec file for package yast2-xml (Version 2.13.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-xml
URL: http://www.suse.de/
-Version: 2.13.2
+Version: 2.13.3
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-xml-2.13.2.tar.bz2
+Source0: yast2-xml-2.13.3.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libxcrypt-devel yast2-core-devel yast2-devtools
Summary: YaST2 - XML Agent
@@ -36,7 +36,7 @@
Anas Nashif
%prep
-%setup -n yast2-xml-2.13.2
+%setup -n yast2-xml-2.13.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,6 +68,11 @@
%doc %{prefix}/share/doc/packages/yast2-xml
%changelog -n yast2-xml
+* Mon Aug 28 2006 - mvidner@suse.cz
+- Do not try to interpret entities in YCP strings (#187618).
+ Fixes autoyast profiles that are supposed to contain "&", like
+ "iso:" add-on URLs.
+- 2.13.3
* Thu Jun 01 2006 - visnov@suse.cz
- De-register error handler when not parsing anymore (#175197)
- 2.13.2
++++++ yast2-xml-2.13.2.tar.bz2 -> yast2-xml-2.13.3.tar.bz2 ++++++
++++ 13726 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-xml-2.13.2/VERSION new/yast2-xml-2.13.3/VERSION
--- old/yast2-xml-2.13.2/VERSION 2006-06-01 15:05:22.000000000 +0200
+++ new/yast2-xml-2.13.3/VERSION 2006-08-28 17:39:08.000000000 +0200
@@ -1 +1 @@
-2.13.2
+2.13.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-xml-2.13.2/configure.in new/yast2-xml-2.13.3/configure.in
--- old/yast2-xml-2.13.2/configure.in 2006-05-24 15:56:01.000000000 +0200
+++ new/yast2-xml-2.13.3/configure.in 2006-08-29 16:54:12.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-xml
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-xml, 2.13.1, http://bugs.opensuse.org/, yast2-xml)
+AC_INIT(yast2-xml, 2.13.3, http://bugs.opensuse.org/, yast2-xml)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.1"
+VERSION="2.13.3"
RPMNAME="yast2-xml"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-xml-2.13.2/doc/xml.html new/yast2-xml-2.13.3/doc/xml.html
--- old/yast2-xml-2.13.2/doc/xml.html 2006-01-18 13:38:08.000000000 +0100
+++ new/yast2-xml-2.13.3/doc/xml.html 2006-08-28 17:52:20.000000000 +0200
@@ -1,24 +1,23 @@
<HTML>
<HEAD>
<TITLE>XML agent description</TITLE>
-<!-- $Id: xml.html 26962 2006-01-11 15:15:38Z mvidner $ -->
+<!-- $Id: xml.html 32599 2006-08-28 15:53:55Z mvidner $ -->
</HEAD>
<BODY>
<H1>XML agent description</H1>
<HR>
<H2>Purpose</H2>
-The XML agent (<TT>ag_XML</TT>) is used to access to create XML documents from
+The XML agent (<TT>ag_xml</TT>) is used to access to create XML documents from
YCP data structures and also read XML files into YCP.
It is part of YaST2 SCR, the system configuration repository,
used to access configuration data on the target system. The general
-SCR API allows <TT>Read()</TT> and <TT>Write()</TT> access to get and
+SCR API allows <TT>Read()</TT> and <TT>Execute()</TT> access to get and
change data.
<P>
<H2>Implementation</H2>
-The agent is implemented using the XML extensions of the Qt library. Parsing and
-creating the documents is done using the DOM classes of the Qt library.
+The agent is implemented using the libxml2 library.
<P>
<I><B>Note:</B> The complete development documentation is available in the
<A HREF="autodocs/index.html"><TT>autodocs/</TT></A> directory.</I>
@@ -26,7 +25,7 @@
<P>
<H2>Interface for XML-agent</H2>
The interface is implemented as a SCR agent with the usual <TT>Read()</TT>
-and <TT>Write()</TT> interfaces. The path prefix used is
+and <TT>Execute()</TT> interfaces (no Write). The path prefix used is
<UL><TT>.xml</TT></UL>
@@ -43,16 +42,20 @@
To read an XML file into ycp, the following syntax is required:
<p>
-Read(.xml,"<file_name>");
+string Read(.xml,"<I>file_name</I>");
<p>
-Read(.xml.error_message); contains the error string from the xml parser.
+string Read(.xml.string,"<?xml version='1.0'?>...");
+<p>
+string Read(.xml.error_message); contains the error string from the xml parser.
It should be used when the agent did not return content.
A reset happens before a new XML parsing starts.
-<H2>Write options</H2>
-To write an XML file into ycp, the following syntax is required:
-<br>
-Write(.xml,$[<options map>], $[ycp data]);
+<H2>Execute options</H2>
+To write an XML file from ycp, the following syntax is required:
+<p>
+Execute(.xml,$[<options map>], $[ycp data]);
+<p>
+string Execute(.xml.string,$[<options map>], $[ycp data]);
<p>
The options map contains the following data:
<ul>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-xml-2.13.2/src/XmlAgent.cc new/yast2-xml-2.13.3/src/XmlAgent.cc
--- old/yast2-xml-2.13.2/src/XmlAgent.cc 2006-06-01 15:08:54.000000000 +0200
+++ new/yast2-xml-2.13.3/src/XmlAgent.cc 2006-08-28 17:52:21.000000000 +0200
@@ -7,7 +7,7 @@
* Authors:
* Anas Nashif
*
- * $Id: XmlAgent.cc 31246 2006-06-01 13:08:48Z visnov $
+ * $Id: XmlAgent.cc 32599 2006-08-28 15:53:55Z mvidner $
*/
#include "XmlAgent.h"
@@ -497,7 +497,7 @@
y2debug("string found");
xmlNodePtr val = xmlNewChild(param, NULL, (const xmlChar *)"value", NULL);
- xmlNewChild(val, NULL, (const xmlChar *)"string", (const xmlChar *)paramList->value(i)->asString()->value().c_str());
+ xmlNewTextChild(val, NULL, (const xmlChar *)"string", (const xmlChar *)paramList->value(i)->asString()->value().c_str());
}
}
}
@@ -521,7 +521,8 @@
{
if (list->value(i)->isString())
{
- xmlNewChild(parent, NULL,
+ // do not interpret entities, #187618
+ xmlNewTextChild(parent, NULL,
(const xmlChar *)entry,
(const xmlChar *)list->value(i)->asString()->value().c_str());
}
@@ -585,7 +586,7 @@
if ( i.value()->isString() && !isCDATA(i.key()->asString()))
{
y2debug("not cdata");
- xmlNewChild(parent, NULL,
+ xmlNewTextChild(parent, NULL,
(const xmlChar *)(const xmlChar *)i.key()->asString()->value().c_str(),
(const xmlChar *)i.value()->asString()->value().c_str());
continue;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org