libxml2/libxml2-2.6.31.patch

   1 *** misc/libxml2-2.6.31/configure       Fri Jan 11 09:01:56 2008
   2 --- misc/build/libxml2-2.6.31/configure Thu Mar 27 14:09:56 2008
   3 ***************
   4 *** 3463,3477 ****
   5     CFLAGS=$ac_save_CFLAGS
   6   elif test $ac_cv_prog_cc_g = yes; then
   7     if test "$GCC" = yes; then
   8 !     CFLAGS="-g -O2"
   9     else
  10 !     CFLAGS="-g"
  11     fi
  12   else
  13     if test "$GCC" = yes; then
  14 !     CFLAGS="-O2"
  15     else
  16 !     CFLAGS=
  17     fi
  18   fi
  19   { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
  20 --- 3463,3477 ----
  21     CFLAGS=$ac_save_CFLAGS
  22   elif test $ac_cv_prog_cc_g = yes; then
  23     if test "$GCC" = yes; then
  24 !     CFLAGS="$ADDCFLAGS -g -O2"
  25     else
  26 !     CFLAGS="$ADDCFLAGS -g"
  27     fi
  28   else
  29     if test "$GCC" = yes; then
  30 !     CFLAGS="$ADDCFLAGS -O2"
  31     else
  32 !     CFLAGS="$ADDCFLAGS"
  33     fi
  34   fi
  35   { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
  36 ***************
  37 *** 26207,26215 ****
  38
  39   { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5
  40   echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; }
  41 ! if test "${ac_cv_search_setsockopt+set}" = set; then
  42 !   echo $ECHO_N "(cached) $ECHO_C" >&6
  43 ! else
  44     ac_func_search_save_LIBS=$LIBS
  45   cat >conftest.$ac_ext <<_ACEOF
  46   /* confdefs.h.  */
  47 --- 26207,26215 ----
  48
  49   { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5
  50   echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; }
  51 ! #if test "${ac_cv_search_setsockopt+set}" = set; then
  52 ! #  echo $ECHO_N "(cached) $ECHO_C" >&6
  53 ! #else
  54     ac_func_search_save_LIBS=$LIBS
  55   cat >conftest.$ac_ext <<_ACEOF
  56   /* confdefs.h.  */
  57 ***************
  58 *** 26279,26285 ****
  59   fi
  60   rm conftest.$ac_ext
  61   LIBS=$ac_func_search_save_LIBS
  62 ! fi
  63   { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5
  64   echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; }
  65   ac_res=$ac_cv_search_setsockopt
  66 --- 26279,26285 ----
  67   fi
  68   rm conftest.$ac_ext
  69   LIBS=$ac_func_search_save_LIBS
  70 ! #fi
  71   { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5
  72   echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; }
  73   ac_res=$ac_cv_search_setsockopt
  74 *** misc/libxml2-2.6.31/ltmain.sh       Wed Aug 29 14:28:46 2007
  75 --- misc/build/libxml2-2.6.31/ltmain.sh Thu Mar 27 13:54:03 2008
  76 ***************
  77 *** 3311,3318 ****
  78           ;;
  79
  80         freebsd-elf)
  81 !         major=".$current"
  82 !         versuffix=".$current";
  83           ;;
  84
  85         irix | nonstopux)
  86 --- 3311,3318 ----
  87           ;;
  88
  89         freebsd-elf)
  90 !         major=.`expr $current - $age`
  91 !         versuffix=".$major.$age.$revision";
  92           ;;
  93
  94         irix | nonstopux)
  95 *** misc/libxml2-2.6.31/xml2-config.in  Fri Jan 11 08:22:32 2008
  96 --- misc/build/libxml2-2.6.31/xml2-config.in    Wed Apr  2 11:56:17 2008
  97 ***************
  98 *** 1,10 ****
  99   #! /bin/sh
 100
 101 ! prefix=@prefix@
 102 ! exec_prefix=@exec_prefix@
 103 ! includedir=@includedir@
 104 ! libdir=@libdir@
 105
 106   usage()
 107   {
 108       cat <<EOF
 109 --- 1,15 ----
 110   #! /bin/sh
 111
 112 ! #prefix=@prefix@
 113 ! #exec_prefix=@exec_prefix@
 114 ! #includedir=@includedir@
 115 ! #libdir=@libdir@
 116
 117 + prefix=${SOLARVERSION}/${INPATH}
 118 + exec_prefix=${SOLARVERSION}/${INPATH}
 119 + includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
 120 + libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
 121 +
 122   usage()
 123   {
 124       cat <<EOF
 125 ***************
 126 *** 67,73 ****
 127         ;;
 128
 129       --cflags)
 130 !               echo @XML_INCLUDEDIR@ @XML_CFLAGS@
 131                 ;;
 132
 133       --libtool-libs)
 134 --- 72,79 ----
 135         ;;
 136
 137       --cflags)
 138 !         echo -I${includedir}
 139 ! #             echo @XML_INCLUDEDIR@ @XML_CFLAGS@
 140                 ;;
 141
 142       --libtool-libs)
 143 ***************
 144 *** 82,100 ****
 145                 ;;
 146
 147       --libs)
 148 !         if [ "`uname`" = "Linux" ]
 149 !       then
 150 !           if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
 151 !           then
 152 !               echo @XML_LIBS@
 153 !           else
 154 !               echo @XML_LIBDIR@ @XML_LIBS@
 155 !           fi
 156 !       else
 157 !           echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
 158 !       fi
 159                 ;;
 160
 161       *)
 162         usage
 163         exit 1
 164 --- 88,111 ----
 165                 ;;
 166
 167       --libs)
 168 !         echo -L${libdir} ${LIBXML2LIB} ${ZLIB3RDLIB}   -lm
 169 ! #        if [ "`uname`" = "Linux" ]
 170 ! #     then
 171 ! #         if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
 172 ! #         then
 173 ! #             echo @XML_LIBS@
 174 ! #         else
 175 ! #             echo @XML_LIBDIR@ @XML_LIBS@
 176 ! #         fi
 177 ! #     else
 178 ! #         echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
 179 ! #     fi
 180                 ;;
 181
 182 +     print) # ugly configure hack
 183 +         exit 0
 184 +         ;;
 185 +
 186       *)
 187         usage
 188         exit 1
 189 *** misc/libxml2-2.6.31/include/win32config.h   Wed Apr 18 09:51:54 2007
 190 --- misc/build/libxml2-2.6.31/include/win32config.h     Mon Mar 31 19:09:09 2008
 191 ***************
 192 *** 92,98 ****
 193 --- 92,100 ----
 194   #if defined(_MSC_VER)
 195   #define mkdir(p,m) _mkdir(p)
 196   #define snprintf _snprintf
 197 + #if _MSC_VER < 1500
 198   #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
 199 + #endif
 200   #elif defined(__MINGW32__)
 201   #define mkdir(p,m) _mkdir(p)
 202   #endif
 203 *** misc/libxml2-2.6.31/include/wsockcompat.h   Wed Jan  3 14:07:30 2007
 204 --- misc/build/libxml2-2.6.31/include/wsockcompat.h     Thu Apr  3 10:15:50 2008
 205 ***************
 206 *** 21,26 ****
 207 --- 21,27 ----
 208
 209   /* Check if ws2tcpip.h is a recent version which provides getaddrinfo() */
 210   #if defined(GetAddrInfo)
 211 + #include <wspiapi.h>
 212   #define HAVE_GETADDRINFO
 213   #endif
 214   #endif
 215 *** misc/libxml2-2.6.31/include/libxml/xmlversion.h     Fri Jan 11 10:11:19 2008
 216 --- misc/build/libxml2-2.6.31/include/libxml/xmlversion.h       Thu Mar 27 13:54:03 2008
 217 ***************
 218 *** 264,270 ****
 219    *
 220    * Whether iconv support is available
 221    */
 222 ! #if 1
 223   #define LIBXML_ICONV_ENABLED
 224   #endif
 225
 226 --- 264,270 ----
 227    *
 228    * Whether iconv support is available
 229    */
 230 ! #if 0
 231   #define LIBXML_ICONV_ENABLED
 232   #endif
 233
 234 ***************
 235 *** 282,288 ****
 236    *
 237    * Whether Debugging module is configured in
 238    */
 239 ! #if 1
 240   #define LIBXML_DEBUG_ENABLED
 241   #endif
 242
 243 --- 282,288 ----
 244    *
 245    * Whether Debugging module is configured in
 246    */
 247 ! #if 0
 248   #define LIBXML_DEBUG_ENABLED
 249   #endif
 250
 251 ***************
 252 *** 291,297 ****
 253    *
 254    * Whether the memory debugging is configured in
 255    */
 256 ! #if 1
 257   #define DEBUG_MEMORY_LOCATION
 258   #endif
 259
 260 --- 291,297 ----
 261    *
 262    * Whether the memory debugging is configured in
 263    */
 264 ! #if 0
 265   #define DEBUG_MEMORY_LOCATION
 266   #endif
 267
 268 ***************
 269 *** 300,306 ****
 270    *
 271    * Whether the runtime debugging is configured in
 272    */
 273 ! #if 1
 274   #define LIBXML_DEBUG_RUNTIME
 275   #endif
 276
 277 --- 300,306 ----
 278    *
 279    * Whether the runtime debugging is configured in
 280    */
 281 ! #if 0
 282   #define LIBXML_DEBUG_RUNTIME
 283   #endif
 284
 285 diff -r -cN misc/libxml2-2.6.31/changelog misc/build/libxml2-2.6.31/changelog
 286 *** misc/libxml2-2.6.31/changelog
 287 --- misc/build/libxml2-2.6.31/changelog
 288 ***************
 289 *** 0 ****
 290 --- 1,10 ----
 291 + libxml2 (2.6.32.dfsg-5+lenny1) stable-security; urgency=high
 292 +
 293 +   * Non-maintainer upload by the Security Team.
 294 +   * Fix multiple use-after-free flaws when parsing notation and
 295 +     enumeration attribute types (CVE-2009-2416).
 296 +   * Fix stack overflow when parsing root XML document element DTD
 297 +     definition (CVE-2009-2414).
 298 +
 299 +  -- Nico Golde <nion@debian.org>  Thu, 06 Aug 2009 13:04:00 +0000
 300 +
 301 diff -r -cN misc/libxml2-2.6.31/parser.c misc/build/libxml2-2.6.31/parser.c
 302 *** misc/libxml2-2.6.31/parser.c
 303 --- misc/build/libxml2-2.6.31/parser.c
 304 ***************
 305 *** 4752,4761 ****
 306         if (name == NULL) {
 307             xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 308                            "Name expected in NOTATION declaration\n");
 309 !           return(ret);
 310         }
 311         cur = xmlCreateEnumeration(name);
 312 !       if (cur == NULL) return(ret);
 313         if (last == NULL) ret = last = cur;
 314         else {
 315             last->next = cur;
 316 --- 4752,4766 ----
 317         if (name == NULL) {
 318             xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
 319                            "Name expected in NOTATION declaration\n");
 320 !           xmlFreeEnumeration(ret);
 321 !           return(NULL);
 322         }
 323         cur = xmlCreateEnumeration(name);
 324 !         if (cur == NULL) {
 325 !              xmlFreeEnumeration(ret);
 326 !              return(NULL);
 327 !          }
 328 !
 329         if (last == NULL) ret = last = cur;
 330         else {
 331             last->next = cur;
 332 ***************
 333 *** 4765,4773 ****
 334       } while (RAW == '|');
 335       if (RAW != ')') {
 336         xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
 337 !       if ((last != NULL) && (last != ret))
 338 !           xmlFreeEnumeration(last);
 339 !       return(ret);
 340       }
 341       NEXT;
 342       return(ret);
 343 --- 4770,4777 ----
 344       } while (RAW == '|');
 345       if (RAW != ')') {
 346         xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
 347 !         xmlFreeEnumeration(ret);
 348 !         return(NULL);
 349       }
 350       NEXT;
 351       return(ret);
 352 ***************
 353 *** 4808,4814 ****
 354         }
 355         cur = xmlCreateEnumeration(name);
 356         xmlFree(name);
 357 !       if (cur == NULL) return(ret);
 358         if (last == NULL) ret = last = cur;
 359         else {
 360             last->next = cur;
 361 --- 4812,4822 ----
 362         }
 363         cur = xmlCreateEnumeration(name);
 364         xmlFree(name);
 365 !         if (cur == NULL) {
 366 !              xmlFreeEnumeration(ret);
 367 !              return(NULL);
 368 !          }
 369 !
 370         if (last == NULL) ret = last = cur;
 371         else {
 372             last->next = cur;
 373 ***************
 374 *** 5206,5211 ****
 375 --- 5214,5226 ----
 376       const xmlChar *elem;
 377       xmlChar type = 0;
 378
 379 +     if (ctxt->depth > 128) {
 380 +         xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
 381 +                 "xmlParseElementChildrenContentDecl : depth %d too deep\n",
 382 +                           ctxt->depth);
 383 +        return(NULL);
 384 +     }
 385 +
 386       SKIP_BLANKS;
 387       GROW;
 388       if (RAW == '(') {
 389 ***************
 390 *** 5214,5220 ****
 391 --- 5229,5237 ----
 392           /* Recurse on first child */
 393         NEXT;
 394         SKIP_BLANKS;
 395 +       ctxt->depth++;
 396           cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
 397 +       ctxt->depth--;
 398         SKIP_BLANKS;
 399         GROW;
 400       } else {
 401 ***************
 402 *** 5344,5350 ****
 403 --- 5361,5369 ----
 404             /* Recurse on second child */
 405             NEXT;
 406             SKIP_BLANKS;
 407 +           ctxt->depth++;
 408             last = xmlParseElementChildrenContentDecl(ctxt, inputid);
 409 +           ctxt->depth--;
 410             SKIP_BLANKS;
 411         } else {
 412             elem = xmlParseName(ctxt);