From kwaclaw at users.sourceforge.net  Mon Sep  3 18:34:43 2007
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 03 Sep 2007 09:34:43 -0700
Subject: [Expat-checkins] expat/lib xmlparse.c,1.161,1.162
Message-ID: <20070903163446.1723C1E4009@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs17:/tmp/cvs-serv11285

Modified Files:
	xmlparse.c 
Log Message:
Fix for issue #1785430.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- xmlparse.c	8 May 2007 02:25:35 -0000	1.161
+++ xmlparse.c	3 Sep 2007 16:34:40 -0000	1.162
@@ -3782,15 +3782,17 @@
 #endif /* XML_DTD */
       dtd->hasParamEntityRefs = XML_TRUE;
       if (startDoctypeDeclHandler) {
+        XML_Char *pubId;
         if (!XmlIsPublicId(enc, s, next, eventPP))
           return XML_ERROR_PUBLICID;
-        doctypePubid = poolStoreString(&tempPool, enc,
-                                       s + enc->minBytesPerChar,
-                                       next - enc->minBytesPerChar);
-        if (!doctypePubid)
+        pubId = poolStoreString(&tempPool, enc,
+                                s + enc->minBytesPerChar,
+                                next - enc->minBytesPerChar);
+        if (!pubId)
           return XML_ERROR_NO_MEMORY;
-        normalizePublicId((XML_Char *)doctypePubid);
+        normalizePublicId(pubId);
         poolFinish(&tempPool);
+        doctypePubid = pubId;
         handleDefault = XML_FALSE;
         goto alreadyChecked;
       }


From kwaclaw at users.sourceforge.net  Mon Sep  3 19:26:23 2007
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 03 Sep 2007 10:26:23 -0700
Subject: [Expat-checkins] expat expat.pc.in, NONE, 1.1 .cvsignore, 1.10,
	1.11 Makefile.in, 1.58, 1.59 configure.in, 1.45, 1.46
Message-ID: <20070903172625.31D9D1E4009@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs17:/tmp/cvs-serv565

Modified Files:
	.cvsignore Makefile.in configure.in 
Added Files:
	expat.pc.in 
Log Message:
Added pkg-config support - patch #1749198 by Dan Nicholson.

--- NEW FILE: expat.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: expat
Version: @PACKAGE_VERSION@
Description: expat XML parser
Libs: -L${libdir} -lexpat
Cflags: -I${includedir}

Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- .cvsignore	3 May 2007 19:54:50 -0000	1.10
+++ .cvsignore	3 Sep 2007 17:26:20 -0000	1.11
@@ -11,3 +11,4 @@
 expat.ncb
 expat.opt
 .project
+expat.pc

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Makefile.in	9 May 2007 18:38:50 -0000	1.58
+++ Makefile.in	3 Sep 2007 17:26:20 -0000	1.59
@@ -31,6 +31,7 @@
 libdir = @libdir@
 includedir = @includedir@
 man1dir = @mandir@/man1
+pkgconfigdir = $(libdir)/pkgconfig
 
 top_builddir = .
 
@@ -48,9 +49,9 @@
 
 default:  buildlib xmlwf/xmlwf
 
-buildlib: $(LIBRARY)
+buildlib: $(LIBRARY) expat.pc
 
-all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline
+all: $(LIBRARY) expat.pc xmlwf/xmlwf examples/elements examples/outline
 
 clean:
 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
@@ -65,7 +66,7 @@
 
 distclean: clean
 	rm -f expat_config.h config.status config.log config.cache libtool
-	rm -f Makefile
+	rm -f Makefile expat.pc
 
 extraclean: distclean
 	rm -f expat_config.h.in configure
@@ -80,10 +81,11 @@
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf
 	$(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
 
-installlib: $(LIBRARY) $(APIHEADER)
-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+installlib: $(LIBRARY) $(APIHEADER) expat.pc
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(pkgconfigdir)
 	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
 	for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
+	$(INSTALL_DATA) expat.pc $(DESTDIR)$(pkgconfigdir)/expat.pc
 
 uninstall: uninstalllib
 	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
@@ -93,6 +95,7 @@
 	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
 	rm -f $(DESTDIR)$(includedir)/expat.h
 	rm -f $(DESTDIR)$(includedir)/expat_external.h
+	rm -f $(DESTDIR)$(pkgconfigdir)/expat.pc
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
@@ -125,6 +128,9 @@
 $(LIBRARY): $(LIB_OBJS)
 	$(LINK_LIB) $(LIB_OBJS)
 
+expat.pc: $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
 	$(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- configure.in	9 May 2007 13:26:48 -0000	1.45
+++ configure.in	3 Sep 2007 17:26:20 -0000	1.46
@@ -144,7 +144,7 @@
 AC_DEFINE([XML_CONTEXT_BYTES], 1024,
           [Define to specify how much context to retain around the current parse point.])
 
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES([Makefile expat.pc])
 AC_OUTPUT
 
 abs_srcdir="`cd $srcdir && pwd`"