mingw August 2009

mingw@lists.fedoraproject.org

13 participants
57 discussions

rpms/mingw32-cairo/F-11 .cvsignore, 1.3, 1.4 mingw32-cairo.spec, 1.6, 1.7 sources, 1.3, 1.4
by Erik van Pienbroek 13 Aug '09

13 Aug '09

Author: epienbro Update of /cvs/pkgs/rpms/mingw32-cairo/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21364/F-11 Modified Files: .cvsignore mingw32-cairo.spec sources Log Message: - Update to 1.8.8 - Use %global instead of %define Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-11/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 10 Mar 2009 13:47:37 -0000 1.3 +++ .cvsignore 12 Aug 2009 23:02:34 -0000 1.4 @@ -1 +1 @@ -cairo-1.8.6.tar.gz +cairo-1.8.8.tar.gz Index: mingw32-cairo.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-11/mingw32-cairo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- mingw32-cairo.spec 14 Apr 2009 19:25:29 -0000 1.6 +++ mingw32-cairo.spec 12 Aug 2009 23:02:34 -0000 1.7 @@ -1,12 +1,12 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} Name: mingw32-cairo -Version: 1.8.6 -Release: 2%{?dist} +Version: 1.8.8 +Release: 1%{?dist} Summary: MinGW Windows Cairo library License: LGPLv2 or MPLv1.1 @@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 13 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.8.8-1 +- Update to 1.8.8 +- Use %%global instead of %%define + * Fri Apr 3 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.8.6-2 - Fixed %%defattr line - Added -static subpackage Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-11/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 10 Mar 2009 13:47:38 -0000 1.3 +++ sources 12 Aug 2009 23:02:34 -0000 1.4 @@ -1 +1 @@ -4e64139ef6f668df24450f3b81dd0771 cairo-1.8.6.tar.gz +d3e1a1035ae563812d4dd44a74fb0dd0 cairo-1.8.8.tar.gz

1 0

rpms/mingw32-cairo/devel .cvsignore, 1.3, 1.4 mingw32-cairo.spec, 1.7, 1.8 sources, 1.3, 1.4
by Erik van Pienbroek 13 Aug '09

13 Aug '09

Author: epienbro Update of /cvs/pkgs/rpms/mingw32-cairo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21262/devel Modified Files: .cvsignore mingw32-cairo.spec sources Log Message: - Update to 1.8.8 - Automatically generate debuginfo subpackage - Use %global instead of %define Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 10 Mar 2009 13:47:37 -0000 1.3 +++ .cvsignore 12 Aug 2009 23:02:12 -0000 1.4 @@ -1 +1 @@ -cairo-1.8.6.tar.gz +cairo-1.8.8.tar.gz Index: mingw32-cairo.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/mingw32-cairo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- mingw32-cairo.spec 25 Jul 2009 12:15:08 -0000 1.7 +++ mingw32-cairo.spec 12 Aug 2009 23:02:13 -0000 1.8 @@ -1,12 +1,13 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} +%define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-cairo -Version: 1.8.6 -Release: 3%{?dist} +Version: 1.8.8 +Release: 1%{?dist} Summary: MinGW Windows Cairo library License: LGPLv2 or MPLv1.1 @@ -17,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve BuildArch: noarch -BuildRequires: mingw32-filesystem >= 49 +BuildRequires: mingw32-filesystem >= 52 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-libxml2 @@ -50,6 +51,9 @@ Group: Development/Libraries Static version of the MinGW Windows Cairo library. +%{_mingw32_debug_package} + + %prep %setup -q -n cairo-%{version} @@ -100,6 +104,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 13 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.8.8-1 +- Update to 1.8.8 +- Automatically generate debuginfo subpackage +- Use %%global instead of %%define + * Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 10 Mar 2009 13:47:38 -0000 1.3 +++ sources 12 Aug 2009 23:02:13 -0000 1.4 @@ -1 +1 @@ -4e64139ef6f668df24450f3b81dd0771 cairo-1.8.6.tar.gz +d3e1a1035ae563812d4dd44a74fb0dd0 cairo-1.8.8.tar.gz

1 0

rpms/mingw32-pixman/devel pixman-disable-blitters-test-testcase.patch, NONE, 1.1 mingw32-pixman.spec, 1.7, 1.8
by Erik van Pienbroek 12 Aug '09

12 Aug '09

