update of expat from 2.2.0 to 2.2.1 (mostly security fixes and cleanup)

Security issues fixed:
CVE-2017-9233, CVE-2016-9063, improve fix for CVE-2016-5300

fixed regression from fix to CVE-2016-0718

Cleanup: Drop AmigaOS 4.x, Borland C++ Builder, OpenVMS, Open Watcom,
Visual Studio 6.0 and Pre-X Mac OS support

4 files changed, 39 insertions, 7 deletions

diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 263c33fd65d..065f5074490 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2016/06/22 15:39:09 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2017/06/18 06:01:33 spz Exp $
 #
 
-DISTNAME=	expat-2.2.0
+DISTNAME=	expat-2.2.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index 40c073dea4f..20e576c0d40 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.26 2016/06/22 15:39:09 drochner Exp $
+$NetBSD: distinfo,v 1.27 2017/06/18 06:01:33 spz Exp $
 
-SHA1 (expat-2.2.0.tar.bz2) = 8453bc52324be4c796fd38742ec48470eef358b3
-RMD160 (expat-2.2.0.tar.bz2) = fb4ff9f78c8f09019f571758f8d559a3c640002f
-SHA512 (expat-2.2.0.tar.bz2) = 2be1a6eea87b439374bfacb1fbb8e814fd8a085d5dfd3ca3be69d1af29b5dc93d36cbdec5f6843ca6d5910843c7ffbc498adc2a561b9dcece488edf3c6f8c7c8
-Size (expat-2.2.0.tar.bz2) = 414352 bytes
+SHA1 (expat-2.2.1.tar.bz2) = f45eb724f182776a9cacec9ed70d549e87198987
+RMD160 (expat-2.2.1.tar.bz2) = 3c8e8e8c73775706d88b4938f514d85b49eac182
+SHA512 (expat-2.2.1.tar.bz2) = 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
+Size (expat-2.2.1.tar.bz2) = 405441 bytes
+SHA1 (patch-configure) = 172493bf45a5151f61db1b539d74259ef8986370
+SHA1 (patch-configure.ac) = 966e7143cf93b42eab396ae371ebbbd28bc4599c
diff --git a/textproc/expat/patches/patch-configure b/textproc/expat/patches/patch-configure
new file mode 100644
index 00000000000..6ab9a23711b
--- /dev/null
+++ b/textproc/expat/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2017/06/18 06:01:33 spz Exp $
+
+--- configure.orig	2017-06-17 18:21:24.000000000 +0000
++++ configure
+@@ -16989,8 +16989,8 @@ fi
+ 
+ if test "x${enable_xml_context}" != "xno"; then :
+ 
+-  if test "x${enable_xml_context}" == "xyes" \
+-      -o "x${enable_xml_context}" == "x"; then :
++  if test "x${enable_xml_context}" = "xyes" \
++      -o "x${enable_xml_context}" = "x"; then :
+ 
+     enable_xml_context=1024
+ 
diff --git a/textproc/expat/patches/patch-configure.ac b/textproc/expat/patches/patch-configure.ac
new file mode 100644
index 00000000000..cbf3a2868f4
--- /dev/null
+++ b/textproc/expat/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2017/06/18 06:01:33 spz Exp $
+
+--- configure.ac.orig	2017-06-17 16:07:38.000000000 +0000
++++ configure.ac
+@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context],
+     [Do not retain context around the current parse point]),
+   [enable_xml_context=${enableval}])
+ AS_IF([test "x${enable_xml_context}" != "xno"], [
+-  AS_IF([test "x${enable_xml_context}" == "xyes" \
+-      -o "x${enable_xml_context}" == "x"], [
++  AS_IF([test "x${enable_xml_context}" = "xyes" \
++      -o "x${enable_xml_context}" = "x"], [
+     enable_xml_context=1024
+   ])
+   AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}],