version 26

Configurations/libxml2.xcconfig

@@ -3,4 +3,4 @@ INSTALL_PATH_ACTUAL = /usr/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INDIGO_INSTALL_PATH_PREFIX)/usr/include/libxml2/libxml;
 
 DYLIB_COMPATIBILITY_VERSION = 10.0.0;
-DYLIB_CURRENT_VERSION = 10.8.0;
+DYLIB_CURRENT_VERSION = 10.9.0;

NMakefile → NMakefileArch

@@ -1,27 +1,27 @@
-# This relies on the sources being prepared on a Mac OS X machine via 'make COPY_SOURCES=YES install_source'
-
-install:
-# ========== libxml2 ==========
-	set PATH=$(PATH);$(CYGWINPATH)
-	$(CYGWINPATH)\bash "$(SRCROOT)\AppleInternal\tools\scripts\auto-version.sh" "$(OBJROOT)\libxml\obj"
-	cd "$(SRCROOT)\libxml2\win32"
-	cscript //nologo configure.js cruntime=/MD prefix="$(OBJROOT)\libxml" rinclude="$(OBJROOT)\libxml\obj\include" include="$(SRCROOT)\AppleInternal\include;$(SRCROOT)\AppleInternal\include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility" lib="$(SRCROOT)\AppleInternal\lib" iconv=no icu=yes
-	nmake /f Makefile.msvc
-	nmake /f Makefile.msvc install	
-	xcopy "$(OBJROOT)\libxml\bin\libxml2.*" "$(DSTROOT)\AppleInternal\bin" /e/v/i/h/y
-	xcopy "$(OBJROOT)\libxml\lib\*.dll" "$(DSTROOT)\AppleInternal\bin" /e/v/i/h/y
-	xcopy "$(OBJROOT)\libxml\lib\*.lib" "$(DSTROOT)\AppleInternal\lib" /e/v/i/h/y
-	xcopy "$(OBJROOT)\libxml\include\libxml" "$(DSTROOT)\AppleInternal\include\libxml" /e/v/i/h/y	
-
-install_DEBUG:
-# ========== libxml2 ==========
-	set PATH=$(PATH);$(CYGWINPATH)
-	$(CYGWINPATH)\bash "$(SRCROOT)\AppleInternal\tools\scripts\auto-version.sh" "$(OBJROOT)\libxml\obj"
-	cd "$(SRCROOT)\libxml2\win32"
-	cscript //nologo configure.js debug=1 cruntime=/MDd prefix="$(OBJROOT)\libxml" rinclude="$(OBJROOT)\libxml\obj\include" include="$(SRCROOT)\AppleInternal\include;$(SRCROOT)\AppleInternal\include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility" lib="$(SRCROOT)\AppleInternal\lib" iconv=no icu=yes
-	nmake /f Makefile.msvc
-	nmake /f Makefile.msvc install
-	xcopy "$(OBJROOT)\libxml\bin\libxml*" "$(DSTROOT)\AppleInternal\bin" /e/v/i/h/y
-	xcopy "$(OBJROOT)\libxml\lib\*.dll" "$(DSTROOT)\AppleInternal\bin" /e/v/i/h/y
-	xcopy "$(OBJROOT)\libxml\lib\*.lib" "$(DSTROOT)\AppleInternal\lib" /e/v/i/h/y
-	xcopy "$(OBJROOT)\libxml\include\libxml" "$(DSTROOT)\AppleInternal\include\libxml" /e/v/i/h/y	
+# This relies on the sources being prepared on a Mac OS X machine via 'make COPY_SOURCES=YES install_source'
+
+install:
+# ========== libxml2 ==========
+	set PATH=$(PATH);$(CYGWINPATH);$(PROGRAMFILESAAS)
+	$(CYGWINPATH)\bash "$(SRCROOT)\AppleInternal\tools\scripts\auto-version.sh" "$(OBJROOT)\libxml\obj"
+	cd "$(SRCROOT)\libxml2\win32"
+	cscript //nologo configure.js cruntime=/MD prefix="$(OBJROOT)\libxml" rinclude="$(OBJROOT)\libxml\obj\include" include="$(SRCROOT)\AppleInternal\include;$(SRCROOT)\AppleInternal\include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility" lib="$(SRCROOT)\AppleInternal\lib$(ARCH)" iconv=no icu=yes
+	nmake /f Makefile.msvc
+	nmake /f Makefile.msvc install	
+	xcopy "$(OBJROOT)\libxml\bin\libxml2.*" "$(DSTROOT)\$(PROGRAMFILESAAS)" /e/v/i/h/y
+	xcopy "$(OBJROOT)\libxml\lib\*.dll" "$(DSTROOT)\$(PROGRAMFILESAAS)" /e/v/i/h/y
+	xcopy "$(OBJROOT)\libxml\lib\*.lib" "$(DSTROOT)\AppleInternal\lib$(ARCH)" /e/v/i/h/y
+	xcopy "$(OBJROOT)\libxml\include\libxml2\libxml" "$(DSTROOT)\AppleInternal\include\libxml" /e/v/i/h/y	
+
+install_DEBUG:
+# ========== libxml2 ==========
+	set PATH=$(PATH);$(CYGWINPATH);$(PROGRAMFILESAAS)
+	$(CYGWINPATH)\bash "$(SRCROOT)\AppleInternal\tools\scripts\auto-version.sh" "$(OBJROOT)\libxml\obj"
+	cd "$(SRCROOT)\libxml2\win32"
+	cscript //nologo configure.js debug=1 cruntime=/MDd prefix="$(OBJROOT)\libxml" rinclude="$(OBJROOT)\libxml\obj\include" include="$(SRCROOT)\AppleInternal\include;$(SRCROOT)\AppleInternal\include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility" lib="$(SRCROOT)\AppleInternal\lib$(ARCH)" iconv=no icu=yes
+	nmake /f Makefile.msvc
+	nmake /f Makefile.msvc install
+	xcopy "$(OBJROOT)\libxml\bin\libxml*" "$(DSTROOT)\$(PROGRAMFILESAAS)" /e/v/i/h/y
+	xcopy "$(OBJROOT)\libxml\lib\*.dll" "$(DSTROOT)\$(PROGRAMFILESAAS)" /e/v/i/h/y
+	xcopy "$(OBJROOT)\libxml\lib\*.lib" "$(DSTROOT)\AppleInternal\lib$(ARCH)" /e/v/i/h/y
+	xcopy "$(OBJROOT)\libxml\include\libxml2\libxml" "$(DSTROOT)\AppleInternal\include\libxml" /e/v/i/h/y	

