From 84cae1f811a57d358eddb48e680f6fbc5b03be82 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 8 Sep 2017 07:55:17 +0000 Subject: [PATCH] Updated expat to 2.2.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release 2.2.4 Sat Auguest 19 2017 Bug fixes: #115 Fix copying of partial characters for UTF-8 input Other changes: #109 Fix "make check" for non-x86 architectures that default to unsigned type char (-128..127 rather than 0..255) #109 coverage.sh: Cover -funsigned-char Autotools: Introduce --without-xmlwf argument #65 Autotools: Replace handwritten Makefile with GNU Automake #43 CMake: Auto-detect high quality entropy extractors, add new option USE_libbsd=ON to use arc4random_buf of libbsd #74 CMake: Add -fno-strict-aliasing only where supported #114 CMake: Always honor manually set BUILD_* options #114 CMake: Compile man page if docbook2x-man is available, only #117 Include file tests/xmltest.log.expected in source tarball (required for "make run-xmltest") #117 Include (existing) Visual Studio 2013 files in source tarball Improve test suite error output #111 Fix some typos in documentation Version info bumped from 7:5:6 to 7:6:6 Special thanks to: Jakub Wilk Joe Orton Lin Tian Rolf Eike Beer Release 2.2.3 Wed August 2 2017 Security fixes: #82 CVE-2017-11742 -- Windows: Fix DLL hijacking vulnerability using Steve Holme's LoadLibrary wrapper for/of cURL Bug fixes: #85 Fix a dangling pointer issue related to realloc Other changes: Increase code coverage #91 Linux: Allow getrandom to fail if nonblocking pool has not yet been initialized and read /dev/urandom then, instead. This is in line with what recent Python does. #81 Pre-10.7/Lion macOS: Support entropy from arc4random #86 Check that a UTF-16 encoding in an XML declaration has the right endianness #4 #5 #7 Recover correctly when some reallocations fail Repair "./configure && make" for systems without any provider of high quality entropy and try reading /dev/urandom on those Ensure that user-defined character encodings have converter functions when they are needed Fix mis-leading description of argument -c in xmlwf.1 Rely on macro HAVE_ARC4RANDOM_BUF (rather than __CloudABI__) for CloudABI #100 Fix use of SIPHASH_MAIN in siphash.h #23 Test suite: Fix memory leaks Version info bumped from 7:4:6 to 7:5:6 Special thanks to: Chanho Park Joe Orton Pascal Cuoq Rhodri James Simon McVittie Vadim Zeitlin Viktor Szakats and Core Infrastructure Initiative Release 2.2.2 Wed July 12 2017 Security fixes: #43 Protect against compilation without any source of high quality entropy enabled, e.g. with CMake build system; commit ff0207e6076e9828e536b8d9cd45c9c92069b895 #60 Windows with _UNICODE: Unintended use of LoadLibraryW with a non-wide string resulted in failure to load advapi32.dll and degradation in quality of used entropy when compiled with _UNICODE for Windows; you can launch existing binaries with EXPAT_ENTROPY_DEBUG=1 in the environment to inspect the quality of entropy used during runtime; commits * 95b95032f907ef1cd17ee7a9a1768010a825d61d * 73a5a2e9c081f49f2d775cf7ced864158b68dc80 [MOX-006] Fix non-NULL parser parameter validation in XML_Parse; resulted in NULL dereference, previously; commit ac256dafdffc9622ab0dc2c62fcecb0dfcfa71fe Bug fixes: #69 Fix improper use of unsigned long long integer literals Other changes: #73 Start requiring a C99 compiler #49 Fix "==" Bashism in configure script #50 Fix too eager getrandom detection for Debian GNU/kFreeBSD #52 and macOS #51 Address lack of stdint.h in Visual Studio 2003 to 2008 #58 Address compile warnings #68 Fix "./buildconf.sh && ./configure" for some versions of Dash for /bin/sh #72 CMake: Ease use of Expat in context of a parent project with multiple CMakeLists.txt files #72 CMake: Resolve mistaken executable permissions #76 Address compile warning with -DNDEBUG (not recommended!) #77 Address compile warning about macro redefinition Special thanks to: Alexander Bluhm Ben Boeckel Cătălin Răceanu Kerin Millar László Böszörményi S. P. Zeidler Segev Finer Václav Slavík Victor Stinner Viktor Szakats and Radically Open Security --- textproc/expat/Makefile | 11 ++++++----- textproc/expat/PLIST | 4 +++- textproc/expat/distinfo | 12 +++++------- textproc/expat/patches/patch-configure | 24 ----------------------- textproc/expat/patches/patch-configure.ac | 24 ----------------------- 5 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 textproc/expat/patches/patch-configure delete mode 100644 textproc/expat/patches/patch-configure.ac diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile index 065f5074490d..74bf5538ec61 100644 --- a/textproc/expat/Makefile +++ b/textproc/expat/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2017/06/18 06:01:33 spz Exp $ -# +# $NetBSD: Makefile,v 1.35 2017/09/08 07:55:17 wiz Exp $ -DISTNAME= expat-2.2.1 +DISTNAME= expat-2.2.4 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/} EXTRACT_SUFX= .tar.bz2 @@ -11,12 +10,14 @@ HOMEPAGE= http://expat.sourceforge.net/ COMMENT= XML parser library written in C LICENSE= mit -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +GNU_CONFIGURE= yes +USE_LIBTOOL= yes # C++ is needed for tests only #USE_LANGUAGES= c c++ #TEST_TARGET= check +#USE_TOOLS+= bash +#REPLACE_BASH= test-driver-wrapper.sh PKGCONFIG_OVERRIDE+= expat.pc.in diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST index 95319796bff4..688d53e9f1a7 100644 --- a/textproc/expat/PLIST +++ b/textproc/expat/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2016/03/16 19:55:55 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.11 2017/09/08 07:55:17 wiz Exp $ bin/xmlwf include/expat.h include/expat_config.h @@ -6,5 +6,7 @@ include/expat_external.h lib/libexpat.la lib/pkgconfig/expat.pc man/man1/xmlwf.1 +share/doc/expat/AUTHORS +share/doc/expat/changelog share/doc/html/expat/reference.html share/doc/html/expat/style.css diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo index 73d02079ddf6..d898df13a77d 100644 --- a/textproc/expat/distinfo +++ b/textproc/expat/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.29 2017/06/20 18:53:58 spz Exp $ +$NetBSD: distinfo,v 1.30 2017/09/08 07:55:17 wiz Exp $ -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) = 7efe7900bf6bcfa14e3bc296e2fa4b77f73266e3 -SHA1 (patch-configure.ac) = 7a50d414d756f7e73035cab5a9b581a6b1b40a8f +SHA1 (expat-2.2.4.tar.bz2) = 3394d6390c041a8f5dec1d5fe7c4af0a23ae4504 +RMD160 (expat-2.2.4.tar.bz2) = fefe2400056c494a4d2c15e07f55d8119b411a7a +SHA512 (expat-2.2.4.tar.bz2) = 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592 +Size (expat-2.2.4.tar.bz2) = 505038 bytes diff --git a/textproc/expat/patches/patch-configure b/textproc/expat/patches/patch-configure deleted file mode 100644 index a1eb5f0eba83..000000000000 --- a/textproc/expat/patches/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2017/06/20 18:31:36 spz Exp $ - ---- configure.orig 2017-06-17 18:21:24.000000000 +0000 -+++ configure -@@ -16341,7 +16341,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ - } - - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -+if ac_fn_c_try_link "$LINENO"; then : - - - $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h -@@ -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 deleted file mode 100644 index 077ac51d99e4..000000000000 --- a/textproc/expat/patches/patch-configure.ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.3 2017/06/20 18:53:58 spz Exp $ - ---- configure.ac.orig 2017-06-17 16:07:38.000000000 +0000 -+++ configure.ac -@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ - - - AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) --AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include /* for NULL */ - #include - int main() { -@@ -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}],