diff options
| author | Petr Menšík <pemensik@redhat.com> | 2017-01-18 17:22:50 +0100 |
|---|---|---|
| committer | Petr Menšík <pemensik@redhat.com> | 2017-01-18 17:22:50 +0100 |
| commit | 3d5ea105bd877f0069452e450320f8877b01cb52 (patch) | |
| tree | 5038acc4c7a98bada705d5e61bcd9c7484258ba9 | |
| parent | fdce4eb560cfd32f092793dd2ebb5bb96bc59b40 (diff) | |
| download | bind-3d5ea105bd877f0069452e450320f8877b01cb52.tar.gz bind-3d5ea105bd877f0069452e450320f8877b01cb52.tar.xz bind-3d5ea105bd877f0069452e450320f8877b01cb52.zip | |
RTLD_DEEPBIND conflicts with pkcs11 libraries, skip it for dyndb (#1410433)
Signed-off-by: Petr Menšík <pemensik@redhat.com>
| -rw-r--r-- | bind-9.11-rh1410433.patch | 14 | ||||
| -rw-r--r-- | bind.spec | 9 |
2 files changed, 21 insertions, 2 deletions
diff --git a/bind-9.11-rh1410433.patch b/bind-9.11-rh1410433.patch new file mode 100644 index 0000000..b7fdc48 --- /dev/null +++ b/bind-9.11-rh1410433.patch @@ -0,0 +1,14 @@ +diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c +index 0ce5e42..556d920 100644 +--- a/lib/dns/dyndb.c ++++ b/lib/dns/dyndb.c +@@ -130,9 +130,6 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname, + instname, filename); + + flags = RTLD_NOW|RTLD_LOCAL; +-#ifdef RTLD_DEEPBIND +- flags |= RTLD_DEEPBIND; +-#endif + + handle = dlopen(filename, flags); + if (handle == NULL) @@ -25,7 +25,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: MPLv2.0 Version: 9.11.0 -Release: 5%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} +Release: 6%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,6 +81,7 @@ Patch136:bind-9.10-dist-native-pkcs11.patch Patch137:bind-9.10-use-of-strlcat.patch Patch138:bind-9.10-openssl-1.1.patch Patch139:bind-9.11-docbook-xsl.patch +Patch140:bind-9.11-rh1410433.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -319,7 +320,8 @@ This package provides a module which allows commands to be sent to rndc directly %patch130 -p1 -b .libdb %patch131 -p1 -b .multlib-conflict %patch138 -p1 -b .rh1390238 -%patch139 -p1 -b docbook-xsl +%patch139 -p1 -b .rh1397186 +%patch140 -p1 -b .rh1410433 %if %{PKCS11} cp -r bin/named{,-pkcs11} @@ -1020,6 +1022,9 @@ rm -rf ${RPM_BUILD_ROOT} %{python3_sitelib}/isc/__pycache__/*py* %changelog +* Wed Jan 18 2017 Petr Menšík <pemensik@redhat.com> - 32:9.11.0-6.P2 +- RTLD_DEEPBIND conflicts with pkcs11 libraries, skip it for dyndb (#1410433) + * Mon Jan 16 2017 Petr Menšík <pemensik@redhat.com> - 32:9.11.0-5.P2 - Fix manual pages generated by recent docbook-style-xsl (#1397186) |