Pregenerated Files/config.h

@@ -1,7 +1,7 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 #define PACKAGE "libxml2"
-#define VERSION "2.7.8"
+#define VERSION "2.9.0"
 #define HAVE_LIBZ 1
 /* #undef HAVE_LIBM */
 #define HAVE_ISINF 

Pregenerated Files/libxml/xmlversion.h

@@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.7.8"
+#define LIBXML_DOTTED_VERSION "2.9.0"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20708
+#define LIBXML_VERSION 20900
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20708"
+#define LIBXML_VERSION_STRING "20900"
 
 /**
  * LIBXML_VERSION_EXTRA:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20708);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20900);
 
 #ifndef VMS
 #if 0
@@ -396,14 +396,27 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #include <ansidecl.h>
 #endif
 
+/**
+ * LIBXML_LZMA_ENABLED:
+ *
+ * Whether the Lzma support is compiled in
+ */
+#if 0
+#define LIBXML_LZMA_ENABLED
+#endif
+
 /**
  * ATTRIBUTE_UNUSED:
  *
  * Macro used to signal to GCC unused function parameters
  */
 
 #ifndef ATTRIBUTE_UNUSED
-#define ATTRIBUTE_UNUSED __attribute__((unused))
+# if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
+#  define ATTRIBUTE_UNUSED __attribute__((unused))
+# else
+#  define ATTRIBUTE_UNUSED
+# endif
 #endif
 
 /**

Pregenerated Files/xml2-config

@@ -30,12 +30,12 @@ while test $# -gt 0; do
 
     case "$1" in
     --version)
-        echo 2.7.8
+        echo 2.9.0
         exit 0
     ;;
 
     --prefix)
-        echo /usr
+        echo $(xcrun --show-sdk-path)/usr
         exit 0
     ;;
 
@@ -44,7 +44,7 @@ while test $# -gt 0; do
     ;;
 
     --cflags)
-        echo -I/usr/include/libxml2
+        echo -I$(xcrun --show-sdk-path)/usr/include/libxml2
     ;;
 
     --modules)

buildlibxmlforaas.bat

@@ -0,0 +1,8 @@
+set ARCH=32
+set PROGRAMFILESAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
+call "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" x86
+nmake /f NMakefileArch %1
+set ARCH=64
+set PROGRAMFILESAAS=Program Files\Common Files\Apple\Apple Application Support
+call "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" amd64
+nmake /f NMakefileArch %1

libxml2.plist

@@ -5,15 +5,15 @@
 	<key>OpenSourceProject</key>
 	<string>libxml2</string>
 	<key>OpenSourceVersion</key>
-	<string>2.7.8</string>
+	<string>2.9.0</string>
 	<key>OpenSourceWebsiteURL</key>
 	<string>http://xmlsoft.org/</string>
 	<key>OpenSourceURL</key>
-	<string>http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz</string>
+	<string>http://xmlsoft.org/sources/libxml2-2.9.0.tar.gz</string>
 	<key>OpenSourceMD5</key>
-	<string>8127a65e8c3b08856093099b52599c86</string>
+	<string>5b9bebf4f5d2200ae2c4efe8fa6103f7</string>
 	<key>OpenSourceImportDate</key>
-	<string>2012-01-20</string>
+	<string>2012-12-11</string>
 	<key>OpenSourceLicense</key>
 	<string>other</string>
 	<key>OpenSourceLicenseFile</key>
@@ -34,6 +34,8 @@
 		<string>rdar://problem/10734584</string>
 		<string>rdar://problem/10734593</string>
 		<string>rdar://problem/10772343</string>
+		<string>rdar://problem/12751928</string>
+		<string>rdar://problem/12938958</string>
 	</array>
 </dict>
 </plist>

libxml2.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		5D0359B91677F7FC00B6692E /* buf.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D0359B81677F7FC00B6692E /* buf.c */; };
 		5D58B01614F81A8D00BE69D8 /* c14n.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D58AFCE14F81A8D00BE69D8 /* c14n.c */; };
 		5D58B01714F81A8D00BE69D8 /* catalog.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D58AFCF14F81A8D00BE69D8 /* catalog.c */; };
 		5D58B01814F81A8D00BE69D8 /* chvalid.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D58AFD014F81A8D00BE69D8 /* chvalid.c */; };