Author: epienbro Update of /cvs/pkgs/rpms/mingw32-pixman/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17707 Modified Files: mingw32-pixman.spec Added Files: pixman-disable-blitters-test-testcase.patch Log Message: - Automatically generate debuginfo subpackage - Don't build the 'blitters-test' testcase as it requires the memalign function which we don't have on MinGW pixman-disable-blitters-test-testcase.patch: Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE pixman-disable-blitters-test-testcase.patch --- --- test/Makefile.in.orig 2009-08-13 00:44:30.275385290 +0200 +++ test/Makefile.in 2009-08-13 00:47:49.722395581 +0200 @@ -58,7 +58,7 @@ @HAVE_GTK_TRUE@ alpha-test$(EXEEXT) screen-test$(EXEEXT) \ @HAVE_GTK_TRUE@ convolution-test$(EXEEXT) trap-test$(EXEEXT) am__EXEEXT_2 = region-test$(EXEEXT) scaling-test$(EXEEXT) \ - blitters-test$(EXEEXT) fetch-test$(EXEEXT) oob-test$(EXEEXT) \ + fetch-test$(EXEEXT) oob-test$(EXEEXT) \ window-test$(EXEEXT) trap-crasher$(EXEEXT) $(am__EXEEXT_1) PROGRAMS = $(noinst_PROGRAMS) am__alpha_test_SOURCES_DIST = alpha-test.c utils.c utils.h @@ -282,7 +282,7 @@ TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman \ $(am__append_2) -TESTPROGRAMS = region-test scaling-test blitters-test fetch-test \ +TESTPROGRAMS = region-test scaling-test fetch-test \ oob-test window-test trap-crasher $(am__append_1) fetch_test_LDADD = $(TEST_LDADD) region_test_LDADD = $(TEST_LDADD) Index: mingw32-pixman.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- mingw32-pixman.spec 12 Aug 2009 22:31:15 -0000 1.7 +++ mingw32-pixman.spec 12 Aug 2009 22:50:52 -0000 1.8 @@ -3,6 +3,7 @@ %global _use_internal_dependency_generator 0 %global __find_requires %{_mingw32_findrequires} %global __find_provides %{_mingw32_findprovides} +%define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-pixman Version: 0.15.20 @@ -16,10 +17,12 @@ Group: Development/Libraries Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2 Source1: make-pixman-snapshot.sh +Patch0: pixman-disable-blitters-test-testcase.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: mingw32-filesystem >= 49 +BuildRequires: mingw32-filesystem >= 52 BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-dlfcn @@ -39,8 +42,12 @@ Group: Development/Libraries Static version of the MinGW Windows Pixman library. +%{_mingw32_debug_package} + + %prep %setup -q -n pixman-%{version} +%patch0 -p0 %build @@ -79,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 13 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.15.20-1 - Update to version 0.15.20 - Updated SOURCE0 and URL +- Automatically generate debuginfo subpackage +- Don't build the 'blitters-test' testcase as it requires the memalign function + which we don't have on MinGW * Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.15.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

1 0

rpms/mingw32-pixman/F-11 .cvsignore, 1.2, 1.3 mingw32-pixman.spec, 1.4, 1.5 sources, 1.2, 1.3
by Erik van Pienbroek 12 Aug '09

12 Aug '09

Author: epienbro Update of /cvs/pkgs/rpms/mingw32-pixman/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12919 Modified Files: .cvsignore mingw32-pixman.spec sources Log Message: Update to 0.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-11/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 30 Jan 2009 11:48:10 -0000 1.2 +++ .cvsignore 12 Aug 2009 22:35:25 -0000 1.3 @@ -1 +1 @@ -pixman-0.13.2.tar.gz +pixman-0.14.0.tar.gz Index: mingw32-pixman.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-11/mingw32-pixman.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- mingw32-pixman.spec 14 Apr 2009 19:30:36 -0000 1.4 +++ mingw32-pixman.spec 12 Aug 2009 22:35:25 -0000 1.5 @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-pixman -Version: 0.13.2 -Release: 5%{?dist} +Version: 0.14.0 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 13 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.14.0-1 +- Update to 0.14.0 + * Fri Apr 3 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.13.2-5 - Fixed %%defattr line - Added -static subpackage Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-11/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 30 Jan 2009 11:48:10 -0000 1.2 +++ sources 12 Aug 2009 22:35:25 -0000 1.3 @@ -1 +1 @@ -837df4a02c61a60a880644393b57faed pixman-0.13.2.tar.gz +da330524bbd975271974378b1c5e7b5d pixman-0.14.0.tar.gz

