Contribs for branch: XML CVE-2007-6284 backport with adaptations...

extras/contrib/src/Makefile

@@ -745,9 +745,6 @@ flac: flac-$(FLAC_VERSION).tar.gz
 ifdef HAVE_DARWIN_OS
 	(patch -p 0 < Patches/flac-mactel.patch)
 endif
-ifneq ($(HOST),$(BUILD))
-	(patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf)
-endif
 
 .FLAC: flac 
 ifdef HAVE_WIN32
@@ -1399,7 +1396,7 @@ ifdef HAVE_WIN32
 endif
 
 .xml: xml
-	(cd xml; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install)
+	(cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install)
 ifndef HAVE_DARWIN_OS
 	$(INSTALL_NAME)
 endif

extras/contrib/src/Patches/xml2-win32.patch

@@ -191,3 +191,23 @@
  noinst_LTLIBRARIES = testdso.la
  testdso_la_SOURCES = testdso.c
  testdso_la_LDFLAGS = -module -rpath $(libdir)
+--- xml/xmlmodule.c	2005-10-28 16:24:34.000000000 +0200
++++ xml-new/xmlmodule.c	2006-10-11 13:56:13.748125000 +0200
+@@ -190,6 +190,8 @@
+     return (0);
+ }
+ 
++#ifndef _WIN32
++
+ #ifdef HAVE_DLOPEN
+ #ifdef HAVE_DLFCN_H
+ #include <dlfcn.h>
+@@ -288,7 +290,7 @@
+ #endif /* HAVE_SHLLOAD */
+ #endif /* ! HAVE_DLOPEN */
+ 
+-#ifdef _WIN32
++#else /* _WIN32 */
+ 
+ #include <windows.h>
+ 

extras/contrib/src/packages.mak

@@ -156,11 +156,11 @@ SDL_IMAGE_URL=$(SF)/libsdl/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 MUSE_VERSION=1.2.2
 #MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
-WXWIDGETS_VERSION=2.6.3
+WXWIDGETS_VERSION=2.6.4
 WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 ZLIB_VERSION=1.2.3
 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
-XML_VERSION=2.6.26
+XML_VERSION=2.6.31
 XML_URL=ftp://xmlsoft.org/libxml2/libxml2-$(XML_VERSION).tar.gz
 DIRAC_VERSION=0.5.4
 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz