apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1002632 [1/5] - in /apr/apr-util/branches/1.3.x: ./ buckets/ build/ dbd/ misc/ test/ xml/expat/ xml/expat/conftools/ xml/expat/lib/ xml/expat/win32/
Date Wed, 29 Sep 2010 14:00:15 GMT
Author: jorton
Date: Wed Sep 29 14:00:14 2010
New Revision: 1002632

URL: http://svn.apache.org/viewvc?rev=1002632&view=rev
Log:
Merge r1002584, r1002585, r1002620, r1002622, r1002623, r1002628 from trunk:

* xml/expat: Merge changes from expat 1.95.2 -> 1.95.7.


* build/apu-conf.m4 (APU_FIND_EXPAT): Fix for new location of
  libexpat.la in 1.95.7 build.


* xml/expat: Ignore more.


* xml/expat/Makefile.in: Fix "make clean".


* xml/expat/lib/xmltok.c: Remove RCSid.


Backport security fixes from expat CVS:

* xml/expat/lib/xmlparse.c (doProlog): Add fix for CVE-2009-3560.

* xml/expat/lib/xmltok_impl.c (updatePosition): Add fix for
  CVE-2009-3720.

* test/testxml.c (test_CVE_2009_3720_beta, test_CVE_2009_3720_alpha):
  Add test cases for -3720.


Added:
    apr/apr-util/branches/1.3.x/xml/expat/conftools/ac_c_bigendian_cross.m4
      - copied unchanged from r1002584, apr/apr-util/branches/1.5.x/xml/expat/conftools/ac_c_bigendian_cross.m4
    apr/apr-util/branches/1.3.x/xml/expat/lib/expat.h
      - copied unchanged from r1002584, apr/apr-util/branches/1.5.x/xml/expat/lib/expat.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/internal.h
      - copied unchanged from r1002584, apr/apr-util/branches/1.5.x/xml/expat/lib/internal.h
    apr/apr-util/branches/1.3.x/xml/expat/win32/
      - copied from r1002584, apr/apr-util/branches/1.5.x/xml/expat/win32/
    apr/apr-util/branches/1.3.x/xml/expat/win32/MANIFEST.txt
      - copied unchanged from r1002584, apr/apr-util/branches/1.5.x/xml/expat/win32/MANIFEST.txt
    apr/apr-util/branches/1.3.x/xml/expat/win32/expat.iss
      - copied unchanged from r1002584, apr/apr-util/branches/1.5.x/xml/expat/win32/expat.iss
Removed:
    apr/apr-util/branches/1.3.x/xml/expat/acconfig.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/Makefile.in
    apr/apr-util/branches/1.3.x/xml/expat/lib/expat.h.in
Modified:
    apr/apr-util/branches/1.3.x/   (props changed)
    apr/apr-util/branches/1.3.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.3.x/build/apu-conf.m4
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c   (props changed)
    apr/apr-util/branches/1.3.x/misc/apr_queue.c   (props changed)
    apr/apr-util/branches/1.3.x/test/NWGNUaputest   (props changed)
    apr/apr-util/branches/1.3.x/test/testxml.c
    apr/apr-util/branches/1.3.x/xml/expat/   (props changed)
    apr/apr-util/branches/1.3.x/xml/expat/COPYING
    apr/apr-util/branches/1.3.x/xml/expat/Makefile.in
    apr/apr-util/branches/1.3.x/xml/expat/README
    apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh
    apr/apr-util/branches/1.3.x/xml/expat/configure.in
    apr/apr-util/branches/1.3.x/xml/expat/conftools/   (props changed)
    apr/apr-util/branches/1.3.x/xml/expat/lib/ascii.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/asciitab.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/iasciitab.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/latin1tab.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/utf8tab.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/winconfig.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/xmlparse.c
    apr/apr-util/branches/1.3.x/xml/expat/lib/xmlrole.c
    apr/apr-util/branches/1.3.x/xml/expat/lib/xmlrole.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/xmltok.c
    apr/apr-util/branches/1.3.x/xml/expat/lib/xmltok.h
    apr/apr-util/branches/1.3.x/xml/expat/lib/xmltok_impl.c
    apr/apr-util/branches/1.3.x/xml/expat/lib/xmltok_ns.c

