Hello community,
here is the log from the commit of package libapr-util1 for openSUSE:Factory
checked in at Thu Jul 9 10:06:37 CEST 2009.
--------
--- libapr-util1/libapr-util1.changes 2009-06-08 14:11:29.000000000 +0200
+++ libapr-util1/libapr-util1.changes 2009-07-08 12:26:01.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Jul 8 12:19:40 CEST 2009 - poeml@suse.de
+
+- update to 1.3.8:
+ *) Use locally scoped variables in PostgreSQL driver to avoid stomping
+ on return codes. PR 47431
+ *) Fix race conditions in initialisation of DBD, DBM and DSO.
+ *) Expose DBM libs in apu-1-config by default. To avoid that, use
+ apu-1-config --avoid-dbm --libs. To get just DBM libs, use
+ apu-1-config --dbm-libs.
+ *) Make sure --without-ldap works.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
apr-util-1.3.7.tar.bz2
New:
----
apr-util-1.3.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libapr-util1.spec ++++++
--- /var/tmp/diff_new_pack.DPYWuY/_old 2009-07-09 10:05:34.000000000 +0200
+++ /var/tmp/diff_new_pack.DPYWuY/_new 2009-07-09 10:05:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libapr-util1 (Version 1.3.7)
+# spec file for package libapr-util1 (Version 1.3.8)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -83,10 +83,10 @@
%endif
#
Url: http://apr.apache.org/
-License: Other uncritical OpenSource License; The Apache Software License
+License: Other uncritical OpenSource License ; Apache Software License ..
Group: Development/Libraries/Other
AutoReqProv: on
-Version: 1.3.7
+Version: 1.3.8
Release: 1
Summary: Apache Portable Runtime (APR) Library
Source: http://www.apache.org/dist/apr/apr-util-%{version}.tar.bz2
@@ -114,7 +114,7 @@
Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
%package devel
-License: Other uncritical OpenSource License; The Apache Software License
+License: Other uncritical OpenSource License ; Apache Software License ..
Summary: Apache Portable Runtime (APR) Library
Group: Development/Libraries/Other
Requires: libapr-util1 = %{version}
@@ -160,7 +160,7 @@
Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
%package dbd-pgsql
-License: Other uncritical OpenSource License; The Apache Software License
+License: Other uncritical OpenSource License ; Apache Software License ..
Summary: DBD driver for PostgreSQL
Group: Development/Libraries/Other
Requires: %{name} = %{version}
@@ -175,7 +175,7 @@
Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
%package dbd-sqlite2
-License: Other uncritical OpenSource License; The Apache Software License
+License: Other uncritical OpenSource License ; Apache Software License ..
Summary: DBD driver for SQLite 2
Group: Development/Libraries/Other
Requires: %{name} = %{version}
@@ -190,7 +190,7 @@
Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
%package dbd-sqlite3
-License: Other uncritical OpenSource License; The Apache Software License
+License: Other uncritical OpenSource License ; Apache Software License ..
Summary: DBD driver for SQLite 3
Group: Development/Libraries/Other
Requires: %{name} = %{version}
@@ -306,351 +306,3 @@
%exclude %{_libdir}/*.la
%changelog
-* Mon Jun 08 2009 poeml@suse.de
-- update to 1.3.7
- *) SECURITY:
- Fix a denial of service attack against the apr_xml_* interface
- using the "billion laughs" entity expansion technique.
- *) Minor build and bug fixes.
- *) SECURITY: CVE-2009-0023 (cve.mitre.org)
- Fix underflow in apr_strmatch_precompile.
- *) Fix off by one overflow in apr_brigade_vprintf.
- *) APR_LDAP_SIZELIMIT should prefer LDAP_DEFAULT_LIMIT/-1 when the
- SDK supports it, but in the absence of LDAP_DEFAULT_LIMIT (and
- LDAP_NO_LIMIT/0) it is not safe to use a literal -1.
- *) Clean up ODBC types. Warnings seen when compiling packages for
- Fedora 11.
- *) Use of my_init() requires my_global.h and my_sys.h.
- *) Fix apr_memcache_multgetp memory corruption and incorrect error
- handling.
- *) Fix memcache memory leak with persistent connections.
- *) Add Oracle 11 support.
- *) apr_dbd_freetds: Avoid segfault when process is NULL.
- Do no print diagnostics to stderr. Never allow driver to exit
- process.
- *) apr_dbd_freetds: The sybdb.h header file might be freetds/sybdb.h
- or sybdb.h.
- *) LDAP detection improvements: --with-ldap now supports library names
- containing non-alphanumeric characters, such as libldap-2.4.so. New
- option --with-lber can be used to override the default liblber name.
- Fix a problem reporting the lber library from apu-N-config.
- *) Suppress pgsql column-out-of-range warning.
- *) Fix a buffer overrun and password matching for SHA passwords.
- *) Introduce DSO handling of the db, gdbm and ndbm drivers, so these are
- loaded as .so's on first demand, unless --disable-util-dso is configured.
- *) Fix a segfault in the DBD testcase when the DBD modules were not present.
-- package %%{dso_libdir}/apr_dbm_db*
-* Mon Mar 09 2009 poeml@suse.de
-- enable build on CentOS5 and RHEL5
-* Tue Nov 11 2008 ro@suse.de
-- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
-* Thu Oct 30 2008 skh@suse.de
-- obsolete old -XXbit packages (bnc#437293) (olh@suse.de)
-* Tue Aug 19 2008 poeml@suse.de
-- update to 1.3.4 final
- (updating to the release tarball, which has all the patches.)
-* Fri Aug 15 2008 poeml@suse.de
-- remove the incremental patches
- apr-util-1.3.2-r672712-pg-counting.patch
- apr-util-1.3.2-r673300-pgconfig.patch
- apr-util-1.3.2-r676473-reslist-doc.patch
- apr-util-1.3.2-r676801-mutex-destroy.patch
- apr-util-1.3.2-r679235-mysql-reconnect.patch
- apr-util-1.3.2-r679638-memcache-rusage.patch
- apr-util-1.3.2-r680529-reslist-limits.patch
- since they are included in apr-util-1.3.3.patch
-* Fri Aug 15 2008 poeml@suse.de
-- add apr-1.3.2-r685262.patch to memcache client
- * Fix a memory leak introduced in r683756 and a free call to a
- non malloced pointer in the case that the platform has no threads.
-* Fri Aug 08 2008 poeml@suse.de
-- the libapr_memcache0 package can be considered obsolete now,
- since apr 1.3.x has apr_memcache integrated; I removed it and
- added an Obsoletes tag here.
-* Fri Aug 08 2008 poeml@suse.de
-- add pre-1.3.3 patch with all other backports, in preparation to
- 1.3.3 release. Plus latest version of 1.3.x non-pre_cleanup patch
- (apu-memcache_leak.patch)
-* Thu Aug 07 2008 poeml@suse.de
-- add post-1.3.2 patches (backports from trunk committed to the
- 1.3.x branch)
- apr-util-1.3.2-r672712-pg-counting.patch
- apr-util-1.3.2-r673299-pgconfig.patch
- apr-util-1.3.2-r676473-reslist-doc.patch
- apr-util-1.3.2-r676801-mutex-destroy.patch
- apr-util-1.3.2-r679235-mysql-reconnect.patch
- apr-util-1.3.2-r679638-memcache-rusage.patch
- apr-util-1.3.2-r680529-reslist-limits.patch
- [#] to be discussed - but seems to work
- apr-util-trunk-r678323-memcache-memleak.patch
-- drop obsolete workaround about pg_config
-* Thu Aug 07 2008 poeml@suse.de
-- update to 1.3.2
- *) Fix parameter parsing error in ODBC DBD driver. [Tom Donovan]
- *) Older OpenLDAP implementations may have ldap_set_rebind_proc() with two
- args. Provide detection code and alternative implementation.
- [Ruediger Pluem]
- *) Use pool memory when setting DBD driver name into the hash.
- [Bojan Smojver]
- *) Add ODBC DBD Driver. [Tom Donovan]
- *) Fix build of the FreeTDS and MySQL drivers. [Bojan Smojver]
- *) Fix build failure for no modules (--disable-dso). [Jean-Frederic Clere]
- *) Fix win32 build failure for no modules (empty DBD_LIST). [William Rowe]
-* Thu Jul 17 2008 poeml@suse.de
-- add /usr/lib/apr-util-1 directory to RPM filelist.
-* Tue Jun 17 2008 poeml@suse.de
-- pg_config is evil. Make sure it is not used to find PostgreSQL
- header files. Fixing build of of the PostgreSQL DBD adapter
- onopenSUSE 11.0.
-* Sun Jun 15 2008 poeml@suse.de
-- update to 1.3.0
- *) apr_reslist: destroy all resources in apr_cleanup (don't give up on error).
- PR 45086 [Nick Kew]
- *) Add apr_brigade_split_ex for reusing existing brigades in situation where
- brigades need to be split often during the lifetime of a pool.
- [Ruediger Pluem]
- *) Amend apr_reslist to expire resources whose idle time exceeds ttl.
- PR 42841 [Tom Donovan, Nick Kew, Ruediger Pluem]
- *) Modularize ldap's stub with the dbd dso modular structure, and teach
- the apu dso's to respect the system specific shared lib path var.
- To link to an application without ldap libs, query
- `apu-1-config --avoid-ldap --libs` (in addition to the usual linker
- queries for compiling and linking). [William Rowe]
- *) Support building DBD drivers as DSOs by default; use --disable-util-dso
- flag to configure to use static link. [Joe Orton, Bojan Smojver]
- *) All DBD drivers now count rows from 1, which affects PostgreSQL and MySQL
- drivers in particular. Using row number zero is an error.
- [Bojan Smojver]
- *) Add support for OpenLDAP's ability to support a directory of
- certificate authorities. [Eric Covener]
- *) Better error detection for bucket allocation failures.
- [Jim Jagielski]
- *) Ensure that the LDAP code can compile cleanly on platforms that do
- not define the LDAP_OPT_REFHOPLIMIT symbol, most specifically Windows.
- [Victor , Graham Leggett]
- *) Fix the setting of LDAP_OPT_SSL on Win2k, which expects a pointer to
- the value LDAP_OPT_ON, and not the value itself. XP works with both.
- [Victor ]
- *) Fix a regression in apr_brigade_partition that causes integer overflows
- on systems where apr_off_t > apr_size_t. [Ruediger Pluem]
- *) Ensure that apr_uri_unparse does not add scheme to URI if
- APR_URI_UNP_OMITSITEPART flag is set. PR 44044
- [Michael Clark <michael metaparadigm.com>]
- *) Add an LDAP rebind implementation so that authentication can be
- carried through referrals. [Paul J. Reder]
- *) Fix the make test target in the spec file. [Graham Leggett]
- *) Introduce apr_dbd_open_ex() [Bojan Smojver]
- *) Make md5 hash files portable between EBCDIC and ASCII platforms
- [David Jones]
- *) Add limited apr_dbd_freetds driver (MSSQL and Sybase) [Nick Kew]
- *) Commit relicensed apr_dbd_mysql driver to /trunk/ [Nick Kew]
- *) Support BerkeleyDB 4.6. [Arfrever Frehtes Taifersar Arahesis]
- *) Support Tivoli ITDS LDAP client library. [Paul Reder]
- *) Portably implement testdate's long-time constants to solve
- compilation faults where #LL isn't valid. [Curt Arnold]
- *) Use buffered I/O with SDBM. [Joe Schaefer]
- *) Unify parsing of prepared statements and add binary argument functions
- to DBD [Bojan Smojver with help from many on the APR list]
- *) Rewrite detection of expat in configure to fix build on e.g. biarch
- Linux platforms. PR 28205. [Joe Orton]
- *) Add apr_thread_pool implementation. [Henry Jen <henryjen ztune.net>]
- *) Add support for Berkeley DB 4.5 to the configure scripts.
- [Garrett Rooney]
- *) Allow apr_queue.h to be included before other APR headers.
- PR 40891 [Henry Jen <henryjen ztune.net>]
- *) Fix precedence problem in error checking for sdbm dbm back end.
- PR 40659 [Larry Cipriani <lvc lucent.com>]
- *) Add an apr_reslist_acquired_count, for determining how many outstanding
- resources there are in a reslist. [Ryan Phillips <ryan trolocsis.com>]
- *) Provide folding in autogenerated .manifest files for Win32 builders
- using VisualStudio 2005 [William Rowe]
- *) Implement DBD transaction modes
- [Bojan Smojver with help from many on the APR list]
- *) Implement prepared statement support in SQLite3 DBD driver
- [Bojan Smojver]
- *) Add get (column) name to apr_dbd API
- [Bojan Smojver <bojan rexursive.com>] and
- [Chris Darroch <chrisd pearsoncmg com>]
- *) Make the DBD autoconf-glue use LDFLAGS instead of LIBS in several
- places, fixing some configure issues on Solaris.
- [Henry Jen <henryjen ztune.net>]
- *) Make apr_dbd.h work as a stand alone header, without needing other
- files to be included before it. [Henry Jen <henryjen ztune.net>]
- *) On platforms that use autoconf stop automatically linking against
- apr-iconv when an apr-iconv source dir is found in ../apr-iconv.
- Instead, add a --with-apr-iconv option to configure that lets you
- specify the relative path to your apr-iconv source directory.
- [Garrett Rooney]
- *) APR_FIND_APU macro now supports customisable detailed checks on
- each installed apr-util. [Justin Erenkrantz, Colm MacCarthaigh]
- *) APR_FIND_APU macro no longer checks /usr/local/apache2/
- [Colm MacCarthaigh]
- *) Add apr_dbd_oracle driver [Nick Kew and Chris Darroch]
-- remove obsolete patches:
- apr-util-1.2.12-ac_configure_args.patch
- apr-util-1.2.12-no_linkage.patch
- apr-util-1.2.12-dso.patch
- apr-util-1.2.12-link.patch
- apr-util-1.2.8-r521327.patch
- DSO build is now handled by the build system and it is also the
- default now.
-- remove manual run of the testsuite, this has also been fixed
- upstreams.
-- the DBD dsos now live in /usr/lib*/apr-util-1.
-* Mon Jun 09 2008 poeml@suse.de
-- build service supports the debuginfo flag in metadata now; remove
- debug_package macro from the specfile therefore.
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
- for multilib support
-* Wed Jan 23 2008 poeml@suse.de
-- re-fix build of apr_dbd_mysql module on SLES_9 (must have been
- broken on Tue Aug 21 2007)
-* Wed Jan 23 2008 poeml@suse.de
-- fix DSO build so it doesn't incur linkage to the database libs,
- which happened since the 1.2.12, and which I hadn't time to fix
- yet. Patches from PLD and Oden Eriksson (Mandrake) very much
- appreciated.
- +Patch10: apr-util-1.2.12-no_linkage.patch
- +Patch11: apr-util-1.2.12-dso.patch
- +Patch12: apr-util-1.2.12-link.patch
-- another patch was rebased and renamed:
- -Patch: apr-util-1.2.7.diff
- +Patch: apr-util-1.2.12-ac_configure_args.patch
-- build DSOs manually (by changing build-outputs.mk to not make
- dbd/apr_dbd_[^ ]*\.lo. Thereby avoiding database symbols in
- the resulting libaprutil-1 shared object
-- fix up apu-1-config LDFLAGS and INCLUDES in the end
-- update the run of testcases
-- remove openldap2 from BuildRequires, because that part is the
- server component which is never needed for building.
-- added requires for openldap2-devel db-devel to the devel
- package as apu-1-config returns the libs (change from Factory)
-* Tue Nov 27 2007 poeml@suse.de
-- update to 1.2.12:
- *) Wakeup threads waiting for a reslist resource after a resource was
- invalidated. [Ruediger Pluem]
- *) Fix GMT offset for several date formats and add a new format.
- [Maxime Petazzoni ]
- *) Numerous fixes to the test/ framework, including better handling of
- long size_t comparisons and more consistent Makefile.(in|win) setup
- for authoring new tests. [William Rowe]
- *) Win32 build fixes including a Makefile.win scheme, fixes for 64P
- model x86_64 compiles and VC8 builds. [William Rowe]
- *) Type mismatch between apr_datum_t and GDBM's datum type could
- yield a corrupt apr_datum_t when reading from a GDBM database.
- PR 43025. [Björn Wiberg , Davi Arnaut]
- *) Add the #define APR_LDAP_SIZELIMIT that is set appropriately
- for the LDAP SDK that is being used. Also include ZOS as an
- LDAP Platform.
- PR 37814. [David Jones <oscaremma gmail com>, Davi Arnaut]
- *) Fix exported LDFLAGS with new expat detection. PR 43337.
- [Justin Erenkrantz]
- *) Add MySQL DBD driver [Nick Kew, Bojan Smojver]
-- drop source file apr_dbd_mysql.c, which was distributed
- separately until now. Functional changes to the previous version
- are:
- * added mysql_thread_init() (see
- http://www.nabble.com/-PATCH--apr_dbd_mysql.c-t4314862.html)
- * allow groups=xyz in the DBDParams setting
-- drop apr-util-1.2.8-dso.patch, apr-util-1.2.12-dbd.patch,
- apr-util-1.2.8_dbd_mysql_buildconf.patch
-- adjust apr-util-1.2.8-dbd.patch
-- fix empty rpm macro "helpdir", which lead to an error
-* Wed Sep 12 2007 poeml@suse.de
-- use debug_package macro only on suse, because it breaks the build
- on Mandriva
-* Mon Sep 10 2007 poeml@suse.de
-- update to 1.2.10:
- *) Support BerkeleyDB 4.6. [Arfrever Frehtes Taifersar Arahesis]
- *) Test improvements to validate testmd4 and testdbm, unattended.
- [Bojan Smojver]
- *) Ensure that an apr_reslist shrinks back to SMAX via the TTL by
- reorganising the resource list from a queue to a stack.
- PR 40348. [Christian BOITEL ]
- *) Fix Solaris 2.8+ fdatasync() detection. The fdatasync() function
- is marked as part of the Realtime library functions.
- PR 37343. [Davi Arnaut]
- *) Change configure's expat detection to use standard linker-based
- tests, fixing build on e.g. biarch Linux systems. PR 28205.
- [Joe Orton, Ruediger Pluem]
- *) Portably implement testdate's long-time constants to solve
- compilation faults where #LL isn't valid. [Curt Arnold]
- *) APR_FIND_APU macro no longer checks /usr/local/apache2/.
- PR 42089. [Colm MacCárthaigh]
- *) Fix handling of attribute namespaces in apr_xml_to_text() when
- a namespace map is provided. PR 41908. [Joe Orton]
-- update apr_dbd_mysql.c to r54
- - Rework for unified parsing of prepared statements
- - Add binary argument functions
- - Update Licensing
- http://bahumbug.wordpress.com/2007/01/09/re-licensing-apr_dbd_mysql/
-* Mon Aug 27 2007 poeml@suse.de
-- add apr-util-1.2.8-r521327.patch:
- dbd/apr_dbd.c (apr_dbd_get_driver): Ensure driver DSOs have the
- same lifetime as the hash table. Backport from trunk (r521327)
-* Tue Aug 21 2007 crrodriguez@suse.de
-- first attempt to remove static libraries and libtool crap
-* Wed Jul 18 2007 poeml@suse.de
-- fixed wrong rpm tag (Buildrequires -> Requires libexpat-devel)
-* Wed Jul 18 2007 poeml@suse.de
-- make last fix buildservice compatible
-- add debug_package macro in buildservice (will soon be obsolete)
-* Sat Apr 28 2007 aj@suse.de
-- Add libexpat-devel to build requires.
-* Wed Dec 20 2006 poeml@suse.de
-- fix sqlite plugin building for sqlite2, it wasn't linked against
- the lib
-- work around mysql plugin build on SLES9 with a kludge
- (libmysqlclient_r was missing the .so link at SLES9 time
-* Thu Dec 14 2006 poeml@suse.de
-- DSO-ify the build of dbd backends
-* Thu Dec 14 2006 poeml@suse.de
-- add sqlite and pgsql support, and rpm-macroize it
-* Wed Dec 13 2006 mrueckert@suse.de
-- added apr-util-1.2.8_dbd_mysql_buildconf.patch and
- http://apache.webthing.com/svn/apache/apr/apr_dbd_mysql.c:
- the patch and the additional .c file add mysql support to apr-dbd
-* Mon Dec 11 2006 poeml@suse.de
-- update to 1.2.8
- *) Add support for Berkeley DB 4.5 to the configure scripts.
- *) Allow apr_queue.h to be included before other APR headers.
- *) Implement prepared statement support in SQLite3 DBD driver
- *) Fix to ensure that "deprecated" LDAP interfaces are still
- exposed if using OpenLDAP 2.3.
- *) Fix incorrect byte order and incorrect timestamp type
- in the fallback UUID generator used when no external UUID
- generator is detected by APR.
-* Sat Oct 21 2006 olh@suse.de
-- libexpat.la was removed, look for libexpat.a also in lib64 (214240)
- build parallel
-* Mon Sep 18 2006 poeml@suse.de
-- fix Buildrequires on FC and Mandriva
-* Thu Jun 22 2006 schwab@suse.de
-- Don't depend on configure args being preserved.
-* Tue May 30 2006 poeml@suse.de
-- fix BuildRequires for Fedora Core
-- ditch krb5 from BuildRequires, since it doesn't seem to be needed
-- use --with-berkeley-db
-* Tue Apr 25 2006 poeml@suse.de
-- upstream 1.2.7. relevant changes:
- *) Fix apr_dbd_init to be safe to call multiple times
- *) Stop trying to link against Berkeley DB by default.
- (use --with-berkeley-db)
- *) Stop trying to link against GDBM by default. (use --with-gdbm)
- *) Fix the escape implementations for the sqlite2 and sqlite3 dbd
- back ends.
- *) Add support for Berkeley DB 4.4 to the configure scripts.
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Wed Oct 12 2005 poeml@suse.de
-- update to 1.2.2
-* Thu Sep 29 2005 poeml@suse.de
-- update to 1.2.1
-- remove -DLDAP_DEPRECATED: all CFLAGS are derived from apr-config
-* Mon Sep 26 2005 ro@suse.de
-- added LDAP_DEPRECATED to CFLAGS
-* Thu Mar 24 2005 poeml@suse.de
-- update to 1.1.2
-* Fri Feb 25 2005 poeml@suse.de
-- package created (1.1.0)
++++++ apr-util-1.3.7.tar.bz2 -> apr-util-1.3.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/CHANGES new/apr-util-1.3.8/CHANGES
--- old/apr-util-1.3.7/CHANGES 2009-06-03 17:37:44.000000000 +0200
+++ new/apr-util-1.3.8/CHANGES 2009-06-30 23:41:48.000000000 +0200
@@ -1,7 +1,24 @@
-*- coding: utf-8 -*-
+Changes with APR-util 1.3.8
+
+ *) Use locally scoped variables in PostgreSQL driver to avoid stomping
+ on return codes. PR 47431
+ [Wayne Jensen ]
+
+ *) Fix race conditions in initialisation of DBD, DBM and DSO.
+ [Bojan Smojver]
+
+ *) Expose DBM libs in apu-1-config by default. To avoid that, use
+ apu-1-config --avoid-dbm --libs. To get just DBM libs, use
+ apu-1-config --dbm-libs.
+ [Bojan Smojver]
+
+ *) Make sure --without-ldap works.
+ [Arfrever Frehtes Taifersar Arahesis ]
+
Changes with APR-util 1.3.7
- *) SECURITY:
+ *) SECURITY: CVE-2009-1955 (cve.mitre.org)
Fix a denial of service attack against the apr_xml_* interface
using the "billion laughs" entity expansion technique.
[Joe Orton]
@@ -16,7 +33,8 @@
Fix underflow in apr_strmatch_precompile.
[Matthew Palmer <mpalmer debian.org>]
- *) Fix off by one overflow in apr_brigade_vprintf.
+ *) SECURITY: CVE-2009-1956 (cve.mitre.org)
+ Fix off by one overflow in apr_brigade_vprintf.
[C. Michael Pilato <cmpilato collab.net>]
*) APR_LDAP_SIZELIMIT should prefer LDAP_DEFAULT_LIMIT/-1 when the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/NOTICE new/apr-util-1.3.8/NOTICE
--- old/apr-util-1.3.7/NOTICE 2008-05-30 23:24:44.000000000 +0200
+++ new/apr-util-1.3.8/NOTICE 2009-07-02 04:56:23.000000000 +0200
@@ -1,5 +1,5 @@
Apache Portable Runtime Utility Library
-Copyright 2008 The Apache Software Foundation.
+Copyright (c) 2009 The Apache Software Foundation.
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/NWGNUmakefile new/apr-util-1.3.8/NWGNUmakefile
--- old/apr-util-1.3.7/NWGNUmakefile 2008-11-24 02:50:52.000000000 +0100
+++ new/apr-util-1.3.8/NWGNUmakefile 2009-07-01 19:39:27.000000000 +0200
@@ -114,7 +114,7 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =
+NLM_NAME =
#
# This is used by the link '-desc ' directive.
@@ -131,7 +131,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -156,14 +156,14 @@
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS =
+NLM_FLAGS =
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -229,7 +229,7 @@
#
FILES_nlm_exports = \
$(EOLIST)
-
+
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
@@ -266,6 +266,7 @@
$(OBJDIR)/getuuid.o \
$(OBJDIR)/uuid.o \
$(OBJDIR)/apr_strmatch.o \
+ $(OBJDIR)/apr_thread_pool.o \
$(OBJDIR)/apr_uri.o \
$(OBJDIR)/sdbm.o \
$(OBJDIR)/sdbm_hash.o \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/apr-util.spec new/apr-util-1.3.8/apr-util.spec
--- old/apr-util-1.3.7/apr-util.spec 2009-06-03 18:09:50.000000000 +0200
+++ new/apr-util-1.3.8/apr-util.spec 2009-07-02 05:12:13.000000000 +0200
@@ -3,7 +3,7 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
-Version: 1.3.7
+Version: 1.3.8
Release: 1
License: Apache Software License
Group: System Environment/Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/apu-config.in new/apr-util-1.3.8/apu-config.in
--- old/apr-util-1.3.7/apu-config.in 2008-05-23 23:27:59.000000000 +0200
+++ new/apr-util-1.3.8/apu-config.in 2009-06-10 05:34:22.000000000 +0200
@@ -31,6 +31,7 @@
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"
LDAP_LIBS="@LDADD_ldap@"
+DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
@@ -56,6 +57,8 @@
--libs print library information
--avoid-ldap do not include ldap library information with --libs
--ldap-libs print additional library information to link with ldap
+ --avoid-dbm do not include DBM library information with --libs
+ --dbm-libs print additional library information to link with DBM
--srcdir print APR-util source directory
--link-ld print link switch(es) for linking to APR-util
--link-libtool print the libtool inputs for linking to APR-util
@@ -115,12 +118,18 @@
--avoid-ldap)
LDAP_LIBS=""
;;
+ --avoid-dbm)
+ DBM_LIBS=""
+ ;;
--libs)
- flags="$flags $LDAP_LIBS $LIBS"
+ flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
;;
--ldap-libs)
flags="$flags $LDAP_LIBS"
;;
+ --dbm-libs)
+ flags="$flags $DBM_LIBS"
+ ;;
--includedir)
if test "$location" = "installed"; then
flags="$includedir"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/build/apu-conf.m4 new/apr-util-1.3.8/build/apu-conf.m4
--- old/apr-util-1.3.7/build/apu-conf.m4 2009-02-09 18:47:40.000000000 +0100
+++ new/apr-util-1.3.8/build/apu-conf.m4 2009-06-09 02:14:49.000000000 +0200
@@ -251,126 +251,128 @@
AC_ARG_WITH(ldap-lib,[ --with-ldap-lib=path path to ldap lib file])
AC_ARG_WITH(ldap,[ --with-ldap=library ldap library to use],
[
- save_cppflags="$CPPFLAGS"
- save_ldflags="$LDFLAGS"
- save_libs="$LIBS"
- if test -n "$with_ldap_include"; then
- CPPFLAGS="$CPPFLAGS -I$with_ldap_include"
- APR_ADDTO(APRUTIL_INCLUDES, [-I$with_ldap_include])
+ if test "$with_ldap" != "no"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ save_libs="$LIBS"
+ if test -n "$with_ldap_include"; then
+ CPPFLAGS="$CPPFLAGS -I$with_ldap_include"
+ APR_ADDTO(APRUTIL_INCLUDES, [-I$with_ldap_include])
+ fi
+ if test -n "$with_ldap_lib"; then
+ LDFLAGS="$LDFLAGS -L$with_ldap_lib"
+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_ldap_lib])
+ fi
+
+ LIBLDAP="$withval"
+ if test "$LIBLDAP" = "yes"; then
+ dnl The iPlanet C SDK 5.0 is as yet untested...
+ APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50")
+ APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3")
+ APU_FIND_LDAPLIB("ldapssl40")
+ APU_FIND_LDAPLIB("ldapssl30")
+ APU_FIND_LDAPLIB("ldapssl20")
+ APU_FIND_LDAPLIB("ldapsdk", "-lldapx -lldapssl -lldapgss -lgssapi_krb5")
+ APU_FIND_LDAPLIB("ldapsdk", "-lldapx -lldapssl -lldapgss -lgss -lresolv -lsocket")
+ APU_FIND_LDAPLIB("ldap", "-llber")
+ APU_FIND_LDAPLIB("ldap", "-llber -lresolv")
+ APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl")
+ APU_FIND_LDAPLIB("ldap", "-ldl -lpthread")
+ else
+ APU_FIND_LDAPLIB($LIBLDAP)
+ APU_FIND_LDAPLIB($LIBLDAP, "-lresolv")
+ APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl")
+ APU_FIND_LDAPLIB($LIBLDAP, "-ldl -lpthread")
+ fi
+
+ test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
+ AC_CHECK_LIB($apu_liblber_name, ber_init,
+ [LDADD_ldap="${LDADD_ldap} -l${apu_liblber_name}"])
+
+ AC_CHECK_HEADERS(lber.h, lber_h=["#include "])
+
+ # Solaris has a problem in which prevents it from
+ # being included by itself. Check for manually,
+ # including lber.h first.
+ AC_CACHE_CHECK([for ldap.h], [apr_cv_hdr_ldap_h],
+ [AC_TRY_CPP(
+ [#ifdef HAVE_LBER_H
+ #include
+ #endif
+ #include
+ ], [apr_cv_hdr_ldap_h=yes], [apr_cv_hdr_ldap_h=no])])
+ if test "$apr_cv_hdr_ldap_h" = "yes"; then
+ ldap_h=["#include "]
+ AC_DEFINE([HAVE_LDAP_H], 1, [Defined if ldap.h is present])
+ fi
+
+ AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include "])
+
+ if test "$apr_cv_hdr_ldap_h" = "yes"; then
+ AC_CACHE_CHECK([for LDAP toolkit],
+ [apr_cv_ldap_toolkit], [
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ AC_EGREP_CPP([OpenLDAP], [$lber_h
+ $ldap_h
+ LDAP_VENDOR_NAME], [apu_has_ldap_openldap="1"
+ apr_cv_ldap_toolkit="OpenLDAP"])
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ AC_EGREP_CPP([Sun Microsystems Inc.], [$lber_h
+ $ldap_h
+ LDAP_VENDOR_NAME], [apu_has_ldap_solaris="1"
+ apr_cv_ldap_toolkit="Solaris"])
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ AC_EGREP_CPP([Novell], [$lber_h
+ $ldap_h
+ LDAP_VENDOR_NAME], [apu_has_ldap_novell="1"
+ apr_cv_ldap_toolkit="Novell"])
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ AC_EGREP_CPP([Microsoft Corporation.], [$lber_h
+ $ldap_h
+ LDAP_VENDOR_NAME], [apu_has_ldap_microsoft="1"
+ apr_cv_ldap_toolkit="Microsoft"])
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ AC_EGREP_CPP([Netscape Communications Corp.], [$lber_h
+ $ldap_h
+ LDAP_VENDOR_NAME], [apu_has_ldap_netscape="1"
+ apr_cv_ldap_toolkit="Netscape"])
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ AC_EGREP_CPP([mozilla.org], [$lber_h
+ $ldap_h
+ LDAP_VENDOR_NAME], [apu_has_ldap_mozilla="1"
+ apr_cv_ldap_toolkit="Mozilla"])
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ AC_EGREP_CPP([International Business Machines], [$lber_h
+ $ldap_h
+ LDAP_VENDOR_NAME], [apu_has_ldap_tivoli="1"
+ apr_cv_ldap_toolkit="Tivoli"])
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ case "$host" in
+ *-ibm-os390)
+ AC_EGREP_CPP([IBM], [$lber_h
+ $ldap_h], [apu_has_ldap_zos="1"
+ apr_cv_ldap_toolkit="z/OS"])
+ ;;
+ esac
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ apu_has_ldap_other="1"
+ apr_cv_ldap_toolkit="unknown"
+ fi
+ ])
+ fi
+
+ CPPFLAGS=$save_cppflags
+ LDFLAGS=$save_ldflags
+ LIBS=$save_libs
fi
- if test -n "$with_ldap_lib"; then
- LDFLAGS="$LDFLAGS -L$with_ldap_lib"
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_ldap_lib])
- fi
-
- LIBLDAP="$withval"
- if test "$LIBLDAP" = "yes"; then
-dnl The iPlanet C SDK 5.0 is as yet untested...
- APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50")
- APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3")
- APU_FIND_LDAPLIB("ldapssl40")
- APU_FIND_LDAPLIB("ldapssl30")
- APU_FIND_LDAPLIB("ldapssl20")
- APU_FIND_LDAPLIB("ldapsdk", "-lldapx -lldapssl -lldapgss -lgssapi_krb5")
- APU_FIND_LDAPLIB("ldapsdk", "-lldapx -lldapssl -lldapgss -lgss -lresolv -lsocket")
- APU_FIND_LDAPLIB("ldap", "-llber")
- APU_FIND_LDAPLIB("ldap", "-llber -lresolv")
- APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl")
- APU_FIND_LDAPLIB("ldap", "-ldl -lpthread")
- else
- APU_FIND_LDAPLIB($LIBLDAP)
- APU_FIND_LDAPLIB($LIBLDAP, "-lresolv")
- APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl")
- APU_FIND_LDAPLIB($LIBLDAP, "-ldl -lpthread")
- fi
-
- test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
- AC_CHECK_LIB($apu_liblber_name, ber_init,
- [LDADD_ldap="${LDADD_ldap} -l${apu_liblber_name}"])
-
- AC_CHECK_HEADERS(lber.h, lber_h=["#include "])
-
- # Solaris has a problem in which prevents it from
- # being included by itself. Check for manually,
- # including lber.h first.
- AC_CACHE_CHECK([for ldap.h], [apr_cv_hdr_ldap_h],
- [AC_TRY_CPP(
- [#ifdef HAVE_LBER_H
- #include
- #endif
- #include
- ], [apr_cv_hdr_ldap_h=yes], [apr_cv_hdr_ldap_h=no])])
- if test "$apr_cv_hdr_ldap_h" = "yes"; then
- ldap_h=["#include "]
- AC_DEFINE([HAVE_LDAP_H], 1, [Defined if ldap.h is present])
- fi
-
- AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include "])
-
- if test "$apr_cv_hdr_ldap_h" = "yes"; then
- AC_CACHE_CHECK([for LDAP toolkit],
- [apr_cv_ldap_toolkit], [
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- AC_EGREP_CPP([OpenLDAP], [$lber_h
- $ldap_h
- LDAP_VENDOR_NAME], [apu_has_ldap_openldap="1"
- apr_cv_ldap_toolkit="OpenLDAP"])
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- AC_EGREP_CPP([Sun Microsystems Inc.], [$lber_h
- $ldap_h
- LDAP_VENDOR_NAME], [apu_has_ldap_solaris="1"
- apr_cv_ldap_toolkit="Solaris"])
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- AC_EGREP_CPP([Novell], [$lber_h
- $ldap_h
- LDAP_VENDOR_NAME], [apu_has_ldap_novell="1"
- apr_cv_ldap_toolkit="Novell"])
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- AC_EGREP_CPP([Microsoft Corporation.], [$lber_h
- $ldap_h
- LDAP_VENDOR_NAME], [apu_has_ldap_microsoft="1"
- apr_cv_ldap_toolkit="Microsoft"])
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- AC_EGREP_CPP([Netscape Communications Corp.], [$lber_h
- $ldap_h
- LDAP_VENDOR_NAME], [apu_has_ldap_netscape="1"
- apr_cv_ldap_toolkit="Netscape"])
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- AC_EGREP_CPP([mozilla.org], [$lber_h
- $ldap_h
- LDAP_VENDOR_NAME], [apu_has_ldap_mozilla="1"
- apr_cv_ldap_toolkit="Mozilla"])
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- AC_EGREP_CPP([International Business Machines], [$lber_h
- $ldap_h
- LDAP_VENDOR_NAME], [apu_has_ldap_tivoli="1"
- apr_cv_ldap_toolkit="Tivoli"])
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- case "$host" in
- *-ibm-os390)
- AC_EGREP_CPP([IBM], [$lber_h
- $ldap_h], [apu_has_ldap_zos="1"
- apr_cv_ldap_toolkit="z/OS"])
- ;;
- esac
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- apu_has_ldap_other="1"
- apr_cv_ldap_toolkit="unknown"
- fi
- ])
- fi
-
- CPPFLAGS=$save_cppflags
- LDFLAGS=$save_ldflags
- LIBS=$save_libs
])
if test "$apu_has_ldap_openldap" = "1"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/build/dso.m4 new/apr-util-1.3.8/build/dso.m4
--- old/apr-util-1.3.7/build/dso.m4 2008-11-21 07:32:58.000000000 +0100
+++ new/apr-util-1.3.8/build/dso.m4 2009-06-09 17:37:15.000000000 +0200
@@ -27,8 +27,21 @@
if test "$enable_util_dso" = "no"; then
apu_dso_build="0"
else
- apr_h="`$apr_config --includedir`/apr.h"
- apu_dso_build="`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h`"
+ AC_CACHE_CHECK([whether APR has DSO support], [apu_cv_aprdso],
+ [apu_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $APR_INCLUDES"
+ AC_EGREP_CPP([yes], [#include "apr.h"
+#if APR_HAS_DSO
+yes
+#endif
+], [apu_cv_aprdso=yes], [apu_cv_aprdso=no])
+ CPPFLAGS=$apu_save_CPPFLAGS])
+
+ if test $apu_cv_aprdso = yes; then
+ apu_dso_build=1
+ else
+ apu_dso_build=0
+ fi
fi
if test "$apu_dso_build" = "0"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/build/nw_apu_export.inc new/apr-util-1.3.8/build/nw_apu_export.inc
--- old/apr-util-1.3.7/build/nw_apu_export.inc 2008-04-15 12:17:08.000000000 +0200
+++ new/apr-util-1.3.8/build/nw_apu_export.inc 2009-07-01 19:39:27.000000000 +0200
@@ -32,6 +32,7 @@
#include "apr_sdbm.h"
#include "apr_sha1.h"
#include "apr_strmatch.h"
+#include "apr_thread_pool.h"
#include "apr_uri.h"
#include "apr_uuid.h"
#include "apr_xlate.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/configure new/apr-util-1.3.8/configure
--- old/apr-util-1.3.7/configure 2009-06-03 18:09:49.000000000 +0200
+++ new/apr-util-1.3.8/configure 2009-07-02 05:12:11.000000000 +0200
@@ -4830,11 +4830,12 @@
# Check whether --with-ldap was given.
if test "${with_ldap+set}" = set; then
withval=$with_ldap;
- save_cppflags="$CPPFLAGS"
- save_ldflags="$LDFLAGS"
- save_libs="$LIBS"
- if test -n "$with_ldap_include"; then
- CPPFLAGS="$CPPFLAGS -I$with_ldap_include"
+ if test "$with_ldap" != "no"; then
+ save_cppflags="$CPPFLAGS"
+ save_ldflags="$LDFLAGS"
+ save_libs="$LIBS"
+ if test -n "$with_ldap_include"; then
+ CPPFLAGS="$CPPFLAGS -I$with_ldap_include"
if test "x$APRUTIL_INCLUDES" = "x"; then
test "x$silent" != "xyes" && echo " setting APRUTIL_INCLUDES to \"-I$with_ldap_include\""
@@ -4856,9 +4857,9 @@
done
fi
- fi
- if test -n "$with_ldap_lib"; then
- LDFLAGS="$LDFLAGS -L$with_ldap_lib"
+ fi
+ if test -n "$with_ldap_lib"; then
+ LDFLAGS="$LDFLAGS -L$with_ldap_lib"
if test "x$APRUTIL_LDFLAGS" = "x"; then
test "x$silent" != "xyes" && echo " setting APRUTIL_LDFLAGS to \"-L$with_ldap_lib\""
@@ -4880,10 +4881,10 @@
done
fi
- fi
+ fi
- LIBLDAP="$withval"
- if test "$LIBLDAP" = "yes"; then
+ LIBLDAP="$withval"
+ if test "$LIBLDAP" = "yes"; then
if test ${apu_has_ldap} != "1"; then
ldaplib="ldap50"
@@ -11561,7 +11562,7 @@
fi
- else
+ else
if test ${apu_has_ldap} != "1"; then
ldaplib=$LIBLDAP
@@ -13990,12 +13991,12 @@
fi
- fi
+ fi
- test ${apu_has_ldap} != "1" && { { $as_echo "$as_me:$LINENO: error: could not find an LDAP library" >&5
+ test ${apu_has_ldap} != "1" && { { $as_echo "$as_me:$LINENO: error: could not find an LDAP library" >&5
$as_echo "$as_me: error: could not find an LDAP library" >&2;}
{ (exit 1); exit 1; }; }
- as_ac_Lib=`$as_echo "ac_cv_lib_$apu_liblber_name''_ber_init" | $as_tr_sh`
+ as_ac_Lib=`$as_echo "ac_cv_lib_$apu_liblber_name''_ber_init" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for ber_init in -l$apu_liblber_name" >&5
$as_echo_n "checking for ber_init in -l$apu_liblber_name... " >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -14217,10 +14218,10 @@
done
- # Solaris has a problem in which prevents it from
- # being included by itself. Check for manually,
- # including lber.h first.
- { $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
+ # Solaris has a problem in which prevents it from
+ # being included by itself. Check for manually,
+ # including lber.h first.
+ { $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
$as_echo_n "checking for ldap.h... " >&6; }
if test "${apr_cv_hdr_ldap_h+set}" = set; then
$as_echo_n "(cached) " >&6
@@ -14232,9 +14233,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef HAVE_LBER_H
- #include
- #endif
- #include
+ #include
+ #endif
+ #include
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -14266,14 +14267,14 @@
fi
{ $as_echo "$as_me:$LINENO: result: $apr_cv_hdr_ldap_h" >&5
$as_echo "$apr_cv_hdr_ldap_h" >&6; }
- if test "$apr_cv_hdr_ldap_h" = "yes"; then
- ldap_h="#include "
+ if test "$apr_cv_hdr_ldap_h" = "yes"; then
+ ldap_h="#include "
cat >>confdefs.h <<\_ACEOF
#define HAVE_LDAP_H 1
_ACEOF
- fi
+ fi
for ac_header in ldap_ssl.h
@@ -14422,181 +14423,182 @@
done
- if test "$apr_cv_hdr_ldap_h" = "yes"; then
- { $as_echo "$as_me:$LINENO: checking for LDAP toolkit" >&5
+ if test "$apr_cv_hdr_ldap_h" = "yes"; then
+ { $as_echo "$as_me:$LINENO: checking for LDAP toolkit" >&5
$as_echo_n "checking for LDAP toolkit... " >&6; }
if test "${apr_cv_ldap_toolkit+set}" = set; then
$as_echo_n "(cached) " >&6
else
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- cat >conftest.$ac_ext <<_ACEOF
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
- LDAP_VENDOR_NAME
+ $ldap_h
+ LDAP_VENDOR_NAME
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "OpenLDAP" >/dev/null 2>&1; then
apu_has_ldap_openldap="1"
- apr_cv_ldap_toolkit="OpenLDAP"
+ apr_cv_ldap_toolkit="OpenLDAP"
fi
rm -f conftest*
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- cat >conftest.$ac_ext <<_ACEOF
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
- LDAP_VENDOR_NAME
+ $ldap_h
+ LDAP_VENDOR_NAME
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Sun Microsystems Inc." >/dev/null 2>&1; then
apu_has_ldap_solaris="1"
- apr_cv_ldap_toolkit="Solaris"
+ apr_cv_ldap_toolkit="Solaris"
fi
rm -f conftest*
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- cat >conftest.$ac_ext <<_ACEOF
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
- LDAP_VENDOR_NAME
+ $ldap_h
+ LDAP_VENDOR_NAME
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Novell" >/dev/null 2>&1; then
apu_has_ldap_novell="1"
- apr_cv_ldap_toolkit="Novell"
+ apr_cv_ldap_toolkit="Novell"
fi
rm -f conftest*
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- cat >conftest.$ac_ext <<_ACEOF
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
- LDAP_VENDOR_NAME
+ $ldap_h
+ LDAP_VENDOR_NAME
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Microsoft Corporation." >/dev/null 2>&1; then
apu_has_ldap_microsoft="1"
- apr_cv_ldap_toolkit="Microsoft"
+ apr_cv_ldap_toolkit="Microsoft"
fi
rm -f conftest*
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- cat >conftest.$ac_ext <<_ACEOF
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
- LDAP_VENDOR_NAME
+ $ldap_h
+ LDAP_VENDOR_NAME
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Netscape Communications Corp." >/dev/null 2>&1; then
apu_has_ldap_netscape="1"
- apr_cv_ldap_toolkit="Netscape"
+ apr_cv_ldap_toolkit="Netscape"
fi
rm -f conftest*
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- cat >conftest.$ac_ext <<_ACEOF
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
- LDAP_VENDOR_NAME
+ $ldap_h
+ LDAP_VENDOR_NAME
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "mozilla.org" >/dev/null 2>&1; then
apu_has_ldap_mozilla="1"
- apr_cv_ldap_toolkit="Mozilla"
+ apr_cv_ldap_toolkit="Mozilla"
fi
rm -f conftest*
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- cat >conftest.$ac_ext <<_ACEOF
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
- LDAP_VENDOR_NAME
+ $ldap_h
+ LDAP_VENDOR_NAME
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "International Business Machines" >/dev/null 2>&1; then
apu_has_ldap_tivoli="1"
- apr_cv_ldap_toolkit="Tivoli"
+ apr_cv_ldap_toolkit="Tivoli"
fi
rm -f conftest*
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- case "$host" in
- *-ibm-os390)
- cat >conftest.$ac_ext <<_ACEOF
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ case "$host" in
+ *-ibm-os390)
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$lber_h
- $ldap_h
+ $ldap_h
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "IBM" >/dev/null 2>&1; then
apu_has_ldap_zos="1"
- apr_cv_ldap_toolkit="z/OS"
+ apr_cv_ldap_toolkit="z/OS"
fi
rm -f conftest*
- ;;
- esac
- fi
- if test "x$apr_cv_ldap_toolkit" = "x"; then
- apu_has_ldap_other="1"
- apr_cv_ldap_toolkit="unknown"
- fi
+ ;;
+ esac
+ fi
+ if test "x$apr_cv_ldap_toolkit" = "x"; then
+ apu_has_ldap_other="1"
+ apr_cv_ldap_toolkit="unknown"
+ fi
fi
{ $as_echo "$as_me:$LINENO: result: $apr_cv_ldap_toolkit" >&5
$as_echo "$apr_cv_ldap_toolkit" >&6; }
- fi
+ fi
- CPPFLAGS=$save_cppflags
- LDFLAGS=$save_ldflags
- LIBS=$save_libs
+ CPPFLAGS=$save_cppflags
+ LDFLAGS=$save_ldflags
+ LIBS=$save_libs
+ fi
fi
@@ -49029,8 +49031,43 @@
if test "$enable_util_dso" = "no"; then
apu_dso_build="0"
else
- apr_h="`$apr_config --includedir`/apr.h"
- apu_dso_build="`awk '/^#define APR_HAS_DSO/ { print $3; }' $apr_h`"
+ { $as_echo "$as_me:$LINENO: checking whether APR has DSO support" >&5
+$as_echo_n "checking whether APR has DSO support... " >&6; }
+if test "${apu_cv_aprdso+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ apu_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $APR_INCLUDES"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include "apr.h"
+#if APR_HAS_DSO
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then
+ apu_cv_aprdso=yes
+else
+ apu_cv_aprdso=no
+fi
+rm -f conftest*
+
+ CPPFLAGS=$apu_save_CPPFLAGS
+fi
+{ $as_echo "$as_me:$LINENO: result: $apu_cv_aprdso" >&5
+$as_echo "$apu_cv_aprdso" >&6; }
+
+ if test $apu_cv_aprdso = yes; then
+ apu_dso_build=1
+ else
+ apu_dso_build=0
+ fi
fi
if test "$apu_dso_build" = "0"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/dbd/apr_dbd.c new/apr-util-1.3.8/dbd/apr_dbd.c
--- old/apr-util-1.3.7/dbd/apr_dbd.c 2008-11-21 03:22:40.000000000 +0100
+++ new/apr-util-1.3.8/dbd/apr_dbd.c 2009-06-11 01:55:27.000000000 +0200
@@ -26,6 +26,7 @@
#include "apr_hash.h"
#include "apr_thread_mutex.h"
#include "apr_lib.h"
+#include "apr_atomic.h"
#include "apu_internal.h"
#include "apr_dbd_internal.h"
@@ -33,6 +34,7 @@
#include "apu_version.h"
static apr_hash_t *drivers = NULL;
+static apr_uint32_t initialised = 0, in_init = 1;
#define CLEANUP_CAST (apr_status_t (*)(void*))
@@ -90,7 +92,12 @@
apr_status_t ret = APR_SUCCESS;
apr_pool_t *parent;
- if (drivers != NULL) {
+ if (apr_atomic_inc32(&initialised)) {
+ apr_atomic_set32(&initialised, 1); /* prevent wrap-around */
+
+ while (apr_atomic_read32(&in_init)) /* wait until we get fully inited */
+ ;
+
return APR_SUCCESS;
}
@@ -141,6 +148,8 @@
apr_pool_cleanup_register(pool, NULL, apr_dbd_term,
apr_pool_cleanup_null);
+ apr_atomic_dec32(&in_init);
+
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/dbd/apr_dbd_pgsql.c new/apr-util-1.3.8/dbd/apr_dbd_pgsql.c
--- old/apr-util-1.3.7/dbd/apr_dbd_pgsql.c 2009-06-03 16:56:02.000000000 +0200
+++ new/apr-util-1.3.8/dbd/apr_dbd_pgsql.c 2009-06-30 23:41:48.000000000 +0200
@@ -92,7 +92,7 @@
if (TXN_IGNORE_ERRORS(sql->trans)) {
PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -118,7 +118,7 @@
PGresult *res = PQexec(sql->conn,
"ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -136,7 +136,7 @@
PGresult *res = PQexec(sql->conn,
"RELEASE SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -162,7 +162,7 @@
if (TXN_IGNORE_ERRORS(sql->trans)) {
PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -177,7 +177,7 @@
PGresult *res = PQexec(sql->conn,
"ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -195,7 +195,7 @@
PGresult *res = PQexec(sql->conn,
"RELEASE SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -401,7 +401,7 @@
if (TXN_IGNORE_ERRORS(sql->trans)) {
PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -431,7 +431,7 @@
PGresult *res = PQexec(sql->conn,
"ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -449,7 +449,7 @@
PGresult *res = PQexec(sql->conn,
"RELEASE SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -616,7 +616,7 @@
if (TXN_IGNORE_ERRORS(sql->trans)) {
PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -652,7 +652,7 @@
PGresult *res = PQexec(sql->conn,
"ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -670,7 +670,7 @@
PGresult *res = PQexec(sql->conn,
"RELEASE SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -772,7 +772,7 @@
if (TXN_IGNORE_ERRORS(sql->trans)) {
PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -808,7 +808,7 @@
PGresult *res = PQexec(sql->conn,
"ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -827,7 +827,7 @@
PGresult *res = PQexec(sql->conn,
"RELEASE SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -854,7 +854,7 @@
if (TXN_IGNORE_ERRORS(sql->trans)) {
PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -878,7 +878,7 @@
PGresult *res = PQexec(sql->conn,
"ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
@@ -897,7 +897,7 @@
PGresult *res = PQexec(sql->conn,
"RELEASE SAVEPOINT APR_DBD_TXN_SP");
if (res) {
- ret = PQresultStatus(res);
+ int ret = PQresultStatus(res);
PQclear(res);
if (!dbd_pgsql_is_success(ret)) {
sql->trans->errnum = ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/dbm/apr_dbm.c new/apr-util-1.3.8/dbm/apr_dbm.c
--- old/apr-util-1.3.7/dbm/apr_dbm.c 2008-11-21 09:22:35.000000000 +0100
+++ new/apr-util-1.3.8/dbm/apr_dbm.c 2009-06-11 01:55:27.000000000 +0200
@@ -24,6 +24,7 @@
#define APR_WANT_STRFUNC
#include "apr_want.h"
#include "apr_general.h"
+#include "apr_atomic.h"
#include "apu_config.h"
#include "apu.h"
@@ -59,6 +60,7 @@
#if APU_DSO_BUILD
static apr_hash_t *drivers = NULL;
+static apr_uint32_t initialised = 0, in_init = 1;
static apr_status_t dbm_term(void *ptr)
{
@@ -117,8 +119,13 @@
}
else usertype = 1;
- if (!drivers)
- {
+ if (apr_atomic_inc32(&initialised)) {
+ apr_atomic_set32(&initialised, 1); /* prevent wrap-around */
+
+ while (apr_atomic_read32(&in_init)) /* wait until we get fully inited */
+ ;
+ }
+ else {
apr_pool_t *parent;
/* Top level pool scope, need process-scope lifetime */
@@ -133,6 +140,8 @@
apr_pool_cleanup_register(pool, NULL, dbm_term,
apr_pool_cleanup_null);
+
+ apr_atomic_dec32(&in_init);
}
rv = apu_dso_mutex_lock();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/include/apr_memcache.h new/apr-util-1.3.8/include/apr_memcache.h
--- old/apr-util-1.3.7/include/apr_memcache.h 2007-10-23 01:22:48.000000000 +0200
+++ new/apr-util-1.3.8/include/apr_memcache.h 2009-06-30 21:34:01.000000000 +0200
@@ -260,10 +260,9 @@
* @param values hash of keys and values that this key will be added to
* @return
*/
-APU_DECLARE(void)
-apr_memcache_add_multget_key(apr_pool_t *data_pool,
- const char* key,
- apr_hash_t **values);
+APU_DECLARE(void) apr_memcache_add_multget_key(apr_pool_t *data_pool,
+ const char* key,
+ apr_hash_t **values);
/**
* Gets multiple values from the server, allocating the values out of p
@@ -275,11 +274,10 @@
* result of the multiget call.
* @return
*/
-APU_DECLARE(apr_status_t)
-apr_memcache_multgetp(apr_memcache_t *mc,
- apr_pool_t *temp_pool,
- apr_pool_t *data_pool,
- apr_hash_t *values);
+APU_DECLARE(apr_status_t) apr_memcache_multgetp(apr_memcache_t *mc,
+ apr_pool_t *temp_pool,
+ apr_pool_t *data_pool,
+ apr_hash_t *values);
/**
* Sets a value by key on the server
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/include/apr_queue.h new/apr-util-1.3.8/include/apr_queue.h
--- old/apr-util-1.3.7/include/apr_queue.h 2007-01-15 20:00:58.000000000 +0100
+++ new/apr-util-1.3.8/include/apr_queue.h 2009-06-14 23:48:03.000000000 +0200
@@ -57,13 +57,13 @@
apr_pool_t *a);
/**
- * push/add a object to the queue, blocking if the queue is already full
+ * push/add an object to the queue, blocking if the queue is already full
*
* @param queue the queue
* @param data the data
* @returns APR_EINTR the blocking was interrupted (try again)
* @returns APR_EOF the queue has been terminated
- * @returns APR_SUCCESS on a successfull push
+ * @returns APR_SUCCESS on a successful push
*/
APU_DECLARE(apr_status_t) apr_queue_push(apr_queue_t *queue, void *data);
@@ -74,31 +74,31 @@
* @param data the data
* @returns APR_EINTR the blocking was interrupted (try again)
* @returns APR_EOF if the queue has been terminated
- * @returns APR_SUCCESS on a successfull pop
+ * @returns APR_SUCCESS on a successful pop
*/
APU_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data);
/**
- * push/add a object to the queue, returning immediatly if the queue is full
+ * push/add an object to the queue, returning immediately if the queue is full
*
* @param queue the queue
* @param data the data
* @returns APR_EINTR the blocking operation was interrupted (try again)
* @returns APR_EAGAIN the queue is full
* @returns APR_EOF the queue has been terminated
- * @returns APR_SUCCESS on a successfull push
+ * @returns APR_SUCCESS on a successful push
*/
APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data);
/**
- * pop/get an object to the queue, returning immediatly if the queue is empty
+ * pop/get an object to the queue, returning immediately if the queue is empty
*
* @param queue the queue
* @param data the data
* @returns APR_EINTR the blocking operation was interrupted (try again)
* @returns APR_EAGAIN the queue is empty
* @returns APR_EOF the queue has been terminated
- * @returns APR_SUCCESS on a successfull push
+ * @returns APR_SUCCESS on a successful push
*/
APU_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data);
@@ -120,7 +120,7 @@
APU_DECLARE(apr_status_t) apr_queue_interrupt_all(apr_queue_t *queue);
/**
- * terminate all queue, sendinging a interupt to all the
+ * terminate the queue, sending an interrupt to all the
* blocking threads
*
* @param queue the queue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/include/apr_reslist.h new/apr-util-1.3.8/include/apr_reslist.h
--- old/apr-util-1.3.7/include/apr_reslist.h 2008-08-08 06:36:03.000000000 +0200
+++ new/apr-util-1.3.8/include/apr_reslist.h 2009-06-14 23:48:03.000000000 +0200
@@ -78,7 +78,7 @@
* @param con Constructor routine that is called to create a new resource.
* @param de Destructor routine that is called to destroy an expired resource.
* @param params Passed to constructor and deconstructor
- * @param pool The pool from which to create this resoure list. Also the
+ * @param pool The pool from which to create this resource list. Also the
* same pool that is passed to the constructor and destructor
* routines.
* @warning If you're creating a sub-pool of the pool passed into this
@@ -130,7 +130,7 @@
* Set the timeout the acquire will wait for a free resource
* when the maximum number of resources is exceeded.
* @param reslist The resource list.
- * @param timeout Timeout to wait. The zero waits forewer.
+ * @param timeout Timeout to wait. The zero waits forever.
*/
APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist,
apr_interval_time_t timeout);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/include/apu_version.h new/apr-util-1.3.8/include/apu_version.h
--- old/apr-util-1.3.7/include/apu_version.h 2009-06-03 18:08:37.000000000 +0200
+++ new/apr-util-1.3.8/include/apu_version.h 2009-07-02 04:59:27.000000000 +0200
@@ -59,7 +59,7 @@
* The Patch Level never includes API changes, simply bug fixes.
* Reset to 0 when upgrading APR_MINOR_VERSION
*/
-#define APU_PATCH_VERSION 7
+#define APU_PATCH_VERSION 8
/**
* The symbol APU_IS_DEV_VERSION is only defined for internal,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/libaprutil.rc new/apr-util-1.3.8/libaprutil.rc
--- old/apr-util-1.3.7/libaprutil.rc 2008-05-30 16:48:08.000000000 +0200
+++ new/apr-util-1.3.8/libaprutil.rc 2009-07-02 04:58:09.000000000 +0200
@@ -1,6 +1,6 @@
#include "apu_version.h"
-#define APU_COPYRIGHT "Copyright (c) 2008 The Apache Software " \
+#define APU_COPYRIGHT "Copyright (c) 2009 The Apache Software " \
"Foundation or its licensors, as applicable."
#define APU_LICENSE \
@@ -54,7 +54,7 @@
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", APU_LICENSE "\0"
+ VALUE "Comments", APU_LICENSE "\0"
VALUE "CompanyName", "Apache Software Foundation\0"
VALUE "FileDescription", APU_DLL_DESCRIPTION "\0"
VALUE "FileVersion", APU_VERSION_STRING "\0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/misc/apr_queue.c new/apr-util-1.3.8/misc/apr_queue.c
--- old/apr-util-1.3.7/misc/apr_queue.c 2007-01-15 20:00:58.000000000 +0100
+++ new/apr-util-1.3.8/misc/apr_queue.c 2009-06-30 23:41:48.000000000 +0200
@@ -202,9 +202,9 @@
}
/**
- * Push new data onto the queue. Blocks if the queue is full. Once
- * the push operation has completed, it signals other threads waiting
- * in apr_queue_pop() that they may continue consuming sockets.
+ * Push new data onto the queue. If the queue is full, return APR_EAGAIN. If
+ * the push operation completes successfully, it signals other threads
+ * waiting in apr_queue_pop() that they may continue consuming sockets.
*/
APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/misc/apu_dso.c new/apr-util-1.3.8/misc/apu_dso.c
--- old/apr-util-1.3.7/misc/apu_dso.c 2008-11-21 03:33:23.000000000 +0100
+++ new/apr-util-1.3.8/misc/apu_dso.c 2009-06-11 01:55:27.000000000 +0200
@@ -27,6 +27,7 @@
#include "apr_hash.h"
#include "apr_file_io.h"
#include "apr_env.h"
+#include "apr_atomic.h"
#include "apu_internal.h"
#include "apu_version.h"
@@ -37,6 +38,7 @@
static apr_thread_mutex_t* mutex = NULL;
#endif
static apr_hash_t *dsos = NULL;
+static apr_uint32_t initialised = 0, in_init = 1;
#if APR_HAS_THREADS
apr_status_t apu_dso_mutex_lock()
@@ -76,7 +78,12 @@
apr_pool_t *global;
apr_pool_t *parent;
- if (dsos != NULL) {
+ if (apr_atomic_inc32(&initialised)) {
+ apr_atomic_set32(&initialised, 1); /* prevent wrap-around */
+
+ while (apr_atomic_read32(&in_init)) /* wait until we get fully inited */
+ ;
+
return APR_SUCCESS;
}
@@ -94,6 +101,8 @@
apr_pool_cleanup_register(global, NULL, apu_dso_term,
apr_pool_cleanup_null);
+ apr_atomic_dec32(&in_init);
+
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/test/NWGNUmakefile new/apr-util-1.3.8/test/NWGNUmakefile
--- old/apr-util-1.3.7/test/NWGNUmakefile 2007-02-01 00:52:30.000000000 +0100
+++ new/apr-util-1.3.8/test/NWGNUmakefile 2009-07-01 19:39:27.000000000 +0200
@@ -63,7 +63,6 @@
XLFLAGS += \
$(EOLIST)
-
endif
ifeq "$(RELEASE)" "noopt"
@@ -99,7 +98,7 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =
+NLM_NAME =
#
# This is used by the link '-desc ' directive.
@@ -123,7 +122,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -148,14 +147,14 @@
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS =
+NLM_FLAGS =
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -166,7 +165,7 @@
#
TARGET_nlm = \
$(OBJDIR)/aputest.nlm \
- $(OBJDIR)/testdate.nlm \
+ $(OBJDIR)/aputest.nlm \
$(EOLIST)
#
# If there is an LIB target, put it here
@@ -179,14 +178,14 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(EOLIST)
+ $(EOLIST)
#
# These are the LIB files needed to create the NLM target above.
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- $(EOLIST)
+ $(EOLIST)
#
# These are the modules that the above NLM target depends on to load.
@@ -194,7 +193,7 @@
#
FILES_nlm_modules = \
aprlib \
- $(EOLIST)
+ $(EOLIST)
#
# If the nlm has a msg file, put it's path here
@@ -215,14 +214,14 @@
# Any additional imports go here
#
FILES_nlm_Ximports = \
- $(EOLIST)
+ $(EOLIST)
#
# Any symbols exported to here
#
FILES_nlm_exports = \
$(EOLIST)
-
+
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apr-util-1.3.7/test/nwgnuaputest new/apr-util-1.3.8/test/nwgnuaputest
--- old/apr-util-1.3.7/test/nwgnuaputest 2005-01-15 16:42:50.000000000 +0100
+++ new/apr-util-1.3.8/test/nwgnuaputest 2009-07-01 19:39:27.000000000 +0200
@@ -91,12 +91,12 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =aputest
+NLM_NAME = aputest
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = NLM is to test the apu layer
+NLM_DESCRIPTION = NLM is to test the apu layer
#
# This is used by the '-threadname' directive. If left blank,
@@ -114,7 +114,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -139,14 +139,14 @@
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -172,15 +172,24 @@
FILES_nlm_objs = \
$(OBJDIR)/abts.o \
- $(OBJDIR)/teststrmatch.o \
- $(OBJDIR)/testuri.o \
- $(OBJDIR)/testuuid.o \
$(OBJDIR)/testbuckets.o \
- $(OBJDIR)/testpass.o \
+ $(OBJDIR)/testdate.o \
+ $(OBJDIR)/testdbd.o \
+ $(OBJDIR)/testdbm.o \
+ $(OBJDIR)/testldap.o \
+ $(OBJDIR)/testmemcache.o \
$(OBJDIR)/testmd4.o \
$(OBJDIR)/testmd5.o \
- $(OBJDIR)/testldap.o \
+ $(OBJDIR)/testpass.o \
+ $(OBJDIR)/testqueue.o \
+ $(OBJDIR)/testreslist.o \
+ $(OBJDIR)/testrmm.o \
+ $(OBJDIR)/teststrmatch.o \
+ $(OBJDIR)/testuri.o \
+ $(OBJDIR)/testuuid.o \
$(OBJDIR)/testutil.o \
+ $(OBJDIR)/testxlate.o \
+ $(OBJDIR)/testxml.o \
$(OBJDIR)/nw_misc.o \
$(EOLIST)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
