CVS commit: [pkgsrc-2017Q1] pkgsrc/textproc/expat

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Jun 21 18:36:19 UTC 2017

Modified Files:
        pkgsrc/textproc/expat [pkgsrc-2017Q1]: Makefile distinfo
Added Files:
        pkgsrc/textproc/expat/patches [pkgsrc-2017Q1]: patch-configure
            patch-configure.ac

Log Message:
Pullup ticket #5486 - requested by sevan
textproc/expat: security fix

Revisions pulled up:
- textproc/expat/Makefile                                       1.34
- textproc/expat/distinfo                                       1.27
- textproc/expat/patches/patch-configure                        1.1
- textproc/expat/patches/patch-configure.ac                     1.1

---
   Module Name:    pkgsrc
   Committed By:   spz
   Date:           Sun Jun 18 06:01:33 UTC 2017

   Modified Files:
           pkgsrc/textproc/expat: Makefile distinfo
   Added Files:
           pkgsrc/textproc/expat/patches: patch-configure patch-configure.ac

   Log Message:
   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


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.8.1 pkgsrc/textproc/expat/Makefile
cvs rdiff -u -r1.26 -r1.26.8.1 pkgsrc/textproc/expat/distinfo
cvs rdiff -u -r0 -r1.2.2.2 pkgsrc/textproc/expat/patches/patch-configure
cvs rdiff -u -r0 -r1.3.2.2 pkgsrc/textproc/expat/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/expat/Makefile
diff -u pkgsrc/textproc/expat/Makefile:1.33 pkgsrc/textproc/expat/Makefile:1.33.8.1
--- pkgsrc/textproc/expat/Makefile:1.33 Wed Jun 22 15:39:09 2016
+++ pkgsrc/textproc/expat/Makefile      Wed Jun 21 18:36:19 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2016/06/22 15:39:09 drochner Exp $
+# $NetBSD: Makefile,v 1.33.8.1 2017/06/21 18:36:19 bsiegert Exp $
 #
 
-DISTNAME=      expat-2.2.0
+DISTNAME=      expat-2.2.1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=expat/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/textproc/expat/distinfo
diff -u pkgsrc/textproc/expat/distinfo:1.26 pkgsrc/textproc/expat/distinfo:1.26.8.1
--- pkgsrc/textproc/expat/distinfo:1.26 Wed Jun 22 15:39:09 2016
+++ pkgsrc/textproc/expat/distinfo      Wed Jun 21 18:36:19 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.26 2016/06/22 15:39:09 drochner Exp $
+$NetBSD: distinfo,v 1.26.8.1 2017/06/21 18:36:19 bsiegert 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

Added files:

Index: pkgsrc/textproc/expat/patches/patch-configure
diff -u /dev/null pkgsrc/textproc/expat/patches/patch-configure:1.2.2.2
--- /dev/null   Wed Jun 21 18:36:19 2017
+++ pkgsrc/textproc/expat/patches/patch-configure       Wed Jun 21 18:36:19 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.2.2.2 2017/06/21 18:36:19 bsiegert 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
+ 

Index: pkgsrc/textproc/expat/patches/patch-configure.ac
diff -u /dev/null pkgsrc/textproc/expat/patches/patch-configure.ac:1.3.2.2
--- /dev/null   Wed Jun 21 18:36:19 2017
+++ pkgsrc/textproc/expat/patches/patch-configure.ac    Wed Jun 21 18:36:19 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.3.2.2 2017/06/21 18:36:19 bsiegert 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}],