Propchange: apr/apr-util/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 14:00:14 2010
@@ -1,3 +1,4 @@
 /apr/apr/trunk:781403,784592,789965,794508
 /apr/apr-util/branches/1.3.x:692751
+/apr/apr-util/branches/1.5.x:1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk:692751,731225,743986,744009,745771,747612,747623,747630,781403

Propchange: apr/apr-util/branches/1.3.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 14:00:14 2010
@@ -1,3 +1,4 @@
 /apr/apr/trunk/buckets/apr_brigade.c:768417,781403,784592,789965,794508
 /apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:692751
+/apr/apr-util/branches/1.5.x/buckets/apr_brigade.c:1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk/buckets/apr_brigade.c:692751,731225,743986,744009,745771,747612,747623,747630,781403

Modified: apr/apr-util/branches/1.3.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/apu-conf.m4?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/apu-conf.m4 Wed Sep 29 14:00:14 2010
@@ -166,7 +166,7 @@ if test "${apu_has_expat}${apu_try_built
   APR_SUBDIR_CONFIG($bundled_subdir, [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir])
   APR_ADDTO(APRUTIL_INCLUDES, [-I$top_builddir/$bundled_subdir/lib])
   APR_ADDTO(LDFLAGS, [-L$top_builddir/$bundled_subdir/lib])
-  apu_expat_libs="$top_builddir/$bundled_subdir/lib/libexpat.la"
+  apu_expat_libs="$top_builddir/$bundled_subdir/libexpat.la"
 fi
 
 APR_ADDTO(APRUTIL_EXPORT_LIBS, [$apu_expat_libs])

Propchange: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 14:00:14 2010
@@ -1,3 +1,4 @@
 /apr/apr/trunk/dbd/apr_dbd_pgsql.c:781403,784592,789965,794508
 /apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:692751
+/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c:1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612,747623,747630,781403

Propchange: apr/apr-util/branches/1.3.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 14:00:14 2010
@@ -1,4 +1,5 @@
 /apr/apr/trunk/misc/apr_queue.c:781403,784592,789965,794508
 /apr/apr/trunk/util-misc/apr_queue.c:784520
 /apr/apr-util/branches/1.3.x/misc/apr_queue.c:692751
+/apr/apr-util/branches/1.5.x/misc/apr_queue.c:1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk/misc/apr_queue.c:692751,731225,743986,744009,745771,747612,747623,747630,781403

Propchange: apr/apr-util/branches/1.3.x/test/NWGNUaputest
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 14:00:14 2010
@@ -1,3 +1,4 @@
 /apr/apr/trunk/test/nwgnuaputest:781403,784592,789965
 /apr/apr-util/branches/1.3.x/test/nwgnuaputest:692751
+/apr/apr-util/branches/1.5.x/test/NWGNUaputest:1002584-1002585,1002620,1002622-1002623,1002628
 /apr/apr-util/trunk/test/nwgnuaputest:692751,731225,743986,744009,745771,747612,747623,747630,781403

Modified: apr/apr-util/branches/1.3.x/test/testxml.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testxml.c?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/testxml.c (original)
+++ apr/apr-util/branches/1.3.x/test/testxml.c Wed Sep 29 14:00:14 2010
@@ -166,12 +166,40 @@ static void test_billion_laughs(abts_cas
     apr_file_close(fd);
 }
 
