From 28b64a56213a60fed31cbd5aa8a3b6f6f7ab8b9c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 20 2020 14:39:23 +0000
Subject: import apr-1.4.8-6.el7


---

diff --git a/SOURCES/apr-1.4.8-deepbind.patch b/SOURCES/apr-1.4.8-deepbind.patch
new file mode 100644
index 0000000..28f1c81
--- /dev/null
+++ b/SOURCES/apr-1.4.8-deepbind.patch
@@ -0,0 +1,11 @@
+--- apr-1.4.8/dso/unix/dso.c.deepbind
++++ apr-1.4.8/dso/unix/dso.c
+@@ -123,7 +123,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] == ')')
diff --git a/SPECS/apr.spec b/SPECS/apr.spec
index 06c9023..70d63c6 100644
--- a/SPECS/apr.spec
+++ b/SPECS/apr.spec
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.4.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 # ASL 2.0: everything
 # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c
 # BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c,
@@ -23,6 +23,7 @@ Patch3: apr-1.2.2-libdir.patch
 Patch4: apr-1.2.7-pkgconf.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1656482
 Patch5: apr-1.4.8-r1561395.patch
+Patch6: apr-1.4.8-deepbind.patch
 #security patches
 Patch10: apr-1.4.8-CVE-2017-12613.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -54,6 +55,7 @@ C data structures and routines.
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .pkgconf
 %patch5 -p1 -b .r1561395
+%patch6 -p1 -b .deepbind
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1506523
 %patch10 -p1 -b .CVE-2017-12613
@@ -136,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Apr  1 2020 Joe Orton <jorton@redhat.com> - 1.4.8-6
+- use RTLD_DEEPBIND in apr_dso_open() (#1739287)
+
 * Thu Mar 21 2019 Joe Orton <jorton@redhat.com> - 1.4.8-5
 - improve key generation for name-based apr_shm_create() (r1561395, #1656482)