[Contrib] Bump XML to 2.7.2 and update gnuTLS to 2.6.2 (big issue in 2.6.1)

extras/contrib/src/Makefile

@@ -1654,16 +1654,11 @@ libxml2-$(XML_VERSION).tar.gz:
 
 xml: libxml2-$(XML_VERSION).tar.gz
 	$(EXTRACT_GZ)
-ifdef HAVE_WIN32
-	patch -p0 < Patches/xml2-win32.patch
-	rm -f xml/aclocal.m4
-	(cd $@; aclocal && automake && autoreconf)
-endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/xml2-uclibc.patch
 endif
 
-XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps
+XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp  --without-debug --without-docbook --without-regexps --without-python
 
 .xml: xml
   ifdef HAVE_CYGWIN

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

-# Get rid of the test programs. -- Xtophe
---- xml/Makefile.am	2005-07-11 00:53:13.000000000 +0200
-+++ xml-new/Makefile.am	2005-08-30 21:36:51.000000000 +0200
-@@ -1,16 +1,16 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
-+SUBDIRS = include . 
- 
--DIST_SUBDIRS = include . doc example python xstc
-+DIST_SUBDIRS = include . 
- 
- INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
- 
--noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
--                testThreads testC14N testAutomata testRegexp \
--                testReader testapi testModule runtest runsuite
-+#noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
-+#                testThreads testC14N testAutomata testRegexp \
-+#                testReader testapi testModule runtest runsuite
- 
--bin_PROGRAMS = xmllint xmlcatalog
-+#bin_PROGRAMS = xmllint xmlcatalog
- 
- bin_SCRIPTS=xml2-config
- 
-@@ -49,86 +49,86 @@
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libxml.m4
- 
--runtest_SOURCES=runtest.c
--runtest_LDFLAGS = 
--runtest_DEPENDENCIES = $(DEPS)
--runtest_LDADD= @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
--
--runsuite_SOURCES=runsuite.c
--runsuite_LDFLAGS = 
--runsuite_DEPENDENCIES = $(DEPS)
--runsuite_LDADD= @RDL_LIBS@ $(LDADDS)
--
--xmllint_SOURCES=xmllint.c
--xmllint_LDFLAGS = 
--xmllint_DEPENDENCIES = $(DEPS)
--xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
--
--testSAX_SOURCES=testSAX.c
--testSAX_LDFLAGS = 
--testSAX_DEPENDENCIES = $(DEPS)
--testSAX_LDADD= $(LDADDS)
--
--testHTML_SOURCES=testHTML.c
--testHTML_LDFLAGS = 
--testHTML_DEPENDENCIES = $(DEPS)
--testHTML_LDADD= $(LDADDS)
--
--xmlcatalog_SOURCES=xmlcatalog.c
--xmlcatalog_LDFLAGS = 
--xmlcatalog_DEPENDENCIES = $(DEPS)
--xmlcatalog_LDADD= @RDL_LIBS@ $(LDADDS)
--
--testXPath_SOURCES=testXPath.c
--testXPath_LDFLAGS = 
--testXPath_DEPENDENCIES = $(DEPS)
--testXPath_LDADD= $(LDADDS)
--
--testC14N_SOURCES=testC14N.c
--testC14N_LDFLAGS = 
--testC14N_DEPENDENCIES = $(DEPS)
--testC14N_LDADD= $(LDADDS)
--
--testThreads_SOURCES=testThreads@THREADS_W32@.c
--testThreads_LDFLAGS = 
--testThreads_DEPENDENCIES = $(DEPS)
--testThreads_LDADD= @BASE_THREAD_LIBS@  $(LDADDS)
--
--testURI_SOURCES=testURI.c
--testURI_LDFLAGS = 
--testURI_DEPENDENCIES = $(DEPS)
--testURI_LDADD= $(LDADDS)
--
--testRegexp_SOURCES=testRegexp.c
--testRegexp_LDFLAGS = 
--testRegexp_DEPENDENCIES = $(DEPS)
--testRegexp_LDADD= $(LDADDS)
--
--testAutomata_SOURCES=testAutomata.c
--testAutomata_LDFLAGS = 
--testAutomata_DEPENDENCIES = $(DEPS)
--testAutomata_LDADD= $(LDADDS)
--
--testSchemas_SOURCES=testSchemas.c
--testSchemas_LDFLAGS = 
--testSchemas_DEPENDENCIES = $(DEPS)
--testSchemas_LDADD= $(LDADDS)
--
--testRelax_SOURCES=testRelax.c
--testRelax_LDFLAGS = 
--testRelax_DEPENDENCIES = $(DEPS)
--testRelax_LDADD= $(LDADDS)
--
--testReader_SOURCES=testReader.c
--testReader_LDFLAGS = 
--testReader_DEPENDENCIES = $(DEPS)
--testReader_LDADD= $(LDADDS)
--
--testModule_SOURCES=testModule.c
--testModule_LDFLAGS = 
--testModule_DEPENDENCIES = $(DEPS)
--testModule_LDADD= $(LDADDS)
--
-+#runtest_SOURCES=runtest.c
-+#runtest_LDFLAGS = 
-+#runtest_DEPENDENCIES = $(DEPS)
-+#runtest_LDADD= @BASE_THREAD_LIBS@ @RDL_LIBS@ $(LDADDS)
-+#
-+#runsuite_SOURCES=runsuite.c
-+#runsuite_LDFLAGS = 
-+#runsuite_DEPENDENCIES = $(DEPS)
-+#runsuite_LDADD= @RDL_LIBS@ $(LDADDS)
-+#
-+##xmllint_SOURCES=xmllint.c
-+##xmllint_LDFLAGS = 
-+##xmllint_DEPENDENCIES = $(DEPS)
-+##xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
-+##
-+#testSAX_SOURCES=testSAX.c
-+#testSAX_LDFLAGS = 
-+#testSAX_DEPENDENCIES = $(DEPS)
-+#testSAX_LDADD= $(LDADDS)
-+#
-+#testHTML_SOURCES=testHTML.c
-+#testHTML_LDFLAGS = 
-+#testHTML_DEPENDENCIES = $(DEPS)
-+#testHTML_LDADD= $(LDADDS)
-+#
-+##xmlcatalog_SOURCES=xmlcatalog.c
-+##xmlcatalog_LDFLAGS = 
-+##xmlcatalog_DEPENDENCIES = $(DEPS)
-+##xmlcatalog_LDADD= @RDL_LIBS@ $(LDADDS)
-+##
-+#testXPath_SOURCES=testXPath.c
-+#testXPath_LDFLAGS = 
-+#testXPath_DEPENDENCIES = $(DEPS)
-+#testXPath_LDADD= $(LDADDS)
-+#
-+#testC14N_SOURCES=testC14N.c
-+#testC14N_LDFLAGS = 
-+#testC14N_DEPENDENCIES = $(DEPS)
-+#testC14N_LDADD= $(LDADDS)
-+#
-+#testThreads_SOURCES=testThreads@THREADS_W32@.c
-+#testThreads_LDFLAGS = 
-+#testThreads_DEPENDENCIES = $(DEPS)
-+#testThreads_LDADD= @BASE_THREAD_LIBS@  $(LDADDS)
-+#
-+#testURI_SOURCES=testURI.c
-+#testURI_LDFLAGS = 
-+#testURI_DEPENDENCIES = $(DEPS)
-+#testURI_LDADD= $(LDADDS)
-+#
-+#testRegexp_SOURCES=testRegexp.c
-+#testRegexp_LDFLAGS = 
-+#testRegexp_DEPENDENCIES = $(DEPS)
-+#testRegexp_LDADD= $(LDADDS)
-+#
-+#testAutomata_SOURCES=testAutomata.c
-+#testAutomata_LDFLAGS = 
-+#testAutomata_DEPENDENCIES = $(DEPS)
-+#testAutomata_LDADD= $(LDADDS)
-+#
-+#testSchemas_SOURCES=testSchemas.c
-+#testSchemas_LDFLAGS = 
-+#testSchemas_DEPENDENCIES = $(DEPS)
-+#testSchemas_LDADD= $(LDADDS)
-+#
-+#testRelax_SOURCES=testRelax.c
-+#testRelax_LDFLAGS = 
-+#testRelax_DEPENDENCIES = $(DEPS)
-+#testRelax_LDADD= $(LDADDS)
-+#
-+#testReader_SOURCES=testReader.c
-+#testReader_LDFLAGS = 
-+#testReader_DEPENDENCIES = $(DEPS)
-+#testReader_LDADD= $(LDADDS)
-+#
-+#testModule_SOURCES=testModule.c
-+#testModule_LDFLAGS = 
-+#testModule_DEPENDENCIES = $(DEPS)
-+#testModule_LDADD= $(LDADDS)
-+#
- noinst_LTLIBRARIES = testdso.la
- testdso_la_SOURCES = testdso.c
- testdso_la_LDFLAGS = -module -rpath $(libdir)

extras/contrib/src/packages.mak

@@ -147,7 +147,7 @@ GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz
 GCRYPT_VERSION=1.4.3
 #GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=2.6.1
+GNUTLS_VERSION=2.6.2
 GNUTLS_URL=http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 OPENCDK_VERSION=0.6.6
 OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2
@@ -189,9 +189,9 @@ QT4T_VERSION=4.3.2
 QT4T_URL=ftp://ftp.trolltech.com/pub/qt/source/qt-win-opensource-$(QT4T_VERSION)-mingw.exe
 ZLIB_VERSION=1.2.3
 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
-XML_VERSION=2.6.32
-XML_URL=$(VIDEOLAN)/testing/contrib/libxml2-$(XML_VERSION).tar.gz
-#XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
+XML_VERSION=2.7.2
+#XML_URL=$(VIDEOLAN)/testing/contrib/libxml2-$(XML_VERSION).tar.gz
+XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
 DIRAC_VERSION=1.0.0
 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
 DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz