diffstat for libxml2-2.8.0+dfsg1 libxml2-2.8.0+dfsg1 changelog | 6 ++ libxml2.symbols | 1 patches/boss.patch | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 4 files changed, 142 insertions(+) diff -Nru libxml2-2.8.0+dfsg1/debian/changelog libxml2-2.8.0+dfsg1/debian/changelog --- libxml2-2.8.0+dfsg1/debian/changelog 2013-03-06 20:29:53.000000000 +0000 +++ libxml2-2.8.0+dfsg1/debian/changelog 2013-08-13 05:23:15.000000000 +0000 @@ -1,3 +1,9 @@ +libxml2 (2.8.0+dfsg1-7+nmu1boss1) stable; urgency=high + + * Patch added for LSB complaint. (https://git.gnome.org/browse/libxml2/commit/?id=63588f476f2dc89d4c6ef70a474d7230fbf4d45e) + + -- Prema S Tue, 13 Aug 2013 10:24:06 +0530 + libxml2 (2.8.0+dfsg1-7+nmu1) unstable; urgency=high * Non-maintainer upload by the Security Team. diff -Nru libxml2-2.8.0+dfsg1/debian/libxml2.symbols libxml2-2.8.0+dfsg1/debian/libxml2.symbols --- libxml2-2.8.0+dfsg1/debian/libxml2.symbols 2013-03-06 20:29:53.000000000 +0000 +++ libxml2-2.8.0+dfsg1/debian/libxml2.symbols 2013-08-13 05:43:48.000000000 +0000 @@ -42,6 +42,7 @@ __htmlDefaultSAXHandler@Base 2.6.27 __htmlParseContent@Base 2.6.27 __libxml2_xzclose@Base 2.8.0 + __libxml2_xzcompressed@Base 2.8.0+dfsg1-7+nmu1boss1 __libxml2_xzdopen@Base 2.8.0 __libxml2_xzopen@Base 2.8.0 __libxml2_xzread@Base 2.8.0 diff -Nru libxml2-2.8.0+dfsg1/debian/patches/boss.patch libxml2-2.8.0+dfsg1/debian/patches/boss.patch --- libxml2-2.8.0+dfsg1/debian/patches/boss.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxml2-2.8.0+dfsg1/debian/patches/boss.patch 2013-08-13 05:24:05.000000000 +0000 @@ -0,0 +1,134 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + libxml2 (2.8.0+dfsg1-7+nmu1boss1) stable; urgency=high + . + * Patch added for LSB complaint. (https://git.gnome.org/browse/libxml2/commit/?id=63588f476f2dc89d4c6ef70a474d7230fbf4d45e) +Author: Prema S + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- libxml2-2.8.0+dfsg1.orig/xzlib.c ++++ libxml2-2.8.0+dfsg1/xzlib.c +@@ -182,12 +182,45 @@ xz_open(const char *path, int fd, const + return (xzFile) state; + } + ++//Patch added for LSB ++ ++ ++static int ++xz_compressed(xzFile f) { ++ xz_statep state; ++ ++ if (f == NULL) ++ return(-1); ++ state = (xz_statep) f; ++ if (state->init <= 0) ++ return(-1); ++ ++ switch (state->how) { ++ case COPY: ++ return(0); ++ case GZIP: ++ case LZMA: ++ return(1); ++ } ++ return(-1); ++} ++ ++ + xzFile + __libxml2_xzopen(const char *path, const char *mode) + { + return xz_open(path, -1, mode); + } + ++ ++//Patch added for lsb ++int ++__libxml2_xzcompressed(xzFile f) { ++ return xz_compressed(f); ++} ++ ++ ++ + xzFile + __libxml2_xzdopen(int fd, const char *mode) + { +--- libxml2-2.8.0+dfsg1.orig/parser.c ++++ libxml2-2.8.0+dfsg1/parser.c +@@ -10348,7 +10348,13 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) + } + if ((ctxt->sax) && (ctxt->sax->startDocument) && (!ctxt->disableSAX)) + ctxt->sax->startDocument(ctxt->userData); +- ++// Patch added for LSB ++ if (ctxt->instate == XML_PARSER_EOF) ++ return(-1); ++ if ((ctxt->myDoc != NULL) && (ctxt->input != NULL) && ++ (ctxt->input->buf != NULL) && (ctxt->input->buf->compressed >= 0)) { ++ ctxt->myDoc->compression = ctxt->input->buf->compressed; ++ } + /* + * The Misc part of the Prolog + */ +--- libxml2-2.8.0+dfsg1.orig/xmlIO.c ++++ libxml2-2.8.0+dfsg1/xmlIO.c +@@ -2661,6 +2661,14 @@ __xmlParserInputBufferCreateFilename(con + #endif + } + #endif ++ ++//Patch added for LSB ++#ifdef HAVE_LZMA_H ++ if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) && ++ (strcmp(URI, "-") != 0)) { ++ ret->compressed = __libxml2_xzcompressed(context); ++ } ++#endif + } + else + xmlInputCallbackTable[i].closecallback (context); +@@ -3290,6 +3298,18 @@ xmlParserInputBufferGrow(xmlParserInputB + if (res < 0) { + return(-1); + } ++ ++//Patch added for LSB ++/* ++ * try to establish compressed status of input if not done already ++ */ ++ if (in->compressed == -1) { ++#ifdef HAVE_LZMA_H ++ if (in->readcallback == xmlXzfileRead) ++ in->compressed = __libxml2_xzcompressed(in->context); ++#endif ++ } ++ + len = res; + if (in->encoder != NULL) { + unsigned int use; +--- libxml2-2.8.0+dfsg1.orig/xzlib.h ++++ libxml2-2.8.0+dfsg1/xzlib.h +@@ -15,4 +15,5 @@ xzFile __libxml2_xzopen(const char *path + xzFile __libxml2_xzdopen(int fd, const char *mode); + int __libxml2_xzread(xzFile file, void *buf, unsigned len); + int __libxml2_xzclose(xzFile file); ++int __libxml2_xzcompressed(xzFile f); + #endif /* LIBXML2_XZLIB_H */ diff -Nru libxml2-2.8.0+dfsg1/debian/patches/series libxml2-2.8.0+dfsg1/debian/patches/series --- libxml2-2.8.0+dfsg1/debian/patches/series 2013-03-06 20:29:53.000000000 +0000 +++ libxml2-2.8.0+dfsg1/debian/patches/series 2013-08-13 05:24:03.000000000 +0000 @@ -5,3 +5,4 @@ 0005-Fix-a-failure-to-report-xmlreader-parsing-failures.patch 0006-Fix-potential-out-of-bound-access.patch cve-2013-0338-0339.patch +boss.patch