@@ -234,6 +235,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		5D0359B81677F7FC00B6692E /* buf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buf.c; sourceTree = "<group>"; };
 		5D58AF5C14F815F500BE69D8 /* libxml2.2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libxml2.2.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		5D58AF6A14F816DF00BE69D8 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
 		5D58AF6B14F816DF00BE69D8 /* libxml2.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = libxml2.xcconfig; sourceTree = "<group>"; };
@@ -434,6 +436,7 @@
 		5D58AF6D14F819EA00BE69D8 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				5D0359B81677F7FC00B6692E /* buf.c */,
 				5DB38B1614F881090060A507 /* xmlcatalog.c */,
 				5DB38AF714F87C740060A507 /* xmllint.c */,
 				5D58AFCE14F81A8D00BE69D8 /* c14n.c */,
@@ -796,6 +799,7 @@
 				5D58B05B14F81A8D00BE69D8 /* xmlwriter.c in Sources */,
 				5D58B05C14F81A8D00BE69D8 /* xpath.c in Sources */,
 				5D58B05D14F81A8D00BE69D8 /* xpointer.c in Sources */,
+				5D0359B91677F7FC00B6692E /* buf.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

libxml2/Copyright

@@ -2,7 +2,7 @@ Except where otherwise noted in the source code (e.g. the files hash.c,
 list.c and the trio files, which are covered by a similar licence but
 with different Copyright notices) all the files are:
 
- Copyright (C) 1998-2003 Daniel Veillard.  All Rights Reserved.
+ Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,11 +17,7 @@ all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
 NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Daniel Veillard shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from him.
-
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

libxml2/DOCBparser.c

@@ -53,7 +53,7 @@ docbEncodeEntities(unsigned char *out ATTRIBUTE_UNUSED,
 /**
  * docbParseDocument:
  * @ctxt:  an SGML parser context
- * 
+ *
  * parse an SGML document (and build a tree if using the standard SAX
  * interface).
  *
@@ -163,12 +163,12 @@ docbCreatePushParserCtxt(docbSAXHandlerPtr sax ATTRIBUTE_UNUSED,
  * @cur:  a pointer to an array of xmlChar
  * @encoding:  a free form C string describing the SGML document encoding, or NULL
  * @sax:  the SAX handler block
- * @userData: if using SAX, this pointer will be provided on callbacks. 
+ * @userData: if using SAX, this pointer will be provided on callbacks.
  *
  * parse an SGML in-memory document and build a tree.
  * It use the given SAX function block to handle the parsing callback.
  * If sax is NULL, fallback to the default DOM tree building routines.
- * 
+ *
  * Returns the resulting document tree
  */
 
@@ -196,7 +196,7 @@ docbSAXParseDoc(xmlChar * cur ATTRIBUTE_UNUSED,
  * @encoding:  a free form C string describing the SGML document encoding, or NULL
  *
  * parse an SGML in-memory document and build a tree.
- * 
+ *
  * Returns the resulting document tree
  */
 
@@ -221,7 +221,7 @@ docbParseDoc(xmlChar * cur ATTRIBUTE_UNUSED,
  * @filename:  the filename
  * @encoding:  the SGML document encoding, or NULL
  *
- * Create a parser context for a file content. 
+ * Create a parser context for a file content.
  * Automatic support for ZLIB/Compress compressed document is provided
  * by default if found at compile-time.
  *
@@ -247,7 +247,7 @@ docbCreateFileParserCtxt(const char *filename ATTRIBUTE_UNUSED,
  * @filename:  the filename
  * @encoding:  a free form C string describing the SGML document encoding, or NULL
  * @sax:  the SAX handler block
- * @userData: if using SAX, this pointer will be provided on callbacks. 
+ * @userData: if using SAX, this pointer will be provided on callbacks.
  *
  * parse an SGML file and build a tree. Automatic support for ZLIB/Compress
  * compressed document is provided by default if found at compile-time.