rpms/libfwbuilder/F-12 libfwbuilder-3.0.7-disable-xmlCleanupParser.patch, NONE, 1.1 libfwbuilder.spec, 1.34, 1.35
Ralf Ertzinger
ertzing at fedoraproject.org
Fri Feb 5 19:36:10 UTC 2010
Author: ertzing
Update of /cvs/extras/rpms/libfwbuilder/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10270
Modified Files:
libfwbuilder.spec
Added Files:
libfwbuilder-3.0.7-disable-xmlCleanupParser.patch
Log Message:
* Fri Feb 05 2009 Ralf Ertzinger <ralf at skytale.net> 3.0.7-2
- Remove all calls to xmlCleanupParser() from the source. See
http://lists.fedoraproject.org/pipermail/devel/2010-January/129117.html
for details
libfwbuilder-3.0.7-disable-xmlCleanupParser.patch:
FWObjectDatabase.cpp | 6 +++---
XMLTools.cpp | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 15 deletions(-)
--- NEW FILE libfwbuilder-3.0.7-disable-xmlCleanupParser.patch ---
diff -uNr a/src/fwbuilder/FWObjectDatabase.cpp b/src/fwbuilder/FWObjectDatabase.cpp
--- a/src/fwbuilder/FWObjectDatabase.cpp 2009-09-18 21:28:02.000000000 +0200
+++ b/src/fwbuilder/FWObjectDatabase.cpp 2010-01-23 20:35:40.000000000 +0100
@@ -254,7 +254,7 @@
FWObjectDatabase::TYPENAME)!=SAME)
{
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException("Data file has invalid structure: "+f);
}
@@ -299,7 +299,7 @@
FWObjectDatabase::DTD_FILE_NAME);
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
setDirty(false);
init = false;
@@ -328,7 +328,7 @@
FWObjectDatabase::TYPENAME,
FWObjectDatabase::DTD_FILE_NAME);
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
// setDirty(false);
init = false;
diff -uNr a/src/fwbuilder/XMLTools.cpp b/src/fwbuilder/XMLTools.cpp
--- a/src/fwbuilder/XMLTools.cpp 2009-09-18 21:28:02.000000000 +0200
+++ b/src/fwbuilder/XMLTools.cpp 2010-01-23 20:35:40.000000000 +0100
@@ -353,7 +353,7 @@
if(!(*upgrade)(upgrade_msg))
{
xmlFreeDoc(newdoc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException("Load operation cancelled for file: '"+data_file);
}
@@ -370,7 +370,7 @@
if(rename(data_file.c_str(), backup_file.c_str()))
{
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException("Error making backup copy of file: '" +
data_file + "' as '" + backup_file + "'");
}
@@ -394,7 +394,7 @@
}
assert(doc!=NULL);
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
// Now we know the version is OK,
// let us load for real, checking DTD.
@@ -568,7 +568,7 @@
xmlFreeDoc(doc);
xsltCleanupGlobals();
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
}
void XMLTools::transformDocumentToFile(xmlDocPtr doc,
@@ -646,7 +646,7 @@
xsltSaveResultToFilename(dst_file.c_str(), res, ss, 0 /* compression */ );
xmlFreeDoc(res);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
xsltFreeStylesheet(ss);
}
@@ -723,7 +723,7 @@
if (!root || !root->name || type_name!=FROMXMLCAST(root->name))
{
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException("XML file '"+file_name+ "' has invalid structure.");
}
@@ -780,7 +780,7 @@
if (access(fname.c_str() , R_OK )!=0)
{
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException(
string("File '" + file_name +
"' conversion error: no converter found for version: ") +
@@ -794,18 +794,18 @@
{
ex.getProperties()["failed_transformation"]=fname;
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw;
}
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
doc = res;
root = xmlDocGetRootElement(doc);
if (!root || !root->name || type_name!=FROMXMLCAST(root->name))
{
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException("File '" + file_name +
"' conversion Error: conversion produced file with invalid structure.");
}
@@ -814,7 +814,7 @@
if (v==NULL)
{
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException("File '" + file_name +
"' conversion error: converted to unknown version.");
}
@@ -825,7 +825,7 @@
if (version_compare(vers, oldversion) <= 0)
{
xmlFreeDoc(doc);
- xmlCleanupParser();
+ /* xmlCleanupParser(); */
throw FWException("File '" + file_name +
"' conversion error: conversion did not advance version number!.");
}
Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/F-12/libfwbuilder.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libfwbuilder.spec 29 Dec 2009 19:23:17 -0000 1.34
+++ libfwbuilder.spec 5 Feb 2010 19:36:10 -0000 1.35
@@ -1,7 +1,7 @@
Name: libfwbuilder
Summary: Firewall Builder API
Version: 3.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.fwbuilder.org/
@@ -9,6 +9,7 @@ Source: http://downloads.sourcef
Buildroot: %{_tmppath}/%{name}-%{version}-root
Patch0: libfwbuilder-2.1.14-gcc43.patch
+Patch1: libfwbuilder-3.0.7-disable-xmlCleanupParser.patch
BuildRequires: qt4-devel
BuildRequires: libxslt-devel
@@ -49,6 +50,8 @@ need to develop applications using Firew
# Fix regressions due to stricter GCC 4.3 checking
# %patch0 -p1 -b .gcc43
+# Do not use xmlCleanupParser(), this is considered harmful
+%patch1 -p1 -b .xmlCleanupParser
%build
%configure \
@@ -77,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 05 2009 Ralf Ertzinger <ralf at skytale.net> 3.0.7-2
+- Remove all calls to xmlCleanupParser() from the source. See
+ http://lists.fedoraproject.org/pipermail/devel/2010-January/129117.html
+ for details
+
* Tue Dec 29 2009 Ralf Ertzinger <ralf at skytale.net> 3.0.7-1
- Update to 3.0.7
* Fixed security issue with temporary file handling in the generated
More information about the scm-commits
mailing list