1 0

rpms/mingw32-pixman/devel .cvsignore, 1.3, 1.4 mingw32-pixman.spec, 1.6, 1.7 sources, 1.3, 1.4
by Erik van Pienbroek 12 Aug '09

12 Aug '09

Author: epienbro Update of /cvs/pkgs/rpms/mingw32-pixman/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11849 Modified Files: .cvsignore mingw32-pixman.spec sources Log Message: - Update to version 0.15.20 - Updated SOURCE0 and URL Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 10 Jun 2009 19:38:19 -0000 1.3 +++ .cvsignore 12 Aug 2009 22:31:15 -0000 1.4 @@ -1 +1 @@ -pixman-0.15.10.tar.gz +pixman-0.15.20.tar.bz2 Index: mingw32-pixman.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/mingw32-pixman.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- mingw32-pixman.spec 25 Jul 2009 14:29:19 -0000 1.6 +++ mingw32-pixman.spec 12 Aug 2009 22:31:15 -0000 1.7 @@ -5,15 +5,15 @@ %global __find_provides %{_mingw32_findprovides} Name: mingw32-pixman -Version: 0.15.10 -Release: 2%{?dist} +Version: 0.15.20 +Release: 1%{?dist} Summary: MinGW Windows Pixman library License: MIT -URL: http://xorg.freedesktop.org/ +URL: http://cgit.freedesktop.org/pixman/ Group: Development/Libraries -Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz +Source0: http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.bz2 Source1: make-pixman-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 13 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 0.15.20-1 +- Update to version 0.15.20 +- Updated SOURCE0 and URL + * Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.15.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 10 Jun 2009 19:38:19 -0000 1.3 +++ sources 12 Aug 2009 22:31:15 -0000 1.4 @@ -1 +1 @@ -8813e13aa3817df03039bd66a4863670 pixman-0.15.10.tar.gz +8cca7bdf45bd3c31cf95ecea0f05bddc pixman-0.15.20.tar.bz2

1 0

[Bug 502388] New: Review Request: mingw32-enchant - MinGW Windows Enchanting Spell Checking Library
by Red Hat Bugzilla 12 Aug '09

12 Aug '09

Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Review Request: mingw32-enchant - MinGW Windows Enchanting Spell Checking Library https://bugzilla.redhat.com/show_bug.cgi?id=502388 Summary: Review Request: mingw32-enchant - MinGW Windows Enchanting Spell Checking Library Product: Fedora Version: rawhide Platform: All OS/Version: Linux Status: NEW Severity: medium Priority: low Component: Package Review AssignedTo: nobody(a)fedoraproject.org ReportedBy: erik-fedora(a)vanpienbroek.nl QAContact: extras-qa(a)fedoraproject.org CC: notting(a)redhat.com, fedora-package-review(a)redhat.com, fedora-mingw(a)lists.fedoraproject.org Depends on: 502387 Blocks: 499992 Classification: Fedora Spec URL: http://www.ftd4linux.nl/contrib/mingw32-enchant.spec SRPM URL: http://www.ftd4linux.nl/contrib/mingw32-enchant-1.4.2-6.fc11.src.rpm Description: A library that wraps other spell checking backends. This is the MinGW build of enchant Koji scratch build: none yet because mingw32-hunspell isn't in Fedora yet Approved MinGW packaging guidelines are here: http://fedoraproject.org/wiki/Packaging/MinGW -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.

1 12

rpms/mingw32-libxml2/EL-5 libxml2-2.7.3-ficora-parse.patch, NONE, 1.1 mingw32-libxml2.spec, 1.1, 1.2
by Daniel Veillard 10 Aug '09

10 Aug '09

Author: veillard Update of /cvs/pkgs/rpms/mingw32-libxml2/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22450 Modified Files: mingw32-libxml2.spec Added Files: libxml2-2.7.3-ficora-parse.patch Log Message: - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416 Daniel libxml2-2.7.3-ficora-parse.patch: parser.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 12 deletions(-) --- NEW FILE libxml2-2.7.3-ficora-parse.patch --- diff --git a/parser.c b/parser.c index a476060..b404722 100644 --- a/parser.c +++ b/parser.c @@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { if (name == NULL) { xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED, "Name expected in NOTATION declaration\n"); - return(ret); + xmlFreeEnumeration(ret); + return(NULL); } tmp = ret; while (tmp != NULL) { @@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { } if (tmp == NULL) { cur = xmlCreateEnumeration(name); - if (cur == NULL) return(ret); + if (cur == NULL) { + xmlFreeEnumeration(ret); + return(NULL); + } if (last == NULL) ret = last = cur; else { last->next = cur; @@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { } while (RAW == '|'); if (RAW != ')') { xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL); - if ((last != NULL) && (last != ret)) - xmlFreeEnumeration(last); - return(ret); + xmlFreeEnumeration(ret); + return(NULL); } NEXT; return(ret); @@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) { cur = xmlCreateEnumeration(name); if (!xmlDictOwns(ctxt->dict, name)) xmlFree(name); - if (cur == NULL) return(ret); + if (cur == NULL) { + xmlFreeEnumeration(ret); + return(NULL); + } if (last == NULL) ret = last = cur; else { last->next = cur; @@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { } /** - * xmlParseElementChildrenContentDecl: + * xmlParseElementChildrenContentDeclPriv: * @ctxt: an XML parser context * @inputchk: the input used for the current entity, needed for boundary checks + * @depth: the level of recursion * * parse the declaration for a Mixed Element content * The leading '(' and spaces have been skipped in xmlParseElementContentDecl @@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { * Returns the tree of xmlElementContentPtr describing the element * hierarchy. */ -xmlElementContentPtr -xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { +static xmlElementContentPtr +xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk, + int depth) { xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL; const xmlChar *elem; xmlChar type = 0; + if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) || + (depth > 2048)) { + xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED, +"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n", + depth); + return(NULL); + } SKIP_BLANKS; GROW; if (RAW == '(') { @@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { /* Recurse on first child */ NEXT; SKIP_BLANKS; - cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid); + cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); SKIP_BLANKS; GROW; } else { @@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { /* Recurse on second child */ NEXT; SKIP_BLANKS; - last = xmlParseElementChildrenContentDecl(ctxt, inputid); + last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); SKIP_BLANKS; } else { elem = xmlParseName(ctxt); @@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { } /** + * + * xmlParseElementChildrenContentDecl: + * @ctxt: an XML parser context + * @inputchk: the input used for the current entity, needed for boundary checks + * @depth: the level of recursion + * + * parse the declaration for a Mixed Element content + * The leading '(' and spaces have been skipped in xmlParseElementContentDecl + * + * [47] children ::= (choice | seq) ('?' | '*' | '+')? + * + * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? + * + * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' + * + * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' + * + * [ VC: Proper Group/PE Nesting ] applies to [49] and [50] + * TODO Parameter-entity replacement text must be properly nested + * with parenthesized groups. That is to say, if either of the + * opening or closing parentheses in a choice, seq, or Mixed + * construct is contained in the replacement text for a parameter + * entity, both must be contained in the same replacement text. For + * interoperability, if a parameter-entity reference appears in a + * choice, seq, or Mixed construct, its replacement text should not + * be empty, and neither the first nor last non-blank character of + * the replacement text should be a connector (| or ,). + * + * Returns the tree of xmlElementContentPtr describing the element + * hierarchy. + */ +xmlElementContentPtr +xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { + /* stub left for API/ABI compat */ + return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1)); +} + +/** * xmlParseElementContentDecl: * @ctxt: an XML parser context * @name: the name of the element being defined. @@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name, tree = xmlParseElementMixedContentDecl(ctxt, inputid); res = XML_ELEMENT_TYPE_MIXED; } else { - tree = xmlParseElementChildrenContentDecl(ctxt, inputid); + tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1); res = XML_ELEMENT_TYPE_ELEMENT; } SKIP_BLANKS; Index: mingw32-libxml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/EL-5/mingw32-libxml2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- mingw32-libxml2.spec 28 Jan 2009 11:50:30 -0000 1.1 +++ mingw32-libxml2.spec 10 Aug 2009 16:53:41 -0000 1.2 @@ -6,7 +6,7 @@ Name: mingw32-libxml2 Version: 2.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows libxml2 XML processing library License: MIT @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve # Not required for MinGW. #Patch0: libxml2-multilib.patch +Patch1: libxml2-2.7.3-ficora-parse.patch # MinGW-specific patches. Patch1000: mingw32-libxml2-2.7.2-with-modules.patch @@ -44,6 +45,8 @@ MinGW Windows libxml2 XML processing lib %prep %setup -q -n libxml2-%{version} +%patch1 -p1 + %patch1000 -p1 # Patched configure.in, so rebuild configure. @@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 10 2009 Daniel Veillard <veillard(a)redhat.com> - 2.7.2-7 +- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416 + * Mon Jan 26 2009 Richard W.M. Jones <rjones(a)redhat.com> - 2.7.2-6 - Rerun autoreconf after patching configure.in (Erik van Pienbroek). - Rebuild libtool for Rawhide / libtool 2.

1 0

rpms/mingw32-libxml2/F-11 libxml2-2.7.3-ficora-parse.patch, NONE, 1.1 mingw32-libxml2.spec, 1.5, 1.6
by Daniel Veillard 10 Aug '09

10 Aug '09

Author: veillard Update of /cvs/pkgs/rpms/mingw32-libxml2/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17625 Modified Files: mingw32-libxml2.spec Added Files: libxml2-2.7.3-ficora-parse.patch Log Message: - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416 Daniel libxml2-2.7.3-ficora-parse.patch: parser.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 12 deletions(-) --- NEW FILE libxml2-2.7.3-ficora-parse.patch --- diff --git a/parser.c b/parser.c index a476060..b404722 100644 --- a/parser.c +++ b/parser.c @@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { if (name == NULL) { xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED, "Name expected in NOTATION declaration\n"); - return(ret); + xmlFreeEnumeration(ret); + return(NULL); } tmp = ret; while (tmp != NULL) { @@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { } if (tmp == NULL) { cur = xmlCreateEnumeration(name); - if (cur == NULL) return(ret); + if (cur == NULL) { + xmlFreeEnumeration(ret); + return(NULL); + } if (last == NULL) ret = last = cur; else { last->next = cur; @@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { } while (RAW == '|'); if (RAW != ')') { xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL); - if ((last != NULL) && (last != ret)) - xmlFreeEnumeration(last); - return(ret); + xmlFreeEnumeration(ret); + return(NULL); } NEXT; return(ret); @@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) { cur = xmlCreateEnumeration(name); if (!xmlDictOwns(ctxt->dict, name)) xmlFree(name); - if (cur == NULL) return(ret); + if (cur == NULL) { + xmlFreeEnumeration(ret); + return(NULL); + } if (last == NULL) ret = last = cur; else { last->next = cur; @@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { } /** - * xmlParseElementChildrenContentDecl: + * xmlParseElementChildrenContentDeclPriv: * @ctxt: an XML parser context * @inputchk: the input used for the current entity, needed for boundary checks + * @depth: the level of recursion * * parse the declaration for a Mixed Element content * The leading '(' and spaces have been skipped in xmlParseElementContentDecl @@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { * Returns the tree of xmlElementContentPtr describing the element * hierarchy. */ -xmlElementContentPtr -xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { +static xmlElementContentPtr +xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk, + int depth) { xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL; const xmlChar *elem; xmlChar type = 0; + if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) || + (depth > 2048)) { + xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED, +"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n", + depth); + return(NULL); + } SKIP_BLANKS; GROW; if (RAW == '(') { @@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { /* Recurse on first child */ NEXT; SKIP_BLANKS; - cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid); + cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); SKIP_BLANKS; GROW; } else { @@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { /* Recurse on second child */ NEXT; SKIP_BLANKS; - last = xmlParseElementChildrenContentDecl(ctxt, inputid); + last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); SKIP_BLANKS; } else { elem = xmlParseName(ctxt); @@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { } /** + * + * xmlParseElementChildrenContentDecl: + * @ctxt: an XML parser context + * @inputchk: the input used for the current entity, needed for boundary checks + * @depth: the level of recursion + * + * parse the declaration for a Mixed Element content + * The leading '(' and spaces have been skipped in xmlParseElementContentDecl + * + * [47] children ::= (choice | seq) ('?' | '*' | '+')? + * + * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? + * + * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' + * + * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' + * + * [ VC: Proper Group/PE Nesting ] applies to [49] and [50] + * TODO Parameter-entity replacement text must be properly nested + * with parenthesized groups. That is to say, if either of the + * opening or closing parentheses in a choice, seq, or Mixed + * construct is contained in the replacement text for a parameter + * entity, both must be contained in the same replacement text. For + * interoperability, if a parameter-entity reference appears in a + * choice, seq, or Mixed construct, its replacement text should not + * be empty, and neither the first nor last non-blank character of + * the replacement text should be a connector (| or ,). + * + * Returns the tree of xmlElementContentPtr describing the element + * hierarchy. + */ +xmlElementContentPtr +xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { + /* stub left for API/ABI compat */ + return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1)); +} + +/** * xmlParseElementContentDecl: * @ctxt: an XML parser context * @name: the name of the element being defined. @@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name, tree = xmlParseElementMixedContentDecl(ctxt, inputid); res = XML_ELEMENT_TYPE_MIXED; } else { - tree = xmlParseElementChildrenContentDecl(ctxt, inputid); + tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1); res = XML_ELEMENT_TYPE_ELEMENT; } SKIP_BLANKS; Index: mingw32-libxml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-11/mingw32-libxml2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- mingw32-libxml2.spec 4 May 2009 14:52:52 -0000 1.5 +++ mingw32-libxml2.spec 10 Aug 2009 16:32:42 -0000 1.6 @@ -6,7 +6,7 @@ Name: mingw32-libxml2 Version: 2.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows libxml2 XML processing library License: MIT @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve # Not required for MinGW. #Patch0: libxml2-multilib.patch +Patch1: libxml2-2.7.3-ficora-parse.patch # MinGW-specific patches. Patch1000: mingw32-libxml2-2.7.2-with-modules.patch @@ -54,6 +55,8 @@ Static version of the MinGW Windows XML %prep %setup -q -n libxml2-%{version} +%patch1 -p1 + %patch1000 -p1 %patch1001 -p0 @@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libxml2.a %changelog +* Mon Aug 10 2009 Daniel Veillard <veillard(a)redhat.com> - 2.7.3-2 +- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416 + * Mon May 4 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.7.3-1 - Update to 2.7.3

1 0

rpms/mingw32-libxml2/F-10 libxml2-2.7.3-ficora-parse.patch, NONE, 1.1 mingw32-libxml2.spec, 1.1, 1.2
by Daniel Veillard 10 Aug '09

10 Aug '09

Author: veillard Update of /cvs/pkgs/rpms/mingw32-libxml2/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17677 Modified Files: mingw32-libxml2.spec Added Files: libxml2-2.7.3-ficora-parse.patch Log Message: - two patches for parsing problems CVE-2009-2414 and CVE-2009-2416 Daniel libxml2-2.7.3-ficora-parse.patch: parser.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 12 deletions(-) --- NEW FILE libxml2-2.7.3-ficora-parse.patch --- diff --git a/parser.c b/parser.c index a476060..b404722 100644 --- a/parser.c +++ b/parser.c @@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { if (name == NULL) { xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED, "Name expected in NOTATION declaration\n"); - return(ret); + xmlFreeEnumeration(ret); + return(NULL); } tmp = ret; while (tmp != NULL) { @@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { } if (tmp == NULL) { cur = xmlCreateEnumeration(name); - if (cur == NULL) return(ret); + if (cur == NULL) { + xmlFreeEnumeration(ret); + return(NULL); + } if (last == NULL) ret = last = cur; else { last->next = cur; @@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { } while (RAW == '|'); if (RAW != ')') { xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL); - if ((last != NULL) && (last != ret)) - xmlFreeEnumeration(last); - return(ret); + xmlFreeEnumeration(ret); + return(NULL); } NEXT; return(ret); @@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) { cur = xmlCreateEnumeration(name); if (!xmlDictOwns(ctxt->dict, name)) xmlFree(name); - if (cur == NULL) return(ret); + if (cur == NULL) { + xmlFreeEnumeration(ret); + return(NULL); + } if (last == NULL) ret = last = cur; else { last->next = cur; @@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { } /** - * xmlParseElementChildrenContentDecl: + * xmlParseElementChildrenContentDeclPriv: * @ctxt: an XML parser context * @inputchk: the input used for the current entity, needed for boundary checks + * @depth: the level of recursion * * parse the declaration for a Mixed Element content * The leading '(' and spaces have been skipped in xmlParseElementContentDecl @@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { * Returns the tree of xmlElementContentPtr describing the element * hierarchy. */ -xmlElementContentPtr -xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { +static xmlElementContentPtr +xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk, + int depth) { xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL; const xmlChar *elem; xmlChar type = 0; + if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) || + (depth > 2048)) { + xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED, +"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n", + depth); + return(NULL); + } SKIP_BLANKS; GROW; if (RAW == '(') { @@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { /* Recurse on first child */ NEXT; SKIP_BLANKS; - cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid); + cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); SKIP_BLANKS; GROW; } else { @@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { /* Recurse on second child */ NEXT; SKIP_BLANKS; - last = xmlParseElementChildrenContentDecl(ctxt, inputid); + last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, + depth + 1); SKIP_BLANKS; } else { elem = xmlParseName(ctxt); @@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { } /** + * + * xmlParseElementChildrenContentDecl: + * @ctxt: an XML parser context + * @inputchk: the input used for the current entity, needed for boundary checks + * @depth: the level of recursion + * + * parse the declaration for a Mixed Element content + * The leading '(' and spaces have been skipped in xmlParseElementContentDecl + * + * [47] children ::= (choice | seq) ('?' | '*' | '+')? + * + * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? + * + * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' + * + * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' + * + * [ VC: Proper Group/PE Nesting ] applies to [49] and [50] + * TODO Parameter-entity replacement text must be properly nested + * with parenthesized groups. That is to say, if either of the + * opening or closing parentheses in a choice, seq, or Mixed + * construct is contained in the replacement text for a parameter + * entity, both must be contained in the same replacement text. For + * interoperability, if a parameter-entity reference appears in a + * choice, seq, or Mixed construct, its replacement text should not + * be empty, and neither the first nor last non-blank character of + * the replacement text should be a connector (| or ,). + * + * Returns the tree of xmlElementContentPtr describing the element + * hierarchy. + */ +xmlElementContentPtr +xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { + /* stub left for API/ABI compat */ + return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1)); +} + +/** * xmlParseElementContentDecl: * @ctxt: an XML parser context * @name: the name of the element being defined. @@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name, tree = xmlParseElementMixedContentDecl(ctxt, inputid); res = XML_ELEMENT_TYPE_MIXED; } else { - tree = xmlParseElementChildrenContentDecl(ctxt, inputid); + tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1); res = XML_ELEMENT_TYPE_ELEMENT; } SKIP_BLANKS; Index: mingw32-libxml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-10/mingw32-libxml2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- mingw32-libxml2.spec 28 Jan 2009 11:50:26 -0000 1.1 +++ mingw32-libxml2.spec 10 Aug 2009 16:32:40 -0000 1.2 @@ -6,7 +6,7 @@ Name: mingw32-libxml2 Version: 2.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW Windows libxml2 XML processing library License: MIT @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{ve # Not required for MinGW. #Patch0: libxml2-multilib.patch +Patch1: libxml2-2.7.3-ficora-parse.patch # MinGW-specific patches. Patch1000: mingw32-libxml2-2.7.2-with-modules.patch @@ -44,6 +45,8 @@ MinGW Windows libxml2 XML processing lib %prep %setup -q -n libxml2-%{version} +%patch1 -p1 + %patch1000 -p1 # Patched configure.in, so rebuild configure. @@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 10 2009 Daniel Veillard <veillard(a)redhat.com> - 2.7.2-7 +- two patches for parsing problems CVE-2009-2414 and CVE-2009-2416 + * Mon Jan 26 2009 Richard W.M. Jones <rjones(a)redhat.com> - 2.7.2-6 - Rerun autoreconf after patching configure.in (Erik van Pienbroek). - Rebuild libtool for Rawhide / libtool 2.

1 0

rpms/mingw32-libxml2/devel mingw32-libxml2.spec,1.7,1.8
by Daniel Veillard 10 Aug '09

10 Aug '09

Author: veillard Update of /cvs/pkgs/rpms/mingw32-libxml2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13862 Modified Files: mingw32-libxml2.spec Log Message: Forgot to bump the release... Daniel Index: mingw32-libxml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- mingw32-libxml2.spec 10 Aug 2009 16:16:23 -0000 1.7 +++ mingw32-libxml2.spec 10 Aug 2009 16:17:22 -0000 1.8 @@ -6,7 +6,7 @@ Name: mingw32-libxml2 Version: 2.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows libxml2 XML processing library License: MIT

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

mingw August 2009