diff options
author | tono <tono@openoffice.org> | 2010-06-05 22:39:55 +0900 |
---|---|---|
committer | tono <tono@openoffice.org> | 2010-06-05 22:39:55 +0900 |
commit | a850c52babb1cf3a13fb2bc026504957dfb4b9cf (patch) | |
tree | e0f3dbe919674d4bb9f0eebcf7290dba3087d534 /libxml2 | |
parent | i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 : more fixes (diff) | |
parent | CWS-TOOLING: integrate CWS xmlsec1_2_14 (diff) | |
download | core-a850c52babb1cf3a13fb2bc026504957dfb4b9cf.tar.gz core-a850c52babb1cf3a13fb2bc026504957dfb4b9cf.zip |
mingwport30: merge with DEV300 m80
Diffstat (limited to 'libxml2')
-rwxr-xr-x | libxml2/libxml2-2.6.31-mingw.patch | 24 | ||||
-rw-r--r-- | libxml2/libxml2-2.6.31.patch | 412 | ||||
-rw-r--r-- | libxml2/libxml2-configure.patch | 118 | ||||
-rw-r--r-- | libxml2/libxml2-gnome599717.patch | 20 | ||||
-rw-r--r-- | libxml2/libxml2-gnome602728.patch | 12 | ||||
-rw-r--r-- | libxml2/libxml2-mingw.patch | 24 | ||||
-rw-r--r-- | libxml2/makefile.mk | 14 |
7 files changed, 180 insertions, 444 deletions
diff --git a/libxml2/libxml2-2.6.31-mingw.patch b/libxml2/libxml2-2.6.31-mingw.patch deleted file mode 100755 index 412db5bc244a..000000000000 --- a/libxml2/libxml2-2.6.31-mingw.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- misc/libxml2-2.6.31/configure 2008-01-11 17:01:56.000000000 +0900 -+++ misc/build/libxml2-2.6.31/configure 2009-09-07 20:48:47.656250000 +0900 -@@ -27331,6 +27331,8 @@ - - if test "$with_modules" != "no" ; then - case "$host" in -+ *-*-mingw*) -+ ;; - *-*-cygwin*) - MODULE_EXTENSION=".dll" - { echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5 ---- misc/libxml2-2.6.31/libxml.h 2007-11-23 19:47:23.000000000 +0900 -+++ misc/build/libxml2-2.6.31/libxml.h 2009-07-10 14:37:34.988250000 +0900 -@@ -30,6 +30,10 @@ - #include <libxml/xmlversion.h> - #else - #include "config.h" -+#ifdef __MINGW32__ -+#undef HAVE_LIBPTHREAD -+#undef HAVE_PTHREAD_H -+#endif - #include <libxml/xmlversion.h> - #endif - diff --git a/libxml2/libxml2-2.6.31.patch b/libxml2/libxml2-2.6.31.patch deleted file mode 100644 index 31fcf72e8479..000000000000 --- a/libxml2/libxml2-2.6.31.patch +++ /dev/null @@ -1,412 +0,0 @@ -*** misc/libxml2-2.6.31/configure Fri Jan 11 09:01:56 2008 ---- misc/build/libxml2-2.6.31/configure Thu Mar 27 14:09:56 2008 -*************** -*** 3463,3477 **** - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -! CFLAGS="-g -O2" - else -! CFLAGS="-g" - fi - else - if test "$GCC" = yes; then -! CFLAGS="-O2" - else -! CFLAGS= - fi - fi - { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ---- 3463,3477 ---- - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -! CFLAGS="$ADDCFLAGS -g -O2" - else -! CFLAGS="$ADDCFLAGS -g" - fi - else - if test "$GCC" = yes; then -! CFLAGS="$ADDCFLAGS -O2" - else -! CFLAGS="$ADDCFLAGS" - fi - fi - { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -*************** -*** 26207,26215 **** - - { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 - echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } -! if test "${ac_cv_search_setsockopt+set}" = set; then -! echo $ECHO_N "(cached) $ECHO_C" >&6 -! else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ ---- 26207,26215 ---- - - { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 - echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } -! #if test "${ac_cv_search_setsockopt+set}" = set; then -! # echo $ECHO_N "(cached) $ECHO_C" >&6 -! #else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -*************** -*** 26279,26285 **** - fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS -! fi - { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 - echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } - ac_res=$ac_cv_search_setsockopt ---- 26279,26285 ---- - fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS -! #fi - { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 - echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } - ac_res=$ac_cv_search_setsockopt -*** misc/libxml2-2.6.31/ltmain.sh Wed Aug 29 14:28:46 2007 ---- misc/build/libxml2-2.6.31/ltmain.sh Thu Mar 27 13:54:03 2008 -*************** -*** 3311,3318 **** - ;; - - freebsd-elf) -! major=".$current" -! versuffix=".$current"; - ;; - - irix | nonstopux) ---- 3311,3318 ---- - ;; - - freebsd-elf) -! major=.`expr $current - $age` -! versuffix=".$major.$age.$revision"; - ;; - - irix | nonstopux) -*** misc/libxml2-2.6.31/xml2-config.in Fri Jan 11 08:22:32 2008 ---- misc/build/libxml2-2.6.31/xml2-config.in Wed Apr 2 11:56:17 2008 -*************** -*** 1,10 **** - #! /bin/sh - -! prefix=@prefix@ -! exec_prefix=@exec_prefix@ -! includedir=@includedir@ -! libdir=@libdir@ - - usage() - { - cat <<EOF ---- 1,15 ---- - #! /bin/sh - -! #prefix=@prefix@ -! #exec_prefix=@exec_prefix@ -! #includedir=@includedir@ -! #libdir=@libdir@ - -+ prefix=${SOLARVERSION}/${INPATH} -+ exec_prefix=${SOLARVERSION}/${INPATH} -+ includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external -+ libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} -+ - usage() - { - cat <<EOF -*************** -*** 67,73 **** - ;; - - --cflags) -! echo @XML_INCLUDEDIR@ @XML_CFLAGS@ - ;; - - --libtool-libs) ---- 72,79 ---- - ;; - - --cflags) -! echo -I${includedir} -! # echo @XML_INCLUDEDIR@ @XML_CFLAGS@ - ;; - - --libtool-libs) -*************** -*** 82,100 **** - ;; - - --libs) -! if [ "`uname`" = "Linux" ] -! then -! if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] -! then -! echo @XML_LIBS@ -! else -! echo @XML_LIBDIR@ @XML_LIBS@ -! fi -! else -! echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ -! fi - ;; - - *) - usage - exit 1 ---- 88,111 ---- - ;; - - --libs) -! echo -L${libdir} ${LIBXML2LIB} -lm -! # if [ "`uname`" = "Linux" ] -! # then -! # if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] -! # then -! # echo @XML_LIBS@ -! # else -! # echo @XML_LIBDIR@ @XML_LIBS@ -! # fi -! # else -! # echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ -! # fi - ;; - -+ print) # ugly configure hack -+ exit 0 -+ ;; -+ - *) - usage - exit 1 -*** misc/libxml2-2.6.31/include/win32config.h Wed Apr 18 09:51:54 2007 ---- misc/build/libxml2-2.6.31/include/win32config.h Mon Mar 31 19:09:09 2008 -*************** -*** 92,98 **** ---- 92,100 ---- - #if defined(_MSC_VER) - #define mkdir(p,m) _mkdir(p) - #define snprintf _snprintf -+ #if _MSC_VER < 1500 - #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) -+ #endif - #elif defined(__MINGW32__) - #define mkdir(p,m) _mkdir(p) - #endif -*** misc/libxml2-2.6.31/include/wsockcompat.h Wed Jan 3 14:07:30 2007 ---- misc/build/libxml2-2.6.31/include/wsockcompat.h Thu Apr 3 10:15:50 2008 -*************** -*** 21,26 **** ---- 21,27 ---- - - /* Check if ws2tcpip.h is a recent version which provides getaddrinfo() */ - #if defined(GetAddrInfo) -+ #include <wspiapi.h> - #define HAVE_GETADDRINFO - #endif - #endif -*** misc/libxml2-2.6.31/include/libxml/xmlversion.h Fri Jan 11 10:11:19 2008 ---- misc/build/libxml2-2.6.31/include/libxml/xmlversion.h Thu Mar 27 13:54:03 2008 -*************** -*** 264,270 **** - * - * Whether iconv support is available - */ -! #if 1 - #define LIBXML_ICONV_ENABLED - #endif - ---- 264,270 ---- - * - * Whether iconv support is available - */ -! #if 0 - #define LIBXML_ICONV_ENABLED - #endif - -*************** -*** 282,288 **** - * - * Whether Debugging module is configured in - */ -! #if 1 - #define LIBXML_DEBUG_ENABLED - #endif - ---- 282,288 ---- - * - * Whether Debugging module is configured in - */ -! #if 0 - #define LIBXML_DEBUG_ENABLED - #endif - -*************** -*** 291,297 **** - * - * Whether the memory debugging is configured in - */ -! #if 1 - #define DEBUG_MEMORY_LOCATION - #endif - ---- 291,297 ---- - * - * Whether the memory debugging is configured in - */ -! #if 0 - #define DEBUG_MEMORY_LOCATION - #endif - -*************** -*** 300,306 **** - * - * Whether the runtime debugging is configured in - */ -! #if 1 - #define LIBXML_DEBUG_RUNTIME - #endif - ---- 300,306 ---- - * - * Whether the runtime debugging is configured in - */ -! #if 0 - #define LIBXML_DEBUG_RUNTIME - #endif - -diff -r -cN misc/libxml2-2.6.31/changelog misc/build/libxml2-2.6.31/changelog -*** misc/libxml2-2.6.31/changelog ---- misc/build/libxml2-2.6.31/changelog -*************** -*** 0 **** ---- 1,10 ---- -+ libxml2 (2.6.32.dfsg-5+lenny1) stable-security; urgency=high -+ -+ * Non-maintainer upload by the Security Team. -+ * Fix multiple use-after-free flaws when parsing notation and -+ enumeration attribute types (CVE-2009-2416). -+ * Fix stack overflow when parsing root XML document element DTD -+ definition (CVE-2009-2414). -+ -+ -- Nico Golde <nion@debian.org> Thu, 06 Aug 2009 13:04:00 +0000 -+ -diff -r -cN misc/libxml2-2.6.31/parser.c misc/build/libxml2-2.6.31/parser.c -*** misc/libxml2-2.6.31/parser.c ---- misc/build/libxml2-2.6.31/parser.c -*************** -*** 4752,4761 **** - if (name == NULL) { - xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED, - "Name expected in NOTATION declaration\n"); -! return(ret); - } - cur = xmlCreateEnumeration(name); -! if (cur == NULL) return(ret); - if (last == NULL) ret = last = cur; - else { - last->next = cur; ---- 4752,4766 ---- - if (name == NULL) { - xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED, - "Name expected in NOTATION declaration\n"); -! xmlFreeEnumeration(ret); -! return(NULL); - } - cur = xmlCreateEnumeration(name); -! if (cur == NULL) { -! xmlFreeEnumeration(ret); -! return(NULL); -! } -! - if (last == NULL) ret = last = cur; - else { - last->next = cur; -*************** -*** 4765,4773 **** - } while (RAW == '|'); - if (RAW != ')') { - xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL); -! if ((last != NULL) && (last != ret)) -! xmlFreeEnumeration(last); -! return(ret); - } - NEXT; - return(ret); ---- 4770,4777 ---- - } while (RAW == '|'); - if (RAW != ')') { - xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL); -! xmlFreeEnumeration(ret); -! return(NULL); - } - NEXT; - return(ret); -*************** -*** 4808,4814 **** - } - cur = xmlCreateEnumeration(name); - xmlFree(name); -! if (cur == NULL) return(ret); - if (last == NULL) ret = last = cur; - else { - last->next = cur; ---- 4812,4822 ---- - } - cur = xmlCreateEnumeration(name); - xmlFree(name); -! if (cur == NULL) { -! xmlFreeEnumeration(ret); -! return(NULL); -! } -! - if (last == NULL) ret = last = cur; - else { - last->next = cur; -*************** -*** 5206,5211 **** ---- 5214,5226 ---- - const xmlChar *elem; - xmlChar type = 0; - -+ if (ctxt->depth > 128) { -+ xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED, -+ "xmlParseElementChildrenContentDecl : depth %d too deep\n", -+ ctxt->depth); -+ return(NULL); -+ } -+ - SKIP_BLANKS; - GROW; - if (RAW == '(') { -*************** -*** 5214,5220 **** ---- 5229,5237 ---- - /* Recurse on first child */ - NEXT; - SKIP_BLANKS; -+ ctxt->depth++; - cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid); -+ ctxt->depth--; - SKIP_BLANKS; - GROW; - } else { -*************** -*** 5344,5350 **** ---- 5361,5369 ---- - /* Recurse on second child */ - NEXT; - SKIP_BLANKS; -+ ctxt->depth++; - last = xmlParseElementChildrenContentDecl(ctxt, inputid); -+ ctxt->depth--; - SKIP_BLANKS; - } else { - elem = xmlParseName(ctxt); diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch new file mode 100644 index 000000000000..4158c38ef47f --- /dev/null +++ b/libxml2/libxml2-configure.patch @@ -0,0 +1,118 @@ +--- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 ++++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 +@@ -6271,8 +6271,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix=".$major.$age.$revision"; + ;; + + irix | nonstopux) +--- misc/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000 ++++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000 +@@ -264,7 +264,7 @@ + * + * Whether iconv support is available + */ +-#if 1 ++#if 0 + #define LIBXML_ICONV_ENABLED + #endif + +@@ -282,7 +282,7 @@ + * + * Whether Debugging module is configured in + */ +-#if 1 ++#if 0 + #define LIBXML_DEBUG_ENABLED + #endif + +@@ -291,7 +291,7 @@ + * + * Whether the memory debugging is configured in + */ +-#if 1 ++#if 0 + #define DEBUG_MEMORY_LOCATION + #endif + +@@ -300,7 +300,7 @@ + * + * Whether the runtime debugging is configured in + */ +-#if 1 ++#if 0 + #define LIBXML_DEBUG_RUNTIME + #endif + +--- misc/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:20.000000000 +0000 ++++ misc/build/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:36.000000000 +0000 +@@ -1,9 +1,14 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-includedir=@includedir@ +-libdir=@libdir@ ++#prefix=@prefix@ ++#exec_prefix=@exec_prefix@ ++#includedir=@includedir@ ++#libdir=@libdir@ ++ ++prefix=${SOLARVERSION}/${INPATH} ++exec_prefix=${SOLARVERSION}/${INPATH} ++includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external ++libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} + + usage() + { +@@ -67,7 +72,8 @@ + ;; + + --cflags) +- echo @XML_INCLUDEDIR@ @XML_CFLAGS@ ++ echo -I${includedir} ++# echo @XML_INCLUDEDIR@ @XML_CFLAGS@ + ;; + + --libtool-libs) +@@ -82,19 +88,24 @@ + ;; + + --libs) +- if [ "`uname`" = "Linux" ] +- then +- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] +- then +- echo @XML_LIBS@ +- else +- echo @XML_LIBDIR@ @XML_LIBS@ +- fi +- else +- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ +- fi ++ echo -L${libdir} ${LIBXML2LIB} -lm ++# if [ "`uname`" = "Linux" ] ++# then ++# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] ++# then ++# echo @XML_LIBS@ ++# else ++# echo @XML_LIBDIR@ @XML_LIBS@ ++# fi ++# else ++# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ ++# fi + ;; + ++ print) # ugly configure hack ++ exit 0 ++ ;; ++ + *) + usage + exit 1 diff --git a/libxml2/libxml2-gnome599717.patch b/libxml2/libxml2-gnome599717.patch new file mode 100644 index 000000000000..cc6617d0e699 --- /dev/null +++ b/libxml2/libxml2-gnome599717.patch @@ -0,0 +1,20 @@ +--- misc/libxml2-2.7.6/relaxng.c 2009-12-17 11:53:12.000000000 +0000 ++++ misc/build/libxml2-2.7.6/relaxng.c 2009-12-17 16:30:43.000000000 +0000 +@@ -5369,7 +5369,7 @@ + } else { + xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, + "expecting name, anyName, nsName or choice : got %s\n", +- (node == NULL ? "nothing" : node->name), NULL); ++ (node == NULL ? BAD_CAST "nothing" : node->name), NULL); + return (NULL); + } + if (ret != def) { +@@ -9459,7 +9459,7 @@ + ctxt->states = NULL; + if (found == 0) { + if (cur == NULL) { +- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname"); + } else { + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); + } diff --git a/libxml2/libxml2-gnome602728.patch b/libxml2/libxml2-gnome602728.patch new file mode 100644 index 000000000000..b284d457a751 --- /dev/null +++ b/libxml2/libxml2-gnome602728.patch @@ -0,0 +1,12 @@ +--- misc/libxml2-2.7.6/configure 2009-12-18 12:12:08.000000000 +0000 ++++ misc/build/libxml2-2.7.6/configure 2009-12-18 12:20:40.000000000 +0000 +@@ -12150,7 +12150,7 @@ + $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ + VERSION_SCRIPT_FLAGS=-Wl,--version-script= + test "`uname`" == "SunOS" && \ +- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," ++ VERSION_SCRIPT_FLAGS="" + + if test -n "$VERSION_SCRIPT_FLAGS"; then + USE_VERSION_SCRIPT_TRUE= + diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch new file mode 100644 index 000000000000..d160dcb70138 --- /dev/null +++ b/libxml2/libxml2-mingw.patch @@ -0,0 +1,24 @@ +--- misc/libxml2-2.7.6/configure 2008-01-11 17:01:56.000000000 +0900 ++++ misc/build/libxml2-2.7.6/configure 2009-09-07 20:48:47.656250000 +0900 +@@ -19914,6 +19914,8 @@ + + if test "$with_modules" != "no" ; then + case "$host" in ++ *-*-mingw*) ++ ;; + *-*-cygwin*) + MODULE_EXTENSION=".dll" + { $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5 +--- misc/libxml2-2.7.6/libxml.h 2007-11-23 19:47:23.000000000 +0900 ++++ misc/build/libxml2-2.7.6/libxml.h 2009-07-10 14:37:34.988250000 +0900 +@@ -30,6 +30,10 @@ + #include <libxml/xmlversion.h> + #else + #include "config.h" ++#ifdef __MINGW32__ ++#undef HAVE_LIBPTHREAD ++#undef HAVE_PTHREAD_H ++#endif + #include <libxml/xmlversion.h> + #endif + diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index c315b871ac6d..4502c9055706 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -42,21 +42,19 @@ all: # --- Files -------------------------------------------------------- -LIBXML2VERSION=2.6.31 +LIBXML2VERSION=2.7.6 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) -TARFILE_MD5=71ef7bcd3493a94395abccecbcf62dd7 -#.IF "$(OS)$(COM)"=="WNTGCC" -#PATCH_FILES=$(TARFILE_NAME)-mingw.patch -#.ELSE -PATCH_FILES=$(TARFILE_NAME).patch -#.ENDIF +TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2 +PATCH_FILES=libxml2-configure.patch \ + libxml2-mingw.patch \ + libxml2-gnome599717.patch \ + libxml2-gnome602728.patch # This is only for UNX environment now .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -PATCH_FILES+=$(TARFILE_NAME)-mingw.patch xml2_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" xml2_CC+=-shared-libgcc |