From dcc978ed73b2c25c830367f6305be8d2ab38e44f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 29 2020 07:04:39 +0000 Subject: import apr-1.4.8-7.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..7925c6e --- /dev/null +++ b/SOURCES/apr-1.4.8-deepbind.patch @@ -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] == ')') + { diff --git a/SPECS/apr.spec b/SPECS/apr.spec index 06c9023..27ea8fe 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: 7%{?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,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Thu Jun 11 2020 Joe Orton - 1.4.8-7 +- only enable RTLD_DEEPBIND if $APR_DEEPBIND is set in env (#1846353) + +* Wed Apr 1 2020 Joe Orton - 1.4.8-6 +- use RTLD_DEEPBIND in apr_dso_open() (#1739287) + * Thu Mar 21 2019 Joe Orton - 1.4.8-5 - improve key generation for name-based apr_shm_create() (r1561395, #1656482)