rpms/apr/devel apr-0.9.7-deepbind.patch, NONE, 1.1 apr.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: jorton

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

Modified Files:
	apr.spec 
Added Files:
	apr-0.9.7-deepbind.patch 
Log Message:
* Thu Nov 24 2005 Joe Orton <jorton at redhat.com> 0.9.7-3
- use RTLD_DEEPBIND in apr_dso_open by default


apr-0.9.7-deepbind.patch:
 dso.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE apr-0.9.7-deepbind.patch ---

Use RTLD_DEEPBIND by default.  Should really be done with a 
new function and a caller-specified flag but that got vetoed
upstream, and DEEPBIND is a good default.

--- apr-0.9.7/dso/unix/dso.c.deepbind
+++ apr-0.9.7/dso/unix/dso.c
@@ -122,7 +122,7 @@
     void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
 
 #else
-    int flags = RTLD_NOW | RTLD_GLOBAL;
+    int flags = RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND;
     void *os_handle;
 #ifdef _AIX
     if (strchr(path + 1, '(') && path[strlen(path) - 1] == ')')


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apr.spec	20 Oct 2005 08:57:03 -0000	1.29
+++ apr.spec	24 Nov 2005 16:31:36 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 0.9.7
-Release: 2
+Release: 3
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -17,6 +17,7 @@
 Patch23: apr-0.9.6-readdir64.patch
 Patch26: apr-0.9.6-tcpopts.patch
 Patch27: apr-0.9.6-procexit.patch
+Patch28: apr-0.9.7-deepbind.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
 Conflicts: subversion < 0.20.1-2
@@ -51,6 +52,7 @@
 %patch23 -p1 -b .readdir64
 %patch26 -p1 -b .tcpopts
 %patch27 -p1 -b .procexit
+%patch28 -p1 -b .deepbind
 
 %build
 # regenerate configure script etc.
@@ -123,6 +125,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Thu Nov 24 2005 Joe Orton <jorton at redhat.com> 0.9.7-3
+- use RTLD_DEEPBIND in apr_dso_open by default
+
 * Thu Oct 20 2005 Joe Orton <jorton at redhat.com> 0.9.7-2
 - update to 0.9.7