rpms/apr-util/devel apr-util-1.2.6-ldap.patch, NONE, 1.1 apr-util.spec, 1.24, 1.25 sources, 1.6, 1.7 upstream, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24003

Modified Files:
	apr-util.spec sources upstream 
Added Files:
	apr-util-1.2.6-ldap.patch 
Log Message:
* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-2
- update to 1.2.6
- define LDAP_DEPRECATED in apr_ldap.h (r391985, #188073)


apr-util-1.2.6-ldap.patch:
 apr_ldap.h.in |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE apr-util-1.2.6-ldap.patch ---
Author: jorton
Date: Thu Apr  6 06:44:59 2006
New Revision: 391985

URL: http://svn.apache.org/viewcvs?rev=391985&view=rev
Log:
* include/apr_ldap.h.in: For OpenLDAP, before including <ldap.h>,
define LDAP_DEPRECATED to 1 if it is not already defined.  Fixes use
of OpenLDAP 2.3, which by default hides the ldap_init() etc
prototypes, which can have rather catastrophic effects at runtime.
(since the compiler presumes ldap_init() returns int and discards the
top half of the LDAP * pointer value on 64-bit platforms)

Modified:
    apr/apr-util/trunk/include/apr_ldap.h.in

--- apr-util-1.2.6/include/apr_ldap.h.in.ldap
+++ apr-util-1.2.6/include/apr_ldap.h.in
@@ -59,6 +59,12 @@
 #define APR_HAS_LDAP_SSL 1
 #define APR_HAS_LDAP_URL_PARSE      0
 
+#if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
+/* Ensure that the "deprecated" interfaces are still exposed
+ * with OpenLDAP >= 2.3; these were exposed by default in earlier
+ * releases. */
+#define LDAP_DEPRECATED 1
+#endif
 
 /*
  * Include the standard LDAP header files.


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apr-util.spec	11 Feb 2006 01:37:34 -0000	1.24
+++ apr-util.spec	6 Apr 2006 14:22:22 -0000	1.25
@@ -3,13 +3,14 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.2
-Release: 4.2
+Version: 1.2.6
+Release: 2
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 Patch0: apr-util-1.2.2-exports.patch
+Patch1: apr-util-1.2.6-ldap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .exports
+%patch1 -p1 -b .ldap
 
 %build
 autoheader && autoconf
@@ -46,6 +48,7 @@
         --includedir=%{_includedir}/apr-%{apuver} \
         --with-ldap --without-gdbm \
         --with-sqlite3 --with-pgsql \
+        --with-berkeley-db \
         --without-sqlite2
 make %{?_smp_mflags} && make dox
 
@@ -101,6 +104,10 @@
 %doc --parents html
 
 %changelog
+* Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-2
+- update to 1.2.6
+- define LDAP_DEPRECATED in apr_ldap.h (r391985, #188073)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-4.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Dec 2005 09:54:51 -0000	1.6
+++ sources	6 Apr 2006 14:22:22 -0000	1.7
@@ -1 +1 @@
-8b3f04dde7048946c3c94f85b4debb94  apr-util-1.2.2.tar.gz
+f8f17dd6bd17926ab2b03767f1f3a1fc  apr-util-1.2.6.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/upstream,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- upstream	2 Dec 2005 09:54:51 -0000	1.4
+++ upstream	6 Apr 2006 14:22:22 -0000	1.5
@@ -1 +1 @@
-apr-util-1.2.2.tar.gz
+apr-util-1.2.6.tar.gz