rpms/apr
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import apr-1.6.3-11.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-07-14 01:06:24 +00:00 committed by Andrew Lukoshko
parent faa3b7e20f
commit aaff110948
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SOURCES/apr-1.4.8-deepbind.patch
View File

@ -1,11 +1,24 @@
--- apr-1.4.8/dso/unix/dso.c.deepbind --- apr-1.4.8/dso/unix/dso.c.deepbind
+++ apr-1.4.8/dso/unix/dso.c +++ apr-1.4.8/dso/unix/dso.c
@@ -123,7 +123,7 @@ @@ -38,6 +38,8 @@
void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL); #define DYLD_LIBRARY_HANDLE (void *)-1
#endif
+static int use_deepbind; /* 0 = unset, 1 = use DEEPBIND, -1, don't use DEEPBIND */
+
APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
apr_os_dso_handle_t osdso,
apr_pool_t *pool)
@@ -125,6 +127,12 @@
#else #else
- int flags = RTLD_NOW | RTLD_GLOBAL; int flags = RTLD_NOW | RTLD_GLOBAL;
+ int flags = RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND;
void *os_handle; void *os_handle;
+
+ if (use_deepbind == 0)
+ use_deepbind = getenv("APR_DEEPBIND") != NULL ? 1 : -1;
+ if (use_deepbind == 1)
+ flags |= RTLD_DEEPBIND;
+
#ifdef _AIX #ifdef _AIX
if (strchr(path + 1, '(') && path[strlen(path) - 1] == ')') if (strchr(path + 1, '(') && path[strlen(path) - 1] == ')')
{

5
SPECS/apr.spec
View File

@ -6,7 +6,7 @@
Summary: Apache Portable Runtime library Summary: Apache Portable Runtime library
Name: apr Name: apr
Version: 1.6.3 Version: 1.6.3
Release: 10%{?dist} Release: 11%{?dist}
# ASL 2.0: everything # ASL 2.0: everything
# ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
# BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c, # BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c,
@ -141,6 +141,9 @@ popd
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%changelog %changelog
* Thu Jun 11 2020 Joe Orton <jorton@redhat.com> - 1.6.3-11
- only enable RTLD_DEEPBIND if $APR_DEEPBIND is set in env (#1845912)
* Thu May 28 2020 Joe Orton <jorton@redhat.com> - 1.6.3-10 * Thu May 28 2020 Joe Orton <jorton@redhat.com> - 1.6.3-10
- use RTLD_DEEPBIND in apr_dso_open() (#1819607) - use RTLD_DEEPBIND in apr_dso_open() (#1819607)