+static void test_CVE_2009_3720_alpha(abts_case *tc, void *data)
+{
+    apr_xml_parser *xp;
+    apr_xml_doc *doc;
+    apr_status_t rv;
+
+    xp = apr_xml_parser_create(p);
+    
+    rv = apr_xml_parser_feed(xp, "\0\r\n", 3);
+    if (rv == APR_SUCCESS)
+        apr_xml_parser_done(xp, &doc);
+}
+
+static void test_CVE_2009_3720_beta(abts_case *tc, void *data)
+{
+    apr_xml_parser *xp;
+    apr_xml_doc *doc;
+    apr_status_t rv;
+
+    xp = apr_xml_parser_create(p);
+    
+    rv = apr_xml_parser_feed(xp, "<?xml version\xc2\x85='1.0'?>\r\n", 25);
+    if (rv == APR_SUCCESS)
+        apr_xml_parser_done(xp, &doc);
+}
+
 abts_suite *testxml(abts_suite *suite)
 {
     suite = ADD_SUITE(suite);
 
     abts_run_test(suite, test_xml_parser, NULL);
     abts_run_test(suite, test_billion_laughs, NULL);
+    abts_run_test(suite, test_CVE_2009_3720_alpha, NULL);
+    abts_run_test(suite, test_CVE_2009_3720_beta, NULL);
 
     return suite;
 }

Propchange: apr/apr-util/branches/1.3.x/xml/expat/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 29 14:00:14 2010
@@ -7,3 +7,4 @@ config.h
 config.log
 config.status
 autom4te.cache
+expat_config.h*

Propchange: apr/apr-util/branches/1.3.x/xml/expat/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Sep 29 14:00:14 2010
@@ -0,0 +1,6 @@
+/apr/apr/trunk/xml/expat:781403,784592,789965,794508
+/apr/apr-util/branches/1.3.x/xml/expat:692751
+/apr/apr-util/branches/1.5.x/xml/expat:1002584-1002585,1002620,1002622-1002623,1002628
+/apr/apr-util/trunk/xml/expat:692751,731225,743986,744009,745771,747612,747623,747630,781403
+/apr/apr-util/vendor/expat/1.95.7:1002560-1002564
+/apr/apr-util/vendor/expat/current:1002513-1002559

Modified: apr/apr-util/branches/1.3.x/xml/expat/COPYING
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/COPYING?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/COPYING (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/COPYING Wed Sep 29 14:00:14 2010
@@ -1,5 +1,6 @@
 Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                                and Clark Cooper
+Copyright (c) 2001, 2002 Expat maintainers.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Modified: apr/apr-util/branches/1.3.x/xml/expat/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/Makefile.in?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/Makefile.in (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/Makefile.in Wed Sep 29 14:00:14 2010
@@ -17,37 +17,20 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
 #
-#  ---
-#  I started using automake, but
-#		1) it seemed like overkill
-#		2) I don't want all the GNU policies
-#		3) I wanted more explicit control over what gets built
-#
-#  So I'm doing my Makefile.in files manually. But a fair part is based
-#  on what I learned from perusing the Makefile.in's generated by automake,
-#  and the automake authors still get my kudos.
-#
 
 SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
 libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
 includedir = @includedir@
-oldincludedir = /usr/include
+mandir = ${prefix}/man/man1
 
 top_builddir = .
 
@@ -55,97 +38,76 @@ top_builddir = .
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
+MANFILE = $(srcdir)/doc/xmlwf.1
+APIHEADER = $(srcdir)/lib/expat.h
+LIBRARY = libexpat.la
 
 CC = @CC@
-
 LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-
-SUBDIRS = lib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-CONFIG_HEADERS = config.h
-
-DISTDIR = $(PACKAGE)-$(VERSION)
-DISTRIBUTION = $(DISTDIR).tar.gz
-
-all: build-subdirs
-
-.PHONY: all build-subdirs clean distclean extraclean maintainer-clean dist install \
-        uninstall distdir
-
-Makefile: Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) config.status
-
-config.status: configure
-	@if test -f $@; then \
-		$(SHELL) config.status --recheck ; \
-	else \
-		$(SHELL) configure ; \
-	fi
-
-config.h: config.h.in config.status
-	CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \
-	$(SHELL) ./config.status
-
-build-subdirs:
-	@list='$(SUBDIRS)'; \
-	for dir in $$list; do \
-	  cd $$dir; $(MAKE); cd ..; \
-	done
+
+INCLUDES = -I$(srcdir)/lib -I.
+LDFLAGS = @LDFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H
+VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
+
+### autoconf this?
+LTFLAGS = --silent
+
+COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
+LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
+LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir)
$(LDFLAGS) -o $@
+LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+
+LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
+
+all: $(LIBRARY)
 
 clean:
-	@list='$(SUBDIRS)'; for dir in $$list; do \
-	  cd $$dir; $(MAKE) clean; cd ..; \
-	done
-	rm -f core *~
-
-distclean:
-	@list='$(SUBDIRS)'; for dir in $$list; do \
-	  cd $$dir; $(MAKE) distclean; cd ..; \
-	done
-	rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile Makefile
+	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
+	rm -rf .libs libexpat.la
+
+clobber: clean
+
+distclean: clean
+	rm -f expat_config.h config.status config.log config.cache libtool
+	rm -f Makefile
 
 extraclean: distclean
-	rm -f configure aclocal.m4
+	rm -f expat_config.h.in configure
+	rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
+
+check: tests/runtests
+	tests/runtests
+
+install: installlib
+
+installlib: $(LIBRARY) $(APIHEADER)
+	$(mkinstalldirs) $(libdir) $(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
+	$(INSTALL_DATA) $(APIHEADER) $(includedir)
+
+$(LIBRARY): $(LIB_OBJS)
+	$(LINK_LIB) $(LIB_OBJS)
+
+lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
+	$(top_builddir)/expat_config.h lib/internal.h
+
+lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \
+	lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \
+	lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \
+	$(top_builddir)/expat_config.h
+
+.SUFFIXES: .c .lo .o
 
-maintainer-clean: distclean
-	rm -f $(DISTRIBUTION)
-	rm -rf $(DISTDIR)
-
-distdir: MANIFEST
-	test -d $(DISTDIR) && rm -rf $(DISTDIR); \
-	mkdir $(DISTDIR); \
-	flist=`sed -e "s/[ 	]:.*$$//" MANIFEST`; for file in $$flist; do \
-	  cp -P $$file $(DISTDIR); \
-	done
-
-$(DISTRIBUTION): distdir
-	tar cfz $(DISTRIBUTION) $(DISTDIR)	
-
-dist: $(DISTRIBUTION)
-
-install:
-	@list='$(SUBDIRS)'; for dir in $$list; do \
-	  cd $$dir; $(MAKE) install; cd ..; \
-	done
-
-uninstall:
-	@list='$(SUBDIRS)'; for dir in $$list; do \
-	  cd $$dir; $(MAKE) uninstall; cd ..; \
-	done
+.c.o:
+	$(COMPILE) -o $@ -c $<
+.c.lo:
+	$(LTCOMPILE) -o $@ -c $<
 
-depend:
-	echo SOMEONE SHOULD MAKE THIS DO SOMETHING!!!
+.PHONY: buildlib all \
+	clean distclean extraclean maintainer-clean \
+	dist distdir \
+	install uninstall

Modified: apr/apr-util/branches/1.3.x/xml/expat/README
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/README?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/README (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/README Wed Sep 29 14:00:14 2010
@@ -1,7 +1,7 @@
 
-			Expat, Release 1.95.2
+                        Expat, Release 1.95.7
 
-This is expat, a C library for parsing XML, written by James Clark.
+This is Expat, a C library for parsing XML, written by James Clark.
 Expat is a stream-oriented XML parser.  This means that you register
 handlers with the parser before starting the parse.  These handlers
 are called when the parser discovers the associated structures in the
@@ -17,15 +17,26 @@ the terms of the License contained in th
 with this package.  This license is the same as the MIT/X Consortium
 license.
 
-Versions of expat that have an odd minor version (the middle number in
+Versions of Expat that have an odd minor version (the middle number in
 the release above), are development releases and should be considered
 as beta software.  Releases with even minor version numbers are
 intended to be production grade software.
 
-To build expat, you first run the configuration shell script in the
-top level distribution directory:
+If you are building Expat from a check-out from the CVS repository,
+you need to run a script that generates the configure script using the
+GNU autoconf and libtool tools.  To do this, you need to have
+autoconf 2.52 or newer and libtool 1.4 or newer.  Run the script like
+this:
 
-	./configure
+        ./buildconf.sh
+
+Once this has been done, follow the same instructions as for building
+from a source distribution.
+
+To build Expat from a source distribution, you first run the
+configuration shell script in the top level distribution directory:
+
+        ./configure
 
 There are many options which you may provide to configure (which you
 can discover by running configure with the --help option).  But the
@@ -36,19 +47,41 @@ xmlwf into /usr/local/bin.  If, for exam
 into /home/me/mystuff/lib, /home/me/mystuff/include, and
 /home/me/mystuff/bin, you can tell configure about that with:
 
-	./configure --prefix=/home/me/mystuff
+        ./configure --prefix=/home/me/mystuff
 
 After running the configure script, the "make" command will build
 things and "make install" will install things into their proper
 location.  Note that you need to have write permission into the
 directories into which things will be installed.
 
-When building for use with C++, you may need to add additional
-compiler flags to support proper interaction with exceptions.  This
-can be done by setting the CFLAGS environment variable.  For example,
-when using GCC, you can use:
+If you are interested in building Expat to provide document
+information in UTF-16 rather than the default UTF-8, following these
+instructions:
+
+        1. For UTF-16 output as unsigned short (and version/error
+           strings as char), run:
+
+               ./configure CPPFLAGS=-DXML_UNICODE
+
+           For UTF-16 output as wchar_t (incl. version/error strings),
+           run:
+
+               ./configure CFLAGS="-g -O2 -fshort-wchar" \
+                           CPPFLAGS=-DXML_UNICODE_WCHAR_T
+
+        2. Edit the MakeFile, changing:
 
-	CFLAGS=-fexceptions ./configure
+               LIBRARY = libexpat.la
+
+           to:
+
+               LIBRARY = libexpatw.la
+
+           (Note the additional "w" in the library name.)
+
+        3. Run "make buildlib" (which builds the library only).
+
+        4. Run "make installlib" (which installs the library only).
 
 Note for Solaris users:  The "ar" command is usually located in
 "/usr/ccs/bin", which is not in the default PATH.  You will need to
@@ -57,16 +90,30 @@ to GNU make (the "make" found in /usr/cc
 properly -- appearantly it does not understand .PHONY directives).  If
 you're using ksh or bash, use this command to build:
 
-	PATH=/usr/ccs/bin:$PATH make
+        PATH=/usr/ccs/bin:$PATH make
+
+The unit and regression tests for Expat require the "check" library on
+Unix; more information is available at http://check.sourceforge.net/,
+and downloadable packages are available from the library's project
+page on SourceForge: http://sourceforge.net/projects/check/.  You do
+not need to install the check library to build and use Expat, only to
+build and run Expat's test suite.
+
+When using Expat with a project using autoconf for configuration, you
+can use the probing macro in conftools/expat.m4 to determine how to
+include Expat.  See the comments at the top of that file for more
+information.
 
 A reference manual is available in the file doc/reference.html in this
 distribution.
 
-The homepage for this project is http://expat.sourceforge.net/.  There
+The homepage for this project is http://www.libexpat.org/.  There
 are links there to connect you to the bug reports page.  If you need
 to report a bug when you don't have access to a browser, you may also
-send a bug report by email to expat-bugs@lists.sourceforge.net.
+send a bug report by email to expat-bugs@mail.libexpat.org.
 
 Discussion related to the direction of future expat development takes
-place on expat-discuss@lists.sourceforge.net.  Archives of this list
-may be found at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss.
+place on expat-discuss@mail.libexpat.org.  Archives of this list and
+other Expat-related lists may be found at:
+
+        http://mail.libexpat.org/mailman-21/listinfo/

Modified: apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/buildconf.sh Wed Sep 29 14:00:14 2010
@@ -25,7 +25,7 @@ echo "Copying libtool helper files ..."
 (cd conftools ; rm -f ltconfig ltmain.sh)
 rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
 
-$libtoolize --copy --automake
+$libtoolize --copy --automake --force
 
 #
 # find libtool.m4
@@ -48,11 +48,11 @@ fi
 echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
 echo "dnl edits here will be lost" >> aclocal.m4
 
-for m4file in libtool.m4 ltsugar.m4 ltoptions.m4 ltversion.m4 lt~obsolete.m4
+for m4file in lt~obsolete.m4 ltversion.m4 ltoptions.m4 argz.m4 ltsugar.m4 libtool.m4
 do
-  if [ -f $m4file ]; then
-    echo "Incorporating $m4file into aclocal.m4 ..."
-    cat $m4file >> aclocal.m4
+  if [ -f conftools/$m4file ]; then
+    echo "Incorporating conftools/$m4file into aclocal.m4 ..."
+    cat conftools/$m4file >> aclocal.m4
     rm -f $m4file
   fi
 done

Modified: apr/apr-util/branches/1.3.x/xml/expat/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/configure.in?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/configure.in (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/configure.in Wed Sep 29 14:00:14 2010
@@ -10,24 +10,16 @@ dnl   under the terms of the License (ba
 dnl   in the file COPYING that comes with this distribution.
 dnl
 
-AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(conftools)
-AC_CONFIG_MACRO_DIR(.)
+dnl Ensure that Expat is configured with autoconf 2.52 or newer
+AC_PREREQ(2.52)
 
-dnl
-dnl Follow the GNU/Linux convention of odd number minor version for
-dnl beta/development releases and even number minor version for stable
-dnl releases. Edit is bumped with each release and set to 0 with
-dnl change to major or minor version.
-dnl
 
-EXPAT_MAJOR_VERSION=1
-EXPAT_MINOR_VERSION=95
-EXPAT_EDIT=2
-
-EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT
-VERSION=$EXPAT_VERSION
-PACKAGE=expat
+dnl ### apr-util hack: just hard-code the version here, as is done in expat.h.
+AC_INIT(expat, 1.95.7, expat-bugs@mail.libexpat.org)
+
+AC_CONFIG_SRCDIR(Makefile.in)
+AC_CONFIG_AUX_DIR(conftools)
+AC_CONFIG_MACRO_DIR(conftools)
 
 dnl
 dnl Increment LIBREVISION if source code has changed at all
@@ -40,13 +32,16 @@ dnl 
 dnl If the API changes incompatibly set LIBAGE back to 0
 dnl
 
-LIBCURRENT=1
+LIBCURRENT=5
 LIBREVISION=0
-LIBAGE=1
+LIBAGE=5
+
+AC_CONFIG_HEADER(expat_config.h)
 
-AC_CONFIG_HEADER(config.h)
+sinclude(conftools/ac_c_bigendian_cross.m4)
 
 AC_CANONICAL_SYSTEM
+
 case "$host_os" in
 *os2*)
     # Use a custom made libtool replacement
@@ -54,20 +49,11 @@ case "$host_os" in
     LIBTOOL="$srcdir/../../../apr/build/aplibtool"
     ;;
 *)
-    AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
     ;;
 esac
 
-blddir=`pwd`
-AC_SUBST(blddir)
-
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_SUBST(EXPAT_MAJOR_VERSION)
-AC_SUBST(EXPAT_MINOR_VERSION)
-AC_SUBST(EXPAT_EDIT)
-
 AC_SUBST(LIBCURRENT)
 AC_SUBST(LIBREVISION)
 AC_SUBST(LIBAGE)
@@ -76,11 +62,8 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 
-dnl Checks for libraries.
-
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h string.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl check for endianness
@@ -91,20 +74,26 @@ else
                 [byte order is unknown due to cross-compilation])
 fi
 AC_C_CONST
-AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
+AC_CHECK_FUNCS(memmove bcopy)
 
-dnl Checks for library functions.
+dnl Only needed for regression tests:
+AC_CHECK_HEADERS(check.h)
 
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
-AC_SUBST(FILEMAP_OBJ)
-if test -z "$HAVE_MMAP"; then
-FILEMAP_OBJ=unixfilemap.o
-else
-FILEMAP_OBJ=readfilemap.o
+dnl Some basic configuration:
+AC_DEFINE([XML_NS], 1,
+          [Define to make XML Namespaces functionality available.])
+AC_DEFINE([XML_DTD], 1,
+          [Define to make parameter entity parsing functionality available.])
+AC_DEFINE([XML_CONTEXT_BYTES], 1024,
+          [Define to specify how much context to retain around the current parse point.])
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
+
+abs_srcdir="`cd $srcdir && pwd`"
+abs_builddir="`pwd`"
+if test "$abs_srcdir" != "$abs_builddir"; then
+  mkdir lib
 fi
 
-AC_CHECK_FUNCS(memmove bcopy)
-
-AC_OUTPUT(Makefile lib/Makefile lib/expat.h)

Propchange: apr/apr-util/branches/1.3.x/xml/expat/conftools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 29 14:00:14 2010
@@ -1,3 +1,5 @@
 ltconfig
 ltmain.sh
 ltcf-c.sh
+lt*.m4
+libtool.m4

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/ascii.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/ascii.h?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/ascii.h (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/ascii.h Wed Sep 29 14:00:14 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
 */
 
 #define ASCII_A 0x41
@@ -69,7 +68,7 @@ See the file COPYING for copying permiss
 #define ASCII_9 0x39
 
 #define ASCII_TAB 0x09
-#define ASCII_SPACE 0x20 
+#define ASCII_SPACE 0x20
 #define ASCII_EXCL 0x21
 #define ASCII_QUOT 0x22
 #define ASCII_AMP 0x26

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/asciitab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/asciitab.h?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/asciitab.h (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/asciitab.h Wed Sep 29 14:00:14 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
 */
 
 /* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/iasciitab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/iasciitab.h?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/iasciitab.h (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/iasciitab.h Wed Sep 29 14:00:14 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
 */
 
 /* Like asciitab.h, except that 0xD has code BT_S rather than BT_CR */

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/latin1tab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/latin1tab.h?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/latin1tab.h (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/latin1tab.h Wed Sep 29 14:00:14 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
 */
 
 /* 0x80 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/utf8tab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/utf8tab.h?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/utf8tab.h (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/utf8tab.h Wed Sep 29 14:00:14 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
 */
 
 

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/winconfig.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/winconfig.h?rev=1002632&r1=1002631&r2=1002632&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/winconfig.h (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/winconfig.h Wed Sep 29 14:00:14 2010
@@ -5,8 +5,6 @@
 ** This is free software. You are permitted to copy, distribute, or modify
 ** it under the terms of the MIT/X license (contained in the COPYING file
 ** with this distribution.)
-**
-**
 */
 
 #ifndef WINCONFIG_H
@@ -21,7 +19,12 @@
 
 #define XML_NS 1
 #define XML_DTD 1
-#define XML_BYTE_ORDER 12
 #define XML_CONTEXT_BYTES 1024
 
+/* we will assume all Windows platforms are little endian */
+#define BYTEORDER 1234
+
+/* Windows has memmove() available. */
+#define HAVE_MEMMOVE
+
 #endif /* ndef WINCONFIG_H */



Mime
View raw message