From 34952bd665f3fce183d121b9931e3f1563e30ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Sat, 28 Jan 2023 11:41:04 +0100 Subject: [PATCH] Support for BIND 9.18.11 (#2164395) --- bind-dyndb-ldap-11.10-bind-9.18.11.patch | 38 ++++++++++++++++++++++++ bind-dyndb-ldap.spec | 6 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 bind-dyndb-ldap-11.10-bind-9.18.11.patch diff --git a/bind-dyndb-ldap-11.10-bind-9.18.11.patch b/bind-dyndb-ldap-11.10-bind-9.18.11.patch new file mode 100644 index 0000000..50f4858 --- /dev/null +++ b/bind-dyndb-ldap-11.10-bind-9.18.11.patch @@ -0,0 +1,38 @@ +From 282b1c9ea58cc0f2337a72912808505e5f540d5a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= +Date: Sat, 28 Jan 2023 11:32:05 +0100 +Subject: [PATCH] Minimal change to compile with BIND 9.18.11 + +DSCP codes are not working and their support were removed from BIND9. Do +not require them to be present. +--- + src/fwd.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/fwd.c b/src/fwd.c +index 24f6e53..10ec848 100644 +--- a/src/fwd.c ++++ b/src/fwd.c +@@ -198,7 +198,9 @@ fwd_print_list_buff(isc_mem_t *mctx, dns_forwarders_t *fwdrs, + INSIST((fwdr_int == NULL) == (fwdr_cfg == NULL)), fwdr_int != NULL; + fwdr_int = ISC_LIST_NEXT(fwdr_int, link), fwdr_cfg = cfg_list_next(fwdr_cfg)) { + fwdr_cfg->obj->value.sockaddrdscp.sockaddr = fwdr_int->addr; ++#if LIBDNS_VERSION_MAJOR < 1811 + fwdr_cfg->obj->value.sockaddrdscp.dscp = fwdr_int->dscp; ++#endif + } + cfg_print(faddresses, buffer_append_str, &tmp_buf); + +@@ -281,7 +283,9 @@ fwd_parse_str(const char *fwdrs_str, isc_mem_t *mctx, + isc_sockaddr_setport(&addr, port); + fwdr = isc_mem_get(mctx, sizeof(*(fwdr))); + fwdr->addr = addr; ++#if LIBDNS_VERSION_MAJOR < 1811 + fwdr->dscp = cfg_obj_getdscp(fwdr_cfg); ++#endif + ISC_LINK_INIT(fwdr, link); + ISC_LIST_APPEND(*fwdrs, fwdr, link); + } +-- +2.39.1 + diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec index 1438465..521c08e 100644 --- a/bind-dyndb-ldap.spec +++ b/bind-dyndb-ldap.spec @@ -12,7 +12,7 @@ Name: bind-dyndb-ldap Version: 11.10 -Release: 10%{?dist} +Release: 11%{?dist} Summary: LDAP back-end plug-in for BIND License: GPLv2+ @@ -27,6 +27,7 @@ Patch1: bind-dyndb-ldap-bind-9.18.10-db-options.patch Patch2: bind-dyndb-ldap-bind-9.18.10-logs.patch # https://pagure.io/bind-dyndb-ldap/c/5dd2fefa0bc7cd7689004cec64304c3a02be9eab Patch3: bind-dyndb-ldap-bind-9.18.10-staleok.patch +Patch4: bind-dyndb-ldap-11.10-bind-9.18.11.patch BuildRequires: bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version} BuildRequires: krb5-devel @@ -122,6 +123,9 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf %changelog +* Sat Jan 28 2023 Petr Menšík - 11.10-11 +- Support for BIND 9.18.11 (#2164395) + * Wed Jan 18 2023 Fedora Release Engineering - 11.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild