PR#1: Update headers to support bind 9.11.5 - rpms/bind-dyndb-ldap

rpms / bind-dyndb-ldap

#1 Update headers to support bind 9.11.5

Closed 4 years ago by pemensik. Opened 5 years ago by pemensik.

rpms/ pemensik/bind-dyndb-ldap master into master

Fix error in Rawhide

Petr Menšík • 5 years ago

1dccccd

Update headers to support bind 9.11.5

Petr Menšík • 5 years ago

8957a14

0004-Support-for-BIND-9.11.5.patch

file added

+123

		`@@ -0,0 +1,123 @@`
		`+ From 925159b0e3757e650d9dbdb7888f6d66dde6d62f Mon Sep 17 00:00:00 2001`
		`+ From: rpm-build <rpm-build>`
		`+ Date: Mon, 5 Nov 2018 19:49:03 +0100`
		`+ Subject: [PATCH] Adjust to changes in bind 9.11.5`
		`+`
		`+ Custom types like isc_boolean_t and isc_uint32_t were removed from bind`
		`+ headers. Compatibility headers are included, but have to be manually`
		`+ used. Better change would be to start using uint32_t and bool types,`
		`+ but that changes too much of code for now.`
		`+ ---`
		`+ src/fwd.c \| 2 ++`
		`+ src/ldap_entry.c \| 1 +`
		`+ src/ldap_helper.c \| 1 +`
		`+ src/ldap_helper.h \| 1 +`
		`+ src/mldap.c \| 1 +`
		`+ src/settings.h \| 2 ++`
		`+ src/types.h \| 2 ++`
		`+ src/zone.c \| 1 +`
		`+ 8 files changed, 11 insertions(+)`
		`+`
		`+ diff --git a/src/fwd.c b/src/fwd.c`
		`+ index 840f0e8..f1ab60c 100644`
		`+ --- a/src/fwd.c`
		`+ +++ b/src/fwd.c`
		`+ @@ -6,6 +6,8 @@`
		`+`
		`+ #include "config.h"`
		`+`
		`+ +#include <isc/boolean.h>`
		`+ +`
		`+ #include <isccfg/grammar.h>`
		`+`
		`+ #include <dns/forward.h>`
		`+ diff --git a/src/ldap_entry.c b/src/ldap_entry.c`
		`+ index 96a6ef8..00a7e89 100644`
		`+ --- a/src/ldap_entry.c`
		`+ +++ b/src/ldap_entry.c`
		`+ @@ -7,6 +7,7 @@`
		`+ #include <dns/ttl.h>`
		`+ #include <dns/types.h>`
		`+`
		`+ +#include <isc/int.h>`
		`+ #include <isc/region.h>`
		`+ #include <isc/types.h>`
		`+ #include <isc/util.h>`
		`+ diff --git a/src/ldap_helper.c b/src/ldap_helper.c`
		`+ index e0c4b76..74c0afe 100644`
		`+ --- a/src/ldap_helper.c`
		`+ +++ b/src/ldap_helper.c`
		`+ @@ -26,6 +26,7 @@`
		`+`
		`+ #include <isc/buffer.h>`
		`+ #include <isc/dir.h>`
		`+ +#include <isc/int.h>`
		`+ #include <isc/mem.h>`
		`+ #include <isc/mutex.h>`
		`+ #include <isc/region.h>`
		`+ diff --git a/src/ldap_helper.h b/src/ldap_helper.h`
		`+ index 6cfece5..fc21bb3 100644`
		`+ --- a/src/ldap_helper.h`
		`+ +++ b/src/ldap_helper.h`
		`+ @@ -7,6 +7,7 @@`
		`+`
		`+ #include "types.h"`
		`+`
		`+ +#include <isc/boolean.h>`
		`+ #include <isc/eventclass.h>`
		`+ #include <isc/util.h>`
		`+ #include <isccfg/cfg.h>`
		`+ diff --git a/src/mldap.c b/src/mldap.c`
		`+ index 304ba36..8b90921 100644`
		`+ --- a/src/mldap.c`
		`+ +++ b/src/mldap.c`
		`+ @@ -10,6 +10,7 @@`
		`+ #include <uuid/uuid.h>`
		`+`
		`+ #include <isc/boolean.h>`
		`+ +#include <isc/int.h>`
		`+ #include <isc/net.h>`
		`+ #include <isc/refcount.h>`
		`+ #include <isc/result.h>`
		`+ diff --git a/src/settings.h b/src/settings.h`
		`+ index 16a1e63..6585d8b 100644`
		`+ --- a/src/settings.h`
		`+ +++ b/src/settings.h`
		`+ @@ -6,6 +6,8 @@`
		`+ #define _LD_SETTINGS_H_`
		`+`
		`+ #include <isc/types.h>`
		`+ +#include <isc/boolean.h>`
		`+ +#include <isc/int.h>`
		`+`
		`+ #include <isccfg/grammar.h>`
		`+`
		`+ diff --git a/src/types.h b/src/types.h`
		`+ index 01d627c..41ef476 100644`
		`+ --- a/src/types.h`
		`+ +++ b/src/types.h`
		`+ @@ -5,7 +5,9 @@`
		`+ #ifndef _LD_TYPES_H_`
		`+ #define _LD_TYPES_H_`
		`+`
		`+ +#include <isc/boolean.h>`
		`+ #include <isc/event.h>`
		`+ +#include <isc/int.h>`
		`+ #include <isc/refcount.h>`
		`+ #include <dns/name.h>`
		`+`
		`+ diff --git a/src/zone.c b/src/zone.c`
		`+ index 284136e..b9c9936 100644`
		`+ --- a/src/zone.c`
		`+ +++ b/src/zone.c`
		`+ @@ -2,6 +2,7 @@`
		`+ * Copyright (C) 2014-2015 bind-dyndb-ldap authors; see COPYING for license`
		`+ */`
		`+`
		`+ +#include <isc/int.h>`
		`+ #include <isc/types.h>`
		`+ #include <isc/util.h>`
		`+`
		`+ --`
		`+ 2.14.5`
		`+`

