[Pkg-freeipa-devel] [Git][freeipa-team/bind-dyndb-ldap][master] 2 commits: Import patch from https://pagure.io/bind-dyndb-ldap/pull-request/218

[Timo Aaltonen (@tjaalton)]

Timo Aaltonen pushed to branch master at FreeIPA packaging / bind-dyndb-ldap


Commits:
a26eeb9e by Jakob Haufe at 2023-02-02T17:12:23+01:00
Import patch from https://pagure.io/bind-dyndb-ldap/pull-request/218

- - - - -
d808aa26 by Jakob Haufe at 2023-02-02T17:13:18+01:00
Switch to bind 9.18.11

- - - - -


4 changed files:

- debian/control
- debian/patches/hardcode-version.diff
- + debian/patches/make-dscp-optional.diff
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at alioth-lists.debian.net>
 Uploaders: Timo Aaltonen <tjaalton at debian.org>
 Build-Depends:
  debhelper-compat (= 12),
- bind9-dev (>= 1:9.18.10),
+ bind9-dev (>= 1:9.18.11),
  libkrb5-dev,
  libldap2-dev,
  libsasl2-dev,


=====================================
debian/patches/hardcode-version.diff
=====================================
@@ -44,7 +44,7 @@
 -    ])
 -], [AC_MSG_ERROR([Cross compiling is not supported.])]
 -)
-+AC_DEFINE_UNQUOTED([LIBDNS_VERSION_MAJOR], [1810], [Define libdns version])
++AC_DEFINE_UNQUOTED([LIBDNS_VERSION_MAJOR], [1811], [Define libdns version])
  
  dnl isc_errno_toresult() was not available in older header files
  AC_MSG_CHECKING([isc_errno_toresult availability])


=====================================
debian/patches/make-dscp-optional.diff
=====================================
@@ -0,0 +1,36 @@
+From f435a334fe64585557e17adccbdfe8fd5b19d097 Mon Sep 17 00:00:00 2001
+From: Petr Menšík <pemensik at redhat.com>
+Date: Jan 28 2023 10:37:13 +0000
+Subject: 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.
+
+---
+
+diff --git a/src/fwd.c b/src/fwd.c
+index 0a3c673..f7f26f1 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);
+ 	}
+


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ hardcode-version.diff
 fix-dns_db_allrdatasets.diff
 fix-include.diff
 fix-isc-error.diff
+make-dscp-optional.diff



View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/2140ff23a017b7b1c45a075e02d0de52af310dac...d808aa26ab2da63c188908c8b15b2f6f7fd8f67c

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/2140ff23a017b7b1c45a075e02d0de52af310dac...d808aa26ab2da63c188908c8b15b2f6f7fd8f67c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20230202/ab6a8fc9/attachment-0001.htm>