Hello community, here is the log from the commit of package wbxml2 checked in at Thu Nov 20 16:29:28 CET 2008. -------- --- wbxml2/wbxml2.changes 2008-11-07 17:12:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/wbxml2/wbxml2.changes 2008-11-18 18:03:15.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Nov 18 18:00:35 CET 2008 - cstender@suse.de + +- added patch (09-devinf-doctype.patch) from Michael Bell + - The embedded DevInf document is now prefixed with correct doctype + during internal XML to WBXML conversion. This leeds to correct + DevInf 1.0, 1.1 and 1.2 embedded WBXML. The old code always + embeds a SyncML 1.2 DevInf (e.g. in a SyncML 1.1 message). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- wbxml2-0.9.2_SVN59-09-devinf-doctype.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wbxml2.spec ++++++ --- /var/tmp/diff_new_pack.l28237/_old 2008-11-20 16:29:13.000000000 +0100 +++ /var/tmp/diff_new_pack.l28237/_new 2008-11-20 16:29:13.000000000 +0100 @@ -25,12 +25,13 @@ Group: System/Libraries Summary: WBXML parser and compiler library Version: 0.9.2_SVN59 -Release: 10 +Release: 11 Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-build-fix.diff Patch1: %{name}-%{version}-pkgconfig.diff Patch2: %{name}-%{version}-syncml-fix.diff Patch3: %{name}-%{version}-maxsize_oma_12_devinf.patch +Patch4: %{name}-%{version}-09-devinf-doctype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,6 +114,7 @@ %patch1 %patch2 %patch3 +%patch4 %build autoreconf -fi @@ -148,6 +150,12 @@ %{_prefix}/bin/xml2wbxml %changelog +* Tue Nov 18 2008 cstender@suse.de +- added patch (09-devinf-doctype.patch) from Michael Bell + - The embedded DevInf document is now prefixed with correct doctype + during internal XML to WBXML conversion. This leeds to correct + DevInf 1.0, 1.1 and 1.2 embedded WBXML. The old code always + embeds a SyncML 1.2 DevInf (e.g. in a SyncML 1.1 message). * Fri Nov 07 2008 cstender@suse.de - fixed syncml-fix.diff which leads to broken libsyncml testcases * Thu Sep 04 2008 cstender@suse.de ++++++ wbxml2-0.9.2_SVN59-09-devinf-doctype.patch ++++++ --- src/wbxml_tree_clb_xml.c 2008-11-18 13:19:11.000000000 +0100 +++ src/wbxml_tree_clb_xml.c 2008-11-18 14:07:58.000000000 +0100 @@ -210,15 +210,41 @@ return; } - /* Add doctype to give the XML parser a chance - * SyncML 1.2 is downward compatible to older versions. - */ - if (!wbxml_buffer_insert_cstr(devinf_doc, "<!DOCTYPE DevInf PUBLIC '-//SYNCML//DTD DevInf 1.2//EN' 'http://www.openmobilealliance.org/tech/DTD/OMA-SyncML-Device_Information-DTD-1.2.dtd' >\n", 0)) - { - tree_ctx->error = WBXML_ERROR_NOT_ENOUGH_MEMORY; - wbxml_buffer_destroy(devinf_doc); - return; - } + /* Add doctype to give the XML parser a chance */ + const WBXMLLangEntry *lang; + switch(tree_ctx->tree->lang->langID) + { + case WBXML_LANG_SYNCML_SYNCML10: + lang = wbxml_tables_get_table(WBXML_LANG_SYNCML_DEVINF10); + break; + case WBXML_LANG_SYNCML_SYNCML11: + lang = wbxml_tables_get_table(WBXML_LANG_SYNCML_DEVINF11); + break; + case WBXML_LANG_SYNCML_SYNCML12: + lang = wbxml_tables_get_table(WBXML_LANG_SYNCML_DEVINF12); + break; + default: + tree_ctx->error = WBXML_ERROR_UNKNOWN_XML_LANGUAGE; + return; + } + WBXMLBuffer *buffer = wbxml_buffer_create(NULL, 0, 0); + if (!buffer) { + tree_ctx->error = WBXML_ERROR_NOT_ENOUGH_MEMORY; + return; + } + /* DOCTYPE in reverse order */ + if (!wbxml_buffer_insert_cstr(devinf_doc, "\">\n", 0) || /* > */ + !wbxml_buffer_insert_cstr(devinf_doc, lang->publicID->xmlDTD, 0) || /* DTD */ + !wbxml_buffer_insert_cstr(devinf_doc, "\" \"", 0) || /* DTD */ + !wbxml_buffer_insert_cstr(devinf_doc, lang->publicID->xmlPublicID, 0) || /* Public ID */ + !wbxml_buffer_insert_cstr(devinf_doc, " PUBLIC \"", 0) || /* PUBLIC " */ + !wbxml_buffer_insert_cstr(devinf_doc, lang->publicID->xmlRootElt, 0) || /* Root Element */ + !wbxml_buffer_insert_cstr(devinf_doc, "<!DOCTYPE ", 0)) /* <!DOCTYPE */ + { + tree_ctx->error = WBXML_ERROR_ENCODER_APPEND_DATA; + wbxml_buffer_destroy(devinf_doc); + return; + } WBXML_DEBUG((WBXML_PARSER, "\t DevInf Doc : '%s'", wbxml_buffer_get_cstr(devinf_doc))); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org