0005-Use-correct-dn-value.patch

file added

+35

		`@@ -0,0 +1,35 @@`
		`+ From ef1c4b7833de663549e9520e06e2b9f457b5fbec Mon Sep 17 00:00:00 2001`
		`+ From: rpm-build <rpm-build>`
		`+ Date: Mon, 28 Jan 2019 00:21:31 +0100`
		`+ Subject: [PATCH] Use correct dn value`
		`+`
		`+ New GCC correctly reports error, NULL is always passed in case of`
		`+ invalid objectclass.`
		`+ ---`
		`+ src/ldap_helper.c \| 3 +--`
		`+ 1 file changed, 1 insertion(+), 2 deletions(-)`
		`+`
		`+ diff --git a/src/ldap_helper.c b/src/ldap_helper.c`
		`+ index 74c0afe..0f6184d 100644`
		`+ --- a/src/ldap_helper.c`
		`+ +++ b/src/ldap_helper.c`
		`+ @@ -4102,7 +4102,6 @@ syncrepl_update(ldap_instance_t inst, ldap_entry_t *entryp, int chgtype)`
		`+ ldap_entry_t *entry = NULL;`
		`+ dns_name_t *zone_name = NULL;`
		`+ dns_zone_t *zone_ptr = NULL;`
		`+ - char *dn = NULL;`
		`+ isc_taskaction_t action = NULL;`
		`+ isc_task_t *task = NULL;`
		`+ isc_boolean_t synchronous;`
		`+ @@ -4155,7 +4154,7 @@ syncrepl_update(ldap_instance_t inst, ldap_entry_t *entryp, int chgtype)`
		`+ else if ((entry->class & LDAP_ENTRYCLASS_RR) != 0)`
		`+ action = update_record;`
		`+ else {`
		`+ - log_error("unsupported objectClass: dn '%s'", dn);`
		`+ + log_error("unsupported objectClass: dn '%s'", entry->dn);`
		`+ result = ISC_R_NOTIMPLEMENTED;`
		`+ goto cleanup;`
		`+ }`
		`+ --`
		`+ 2.20.1`
		`+`

bind-dyndb-ldap.spec

file modified

+8 -1

		`@@ -4,7 +4,7 @@`

		`Name: bind-dyndb-ldap`
		`Version: 11.1`
		`- Release: 12%{?dist}`
		`+ Release: 13%{?dist}`
		`Summary: LDAP back-end plug-in for BIND`

		`Group: System Environment/Libraries`
		`@@ -15,6 +15,8 @@`
		`Patch1: 0001-Coverity-fix-REVERSE_INULL-for-pevent-inst.patch`
		`Patch2: 0002-Add-empty-callback-for-getsize.patch`
		`Patch3: 0003-Support-for-BIND-9.11.3.patch`
		`+ Patch4: 0004-Support-for-BIND-9.11.5.patch`
		`+ Patch5: 0005-Use-correct-dn-value.patch`

		`BuildRequires: bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}, bind-pkcs11-devel >= %{bind_version}`
		`BuildRequires: krb5-devel`
		`@@ -36,6 +38,8 @@`
		`%patch1 -p1`
		`%patch2 -p1`
		`%patch3 -p1`
		`+ %patch4 -p1`
		`+ %patch5 -p1`

		`%build`
		`autoreconf -fiv`
		`@@ -101,6 +105,9 @@`


		`%changelog`
		`+ * Mon Nov 05 2018 Petr Menšík <pemensik@redhat.com> - 11.1-13`
		`+ - Support for bind 9.11.5 headers`
		`+`
		`* Thu Jul 12 2018 Petr Menšík <pemensik@redhat.com> - 11.1-12`
		`- Require bind with writable home, update to 9.11.4`

pemensik commented 5 years ago

BIND updated its headers without backward compatiblity layer inside.
New releases removed custom types from its own sources, like
isc_uint32_t and isc_boolean_t. They replaced it with standard types
uint32_t and bool. Until all usages are replaced, this is required to
compile. Unfortunately no backward compatiblity is provided.

pemensik commented 5 years ago

Please note new bind is not yet compiled in rawhide. Pending build is in copr repository

rebased onto 8957a14

5 years ago

1 new commit added