diff options
| author | Petr Menšík <pemensik@redhat.com> | 2017-10-31 17:11:44 +0100 |
|---|---|---|
| committer | Petr Menšík <pemensik@redhat.com> | 2017-10-31 17:11:44 +0100 |
| commit | 4d8c7099754496dfb0ed8143d51cb819346a07b2 (patch) | |
| tree | 1be65fb5ed4634dc3d2c090a7e7755d30cd071fe | |
| parent | 4645641491d4c221280db3e3f6e1fcd3d92b2453 (diff) | |
| download | bind-4d8c7099754496dfb0ed8143d51cb819346a07b2.tar.gz bind-4d8c7099754496dfb0ed8143d51cb819346a07b2.tar.xz bind-4d8c7099754496dfb0ed8143d51cb819346a07b2.zip | |
Fix dynamic symbols conflict with ldap (#1205168)
| -rw-r--r-- | bind-9.11-rh1205168.patch | 120 | ||||
| -rw-r--r-- | bind.spec | 3 |
2 files changed, 123 insertions, 0 deletions
diff --git a/bind-9.11-rh1205168.patch b/bind-9.11-rh1205168.patch new file mode 100644 index 0000000..181cec9 --- /dev/null +++ b/bind-9.11-rh1205168.patch @@ -0,0 +1,120 @@ +From 90416594843a56550e40b11561807786219ce1c4 Mon Sep 17 00:00:00 2001 +From: Evan Hunt <each@isc.org> +Date: Mon, 11 Sep 2017 15:01:36 -0700 +Subject: [PATCH] remap getaddrinfo() to irs_getgetaddrinfo() + +The libirs version of getaddrinfo() cannot be called from within BIND9. + +fix prototypes +--- + lib/irs/include/irs/netdb.h.in | 94 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 94 insertions(+) + +diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in +index 23dcd37..f36113d 100644 +--- a/lib/irs/include/irs/netdb.h.in ++++ b/lib/irs/include/irs/netdb.h.in +@@ -150,6 +150,100 @@ struct addrinfo { + #define NI_DGRAM 0x00000010 + + /* ++ * Define to map into irs_ namespace. ++ */ ++ ++#define IRS_NAMESPACE ++ ++#ifdef IRS_NAMESPACE ++ ++/* ++ * Use our versions not the ones from the C library. ++ */ ++ ++#ifdef getnameinfo ++#undef getnameinfo ++#endif ++#define getnameinfo irs_getnameinfo ++ ++#ifdef getaddrinfo ++#undef getaddrinfo ++#endif ++#define getaddrinfo irs_getaddrinfo ++ ++#ifdef freeaddrinfo ++#undef freeaddrinfo ++#endif ++#define freeaddrinfo irs_freeaddrinfo ++ ++#ifdef gai_strerror ++#undef gai_strerror ++#endif ++#define gai_strerror irs_gai_strerror ++ ++#endif ++ ++extern int getaddrinfo (const char *name, ++ const char *service, ++ const struct addrinfo *req, ++ struct addrinfo **pai); ++extern int getnameinfo (const struct sockaddr *sa, ++ socklen_t salen, char *host, ++ socklen_t hostlen, char *serv, ++ socklen_t servlen, int flags); ++extern void freeaddrinfo (struct addrinfo *ai); ++extern const char *gai_strerror (int ecode); ++ ++/* ++ * Define to map into irs_ namespace. ++ */ ++ ++#define IRS_NAMESPACE ++ ++#ifdef IRS_NAMESPACE ++ ++/* ++ * Use our versions not the ones from the C library. ++ */ ++ ++#ifdef getnameinfo ++#undef getnameinfo ++#endif ++#define getnameinfo irs_getnameinfo ++ ++#ifdef getaddrinfo ++#undef getaddrinfo ++#endif ++#define getaddrinfo irs_getaddrinfo ++ ++#ifdef freeaddrinfo ++#undef freeaddrinfo ++#endif ++#define freeaddrinfo irs_freeaddrinfo ++ ++#ifdef gai_strerror ++#undef gai_strerror ++#endif ++#define gai_strerror irs_gai_strerror ++ ++int ++getaddrinfo(const char *hostname, const char *servname, ++ const struct addrinfo *hints, struct addrinfo **res); ++ ++int ++getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen, ++ char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen, ++ char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen, ++ IRS_GETNAMEINFO_FLAGS_T flags); ++ ++void freeaddrinfo (struct addrinfo *ai); ++ ++IRS_GAISTRERROR_RETURN_T ++gai_strerror(int ecode); ++ ++#endif ++ ++/* + * Tell Emacs to use C mode on this file. + * Local variables: + * mode: c +-- +2.9.5 + @@ -85,6 +85,7 @@ Patch140:bind-9.11-rh1410433.patch Patch142:bind-9.11-dlz-mysql.patch Patch143:bind-9.11-dlz-mysql-modules.patch Patch144:bind-9.11-rh1484451.patch +Patch145:bind-9.11-rh1205168.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -383,6 +384,7 @@ This package provides a module which allows commands to be sent to rndc directly %patch142 -p1 -b .mysql_config %patch143 -p1 -b .mysql_modules %patch144 -p1 -b .rh1484451 +%patch145 -p1 -b .rh1205168 %if %{PKCS11} cp -r bin/named{,-pkcs11} @@ -1155,6 +1157,7 @@ rm -rf ${RPM_BUILD_ROOT} * Mon Oct 23 2017 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-2 - build against mariadb-connector-c-devel (#1493615) - include DNSKEY 20326 also in trusted-key.key (#1505476) +- Fix dynamic symbols conflict with ldap (#1205168) * Wed Aug 02 2017 Petr Menšík <pemensik@redhat.com> - 32:9.11.2-1 - Update to 9.11.2 |