remove deepbind patch, should no longer be necessary

This commit is contained in:
Joe Orton 2011-10-13 12:27:15 +01:00
parent b0c4b36843
commit 7b5ff1143e
2 changed files with 4 additions and 19 deletions

View File

@ -1,16 +0,0 @@
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] == ')')

View File

@ -6,13 +6,12 @@
Summary: Apache Portable Runtime library Summary: Apache Portable Runtime library
Name: apr Name: apr
Version: 1.4.5 Version: 1.4.5
Release: 1%{?dist} Release: 2%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://apr.apache.org/ URL: http://apr.apache.org/
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
Source1: apr-wrapper.h Source1: apr-wrapper.h
Patch1: apr-0.9.7-deepbind.patch
Patch2: apr-1.2.2-locktimeout.patch Patch2: apr-1.2.2-locktimeout.patch
Patch3: apr-1.2.2-libdir.patch Patch3: apr-1.2.2-libdir.patch
Patch4: apr-1.2.7-pkgconf.patch Patch4: apr-1.2.7-pkgconf.patch
@ -41,7 +40,6 @@ C data structures and routines.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .deepbind
%patch2 -p1 -b .locktimeout %patch2 -p1 -b .locktimeout
%patch3 -p1 -b .libdir %patch3 -p1 -b .libdir
%patch4 -p1 -b .pkgconf %patch4 -p1 -b .pkgconf
@ -125,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%changelog %changelog
* Thu Oct 13 2011 Joe Orton <jorton@redhat.com> - 1.4.5-2
- remove deepbind patch, should no longer be necessary
* Fri May 20 2011 Bojan Smojver <bojan@rexursive.com> - 1.4.5-1 * Fri May 20 2011 Bojan Smojver <bojan@rexursive.com> - 1.4.5-1
- bump up to 1.4.5 - bump up to 1.4.5