Update to 2.1.1

Changelog:
Release 2.1.1 Sat March 12 2016
        Security fixes:
            #582: CVE-2015-1283 - Multiple integer overflows in XML_GetBuffer

        Bug fixes:
            #502: Fix potential null pointer dereference
            #520: Symbol XML_SetHashSalt was not exported
            Output of "xmlwf -h" was incomplete

        Other changes
            #503: Document behavior of calling XML_SetHashSalt with salt 0
            Minor improvements to man page xmlwf(1)
            Improvements to the experimental CMake build system
            libtool now invoked with --verbose

5 files changed, 13 insertions, 91 deletions

diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index e0dbb1c1e42..2e37259bf10 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2016/01/01 01:29:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2016/03/16 19:55:55 ryoon Exp $
 #
 
-DISTNAME=	expat-2.1.0
-PKGREVISION=	2
+DISTNAME=	expat-2.1.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://expat.sourceforge.net/
diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST
index 42d13107e9c..95319796bff 100644
--- a/textproc/expat/PLIST
+++ b/textproc/expat/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2012/04/01 08:52:43 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/03/16 19:55:55 ryoon Exp $
 bin/xmlwf
 include/expat.h
+include/expat_config.h
 include/expat_external.h
 lib/libexpat.la
 lib/pkgconfig/expat.pc
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index 1630d31c3da..fe24c19936e 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2016/03/16 19:55:55 ryoon Exp $
 
 BUILDLINK_TREE+=	expat
 
 .if !defined(EXPAT_BUILDLINK3_MK)
 EXPAT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.7
-BUILDLINK_ABI_DEPENDS.expat+=	expat>=2.0.0nb1
+BUILDLINK_API_DEPENDS.expat+=	expat>=2.1.1
+BUILDLINK_ABI_DEPENDS.expat+=	expat>=2.1.1
 BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
 .endif # EXPAT_BUILDLINK3_MK
 
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index 020955e6577..52c126f8868 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.23 2016/01/01 01:29:30 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2016/03/16 19:55:55 ryoon Exp $
 
-SHA1 (expat-2.1.0.tar.gz) = b08197d146930a5543a7b99e871cba3da614f6f0
-RMD160 (expat-2.1.0.tar.gz) = bffca083d29fe7688f106a902ef9b909c3321c5d
-SHA512 (expat-2.1.0.tar.gz) = 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d
-Size (expat-2.1.0.tar.gz) = 562616 bytes
+SHA1 (expat-2.1.1.tar.bz2) = ff91419882ac52151050dad0ee8190645fbeee08
+RMD160 (expat-2.1.1.tar.bz2) = a1741237726c0b48d7a3f03943c76826ee6f3e48
+SHA512 (expat-2.1.1.tar.bz2) = 088e2ef3434f2affd4fc79fe46f0e9826b9b4c3931ddc780cd18892f1cd1e11365169c6807f45916a56bb6abcc627dcd17a23f970be0bf464f048f5be2713628
+Size (expat-2.1.1.tar.bz2) = 405103 bytes
 SHA1 (patch-Makefile.in) = 196837e69acda50ce813c198b730a9ba18015196
-SHA1 (patch-xmlparse.c) = e6e3697102b2f86d4a0824b1f6498e0ec435b9e4
diff --git a/textproc/expat/patches/patch-xmlparse.c b/textproc/expat/patches/patch-xmlparse.c
deleted file mode 100644
index b89c9d7ccf2..00000000000
--- a/textproc/expat/patches/patch-xmlparse.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-xmlparse.c,v 1.1 2015/08/04 08:47:19 tnn Exp $
-
-CVE-2015-1283 heap based buffer overflow in expat.
-
-https://hg.mozilla.org/releases/mozilla-esr31/raw-diff/2f3e78643f5c/parser/expat/lib/xmlparse.c
-
-diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
---- lib/xmlparse.c
-+++ lib/xmlparse.c
-@@ -1646,29 +1646,40 @@ XML_ParseBuffer(XML_Parser parser, int l
-   XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
-   positionPtr = bufferPtr;
-   return result;
- }
- 
- void * XMLCALL
- XML_GetBuffer(XML_Parser parser, int len)
- {
-+/* BEGIN MOZILLA CHANGE (sanity check len) */
-+  if (len < 0) {
-+    errorCode = XML_ERROR_NO_MEMORY;
-+    return NULL;
-+  }
-+/* END MOZILLA CHANGE */
-   switch (ps_parsing) {
-   case XML_SUSPENDED:
-     errorCode = XML_ERROR_SUSPENDED;
-     return NULL;
-   case XML_FINISHED:
-     errorCode = XML_ERROR_FINISHED;
-     return NULL;
-   default: ;
-   }
- 
-   if (len > bufferLim - bufferEnd) {
--    /* FIXME avoid integer overflow */
-     int neededSize = len + (int)(bufferEnd - bufferPtr);
-+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
-+    if (neededSize < 0) {
-+      errorCode = XML_ERROR_NO_MEMORY;
-+      return NULL;
-+    }
-+/* END MOZILLA CHANGE */
- #ifdef XML_CONTEXT_BYTES
-     int keep = (int)(bufferPtr - buffer);
- 
-     if (keep > XML_CONTEXT_BYTES)
-       keep = XML_CONTEXT_BYTES;
-     neededSize += keep;
- #endif  /* defined XML_CONTEXT_BYTES */
-     if (neededSize  <= bufferLim - buffer) {
-@@ -1687,17 +1698,25 @@ XML_GetBuffer(XML_Parser parser, int len
-     }
-     else {
-       char *newBuf;
-       int bufferSize = (int)(bufferLim - bufferPtr);
-       if (bufferSize == 0)
-         bufferSize = INIT_BUFFER_SIZE;
-       do {
-         bufferSize *= 2;
--      } while (bufferSize < neededSize);
-+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
-+      } while (bufferSize < neededSize && bufferSize > 0);
-+/* END MOZILLA CHANGE */
-+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
-+      if (bufferSize <= 0) {
-+        errorCode = XML_ERROR_NO_MEMORY;
-+        return NULL;
-+      }
-+/* END MOZILLA CHANGE */
-       newBuf = (char *)MALLOC(bufferSize);
-       if (newBuf == 0) {
-         errorCode = XML_ERROR_NO_MEMORY;
-         return NULL;
-       }
-       bufferLim = newBuf + bufferSize;
- #ifdef XML_CONTEXT_BYTES
-       if (bufferPtr) {