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-11-03 07:05:23 -05:00 committed by Andrew Lukoshko
parent c49a31ccee
commit 0f202bd78f
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SOURCES/apr-1.4.8-deepbind.patch Normal file
View File

@ -0,0 +1,24 @@
--- apr-1.4.8/dso/unix/dso.c.deepbind
+++ apr-1.4.8/dso/unix/dso.c
@@ -38,6 +38,8 @@
#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
int flags = RTLD_NOW | RTLD_GLOBAL;
void *os_handle;
+
+ if (use_deepbind == 0)
+ use_deepbind = getenv("APR_DEEPBIND") != NULL ? 1 : -1;
+ if (use_deepbind == 1)
+ flags |= RTLD_DEEPBIND;
+
#ifdef _AIX
if (strchr(path + 1, '(') && path[strlen(path) - 1] == ')')
{

10
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: 9%{?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,
@ -23,6 +23,7 @@ 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
Patch5: apr-rh1539844.patch Patch5: apr-rh1539844.patch
Patch6: apr-1.4.8-deepbind.patch
BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3-devel BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3-devel
# To enable SCTP support # To enable SCTP support
BuildRequires: lksctp-tools-devel BuildRequires: lksctp-tools-devel
@ -52,6 +53,7 @@ C data structures and routines.
%patch3 -p1 -b .libdir %patch3 -p1 -b .libdir
%patch4 -p1 -b .pkgconf %patch4 -p1 -b .pkgconf
%patch5 -p1 -b .rh1539844 %patch5 -p1 -b .rh1539844
%patch6 -p1 -b .deepbind
%build %build
# regenerate configure script etc. # regenerate configure script etc.
@ -139,6 +141,12 @@ 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
- use RTLD_DEEPBIND in apr_dso_open() (#1819607)
* Fri Feb 1 2019 Joe Orton <jorton@redhat.com> - 1.6.3-9 * Fri Feb 1 2019 Joe Orton <jorton@redhat.com> - 1.6.3-9
- package install.sh, gen-build.py and config.* in -devel (#1669589) - package install.sh, gen-build.py and config.* in -devel (#1669589)