Module Name: src
Committed By: spz
Date: Sat May 14 14:39:39 UTC 2016
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: shl.mi
src/external/mit/expat/dist/conftools: ac_c_bigendian_cross.m4
mkinstalldirs
src/external/mit/expat/dist/lib: xmlparse.c
src/external/mit/expat/lib/libexpat: Makefile expat_config.h
shlib_version
Added Files:
src/external/mit/expat/lib/libexpat: expat.pc.in
Log Message:
merge conflicts, bump shlib version, add expat.pc
To generate a diff of this commit:
cvs rdiff -u -r1.770 -r1.771 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2034 -r1.2035 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.132 -r1.133 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 \
src/external/mit/expat/dist/conftools/mkinstalldirs
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/dist/lib/xmlparse.c
cvs rdiff -u -r1.1 -r1.2 src/external/mit/expat/lib/libexpat/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/expat/lib/libexpat/expat.pc.in
cvs rdiff -u -r1.2 -r1.3 src/external/mit/expat/lib/libexpat/expat_config.h \
src/external/mit/expat/lib/libexpat/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.770 src/distrib/sets/lists/base/shl.mi:1.771
--- src/distrib/sets/lists/base/shl.mi:1.770 Sat Apr 23 23:28:13 2016
+++ src/distrib/sets/lists/base/shl.mi Sat May 14 14:39:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.770 2016/04/23 23:28:13 christos Exp $
+# $NetBSD: shl.mi,v 1.771 2016/05/14 14:39:39 spz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -276,7 +276,7 @@
./usr/lib/libexecinfo.so.0.0 base-sys-shlib compatfile
./usr/lib/libexpat.so base-sys-shlib compatfile
./usr/lib/libexpat.so.2 base-sys-shlib compatfile
-./usr/lib/libexpat.so.2.1 base-sys-shlib compatfile
+./usr/lib/libexpat.so.2.2 base-sys-shlib compatfile
./usr/lib/libfetch.so base-sys-shlib compatfile
./usr/lib/libfetch.so.3 base-sys-shlib compatfile
./usr/lib/libfetch.so.3.0 base-sys-shlib compatfile
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2034 src/distrib/sets/lists/comp/mi:1.2035
--- src/distrib/sets/lists/comp/mi:1.2034 Fri May 6 09:30:05 2016
+++ src/distrib/sets/lists/comp/mi Sat May 14 14:39:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2034 2016/05/06 09:30:05 snj Exp $
+# $NetBSD: mi,v 1.2035 2016/05/14 14:39:39 spz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3635,6 +3635,7 @@
./usr/lib/pkgconfig/atf-c.pc comp-atf-lib atf,share
./usr/lib/pkgconfig/atf-sh.pc comp-atf-lib atf,share
./usr/lib/pkgconfig/atf.pc comp-obsolete obsolete
+./usr/lib/pkgconfig/expat.pc comp-c-lib
./usr/lib/pkgconfig/kyua-testers.pc comp-kyua-lib kyua,share
./usr/lib/pkgconfig/libcrypto.pc comp-crypto-lib crypto,share
./usr/lib/pkgconfig/libssl.pc comp-crypto-lib crypto,share
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.132 src/distrib/sets/lists/debug/shl.mi:1.133
--- src/distrib/sets/lists/debug/shl.mi:1.132 Sat Apr 23 23:28:13 2016
+++ src/distrib/sets/lists/debug/shl.mi Sat May 14 14:39:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.132 2016/04/23 23:28:13 christos Exp $
+# $NetBSD: shl.mi,v 1.133 2016/05/14 14:39:39 spz Exp $
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libc.so.12.202.debug comp-sys-debug debug,dynamicroot
@@ -90,7 +90,7 @@
./usr/libdata/debug/usr/lib/libevent_openssl.so.4.0.debug comp-sys-debug debug,compatfile,crypto
./usr/libdata/debug/usr/lib/libevent_pthreads.so.4.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libexecinfo.so.0.0.debug comp-sys-debug debug,compatfile
-./usr/libdata/debug/usr/lib/libexpat.so.2.1.debug comp-sys-debug debug,compatfile
+./usr/libdata/debug/usr/lib/libexpat.so.2.2.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libform.so.6.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug comp-sys-debug obsolete
Index: src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4
diff -u src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.3 src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.4
--- src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.3 Fri Apr 6 10:46:13 2012
+++ src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 Sat May 14 14:39:39 2016
@@ -7,7 +7,7 @@ dnl The implementation will create a bin
dnl the binary it will be grep'ed for some symbols that will look
dnl different for different endianess of the binary.
dnl
-dnl @version Id: ac_c_bigendian_cross.m4,v 1.2 2001/10/01 20:03:13 fdrake Exp
+dnl @version Id: ac_c_bigendian_cross.m4,v 1.1 2001/07/24 19:51:35 fdrake Exp
dnl @author Guido Draheim <[email protected]>
dnl
AC_DEFUN([AC_C_BIGENDIAN_CROSS],
Index: src/external/mit/expat/dist/conftools/mkinstalldirs
diff -u src/external/mit/expat/dist/conftools/mkinstalldirs:1.3 src/external/mit/expat/dist/conftools/mkinstalldirs:1.4
--- src/external/mit/expat/dist/conftools/mkinstalldirs:1.3 Fri Apr 6 10:46:13 2012
+++ src/external/mit/expat/dist/conftools/mkinstalldirs Sat May 14 14:39:39 2016
@@ -4,7 +4,7 @@
# Created: 1993-05-16
# Public domain
-# Id: mkinstalldirs,v 1.1 2000/09/18 16:26:21 coopercc Exp
+# Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp
errstatus=0
Index: src/external/mit/expat/dist/lib/xmlparse.c
diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.3 src/external/mit/expat/dist/lib/xmlparse.c:1.4
--- src/external/mit/expat/dist/lib/xmlparse.c:1.3 Fri Apr 6 10:46:13 2012
+++ src/external/mit/expat/dist/lib/xmlparse.c Sat May 14 14:39:39 2016
@@ -1550,7 +1550,7 @@ XML_Parse(XML_Parser parser, const char
else if (bufferPtr == bufferEnd) {
const char *end;
int nLeftOver;
- enum XML_Error result;
+ enum XML_Status result;
parseEndByteIndex += len;
positionPtr = s;
ps_finalBuffer = (XML_Bool)isFinal;
@@ -1678,6 +1678,10 @@ XML_ParseBuffer(XML_Parser parser, int l
void * XMLCALL
XML_GetBuffer(XML_Parser parser, int len)
{
+ if (len < 0) {
+ errorCode = XML_ERROR_NO_MEMORY;
+ return NULL;
+ }
switch (ps_parsing) {
case XML_SUSPENDED:
errorCode = XML_ERROR_SUSPENDED;
@@ -1689,8 +1693,11 @@ XML_GetBuffer(XML_Parser parser, int len
}
if (len > bufferLim - bufferEnd) {
- /* FIXME avoid integer overflow */
int neededSize = len + (int)(bufferEnd - bufferPtr);
+ if (neededSize < 0) {
+ errorCode = XML_ERROR_NO_MEMORY;
+ return NULL;
+ }
#ifdef XML_CONTEXT_BYTES
int keep = (int)(bufferPtr - buffer);
@@ -1719,7 +1726,11 @@ XML_GetBuffer(XML_Parser parser, int len
bufferSize = INIT_BUFFER_SIZE;
do {
bufferSize *= 2;
- } while (bufferSize < neededSize);
+ } while (bufferSize < neededSize && bufferSize > 0);
+ if (bufferSize <= 0) {
+ errorCode = XML_ERROR_NO_MEMORY;
+ return NULL;
+ }
newBuf = (char *)MALLOC(bufferSize);
if (newBuf == 0) {
errorCode = XML_ERROR_NO_MEMORY;
@@ -2911,6 +2922,8 @@ storeAtts(XML_Parser parser, const ENCOD
unsigned long uriHash = hash_secret_salt;
((XML_Char *)s)[-1] = 0; /* clear flag */
id = (ATTRIBUTE_ID *)lookup(parser, &dtd->attributeIds, s, 0);
+ if (!id || !id->prefix)
+ return XML_ERROR_NO_MEMORY;
b = id->prefix->binding;
if (!b)
return XML_ERROR_UNBOUND_PREFIX;
@@ -5475,6 +5488,8 @@ getAttributeId(XML_Parser parser, const
return NULL;
id->prefix = (PREFIX *)lookup(parser, &dtd->prefixes, poolStart(&dtd->pool),
sizeof(PREFIX));
+ if (!id->prefix)
+ return NULL;
if (id->prefix->name == poolStart(&dtd->pool))
poolFinish(&dtd->pool);
else
Index: src/external/mit/expat/lib/libexpat/Makefile
diff -u src/external/mit/expat/lib/libexpat/Makefile:1.1 src/external/mit/expat/lib/libexpat/Makefile:1.2
--- src/external/mit/expat/lib/libexpat/Makefile:1.1 Wed Feb 29 20:07:56 2012
+++ src/external/mit/expat/lib/libexpat/Makefile Sat May 14 14:39:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/02/29 20:07:56 tron Exp $
+# $NetBSD: Makefile,v 1.2 2016/05/14 14:39:39 spz Exp $
.include <bsd.init.mk>
@@ -16,9 +16,27 @@ COPTS.xmlparse.c= -Wno-error # macppc
COPTS.xmlrole.c= -Wno-error # macppc
COPTS.xmltok.c= -Wno-error # macppc
+FILES+= expat.pc
+FILESOWN_expat.pc= ${BINOWN}
+FILESGRP_expat.pc= ${BINGRP}
+FILESMODE_expat.pc= ${NONBINMODE}
+FILESDIR_expat.pc= /usr/lib/pkgconfig
+
+CLEANFILES+=expat.pc
+
.include <bsd.lib.mk>
gaga:
@echo MKLINT=${MKLINT}
@echo LSRCS=${LSRCS}
@echo LOBJS=${LOBJS}
+
+all: expat.pc
+dependall: all
+
+expat.pc: expat_config.h expat.pc.in
+ @(V=$$( (echo '#include <expat_config.h>'; echo PACKAGE_VERSION) | \
+ ${HOST_CC} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
+ ${TOOL_SED} -e s/@VERSION@/$$V/ < ${.CURDIR}/expat.pc.in \
+ > ${.TARGET})
+
Index: src/external/mit/expat/lib/libexpat/expat_config.h
diff -u src/external/mit/expat/lib/libexpat/expat_config.h:1.2 src/external/mit/expat/lib/libexpat/expat_config.h:1.3
--- src/external/mit/expat/lib/libexpat/expat_config.h:1.2 Fri Apr 6 10:49:27 2012
+++ src/external/mit/expat/lib/libexpat/expat_config.h Sat May 14 14:39:39 2016
@@ -63,7 +63,7 @@
#define PACKAGE_NAME "expat"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.1.0"
+#define PACKAGE_STRING "expat 2.1.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "expat"
@@ -72,7 +72,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1.0"
+#define PACKAGE_VERSION "2.1.1"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
Index: src/external/mit/expat/lib/libexpat/shlib_version
diff -u src/external/mit/expat/lib/libexpat/shlib_version:1.2 src/external/mit/expat/lib/libexpat/shlib_version:1.3
--- src/external/mit/expat/lib/libexpat/shlib_version:1.2 Fri Apr 6 10:49:27 2012
+++ src/external/mit/expat/lib/libexpat/shlib_version Sat May 14 14:39:39 2016
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.2 2012/04/06 10:49:27 spz Exp $
+# $NetBSD: shlib_version,v 1.3 2016/05/14 14:39:39 spz Exp $
#
# XXX netbsd xsrc had major=4
major=2
-minor=1
+minor=2
Added files:
Index: src/external/mit/expat/lib/libexpat/expat.pc.in
diff -u /dev/null src/external/mit/expat/lib/libexpat/expat.pc.in:1.1
--- /dev/null Sat May 14 14:39:39 2016
+++ src/external/mit/expat/lib/libexpat/expat.pc.in Sat May 14 14:39:39 2016
@@ -0,0 +1,5 @@
+Name: expat
+Version: @VERSION@
+Description: expat XML parser
+URL: http://www.libexpat.org
+Libs: -lexpat
