!20 [sync] PR-18: fix build failed
From: @openeuler-sync-bot Reviewed-by: @robertxw Signed-off-by: @robertxw
This commit is contained in:
commit
6192c41bb5
32
backport-bind-dyndb-ldap-bind-9.18.24.patch
Normal file
32
backport-bind-dyndb-ldap-bind-9.18.24.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 628db201764a0dc76f8e48c1524850de64e2f2fe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Bokovoy <abokovoy@redhat.com>
|
||||||
|
Date: Wed, 14 Feb 2024 15:45:57 +0200
|
||||||
|
Subject: [PATCH] Include dydnb-config.h prior to any BIND headers
|
||||||
|
|
||||||
|
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
|
||||||
|
---
|
||||||
|
src/syncrepl.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/syncrepl.c b/src/syncrepl.c
|
||||||
|
index f94379c..4725bb8 100644
|
||||||
|
--- a/src/syncrepl.c
|
||||||
|
+++ b/src/syncrepl.c
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
+#include "dyndb-config.h"
|
||||||
|
#include <isc/condition.h>
|
||||||
|
#include <isc/event.h>
|
||||||
|
#include <isc/mutex.h>
|
||||||
|
@@ -11,7 +12,6 @@
|
||||||
|
#include <isc/time.h>
|
||||||
|
#include <isc/util.h>
|
||||||
|
|
||||||
|
-#include "dyndb-config.h"
|
||||||
|
#include "ldap_helper.h"
|
||||||
|
#include "util.h"
|
||||||
|
#include "semaphore.h"
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
38
backport-bind-dyndb-ldap-dns_name_init.patch
Normal file
38
backport-bind-dyndb-ldap-dns_name_init.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From dbbcc2f07ea6955c6b0b5a719f8058c54b1d750c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Bokovoy <abokovoy@redhat.com>
|
||||||
|
Date: Wed, 14 Feb 2024 14:29:00 +0200
|
||||||
|
Subject: [PATCH] use BIND macros when defining DNS names
|
||||||
|
|
||||||
|
Fixes: https://pagure.io/bind-dyndb-ldap/issue/228
|
||||||
|
|
||||||
|
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
|
||||||
|
---
|
||||||
|
src/mldap.c | 13 +------------
|
||||||
|
1 file changed, 1 insertion(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/mldap.c b/src/mldap.c
|
||||||
|
index 92a330c..79efddb 100644
|
||||||
|
--- a/src/mldap.c
|
||||||
|
+++ b/src/mldap.c
|
||||||
|
@@ -50,18 +50,7 @@
|
||||||
|
static unsigned char uuid_rootname_ndata[]
|
||||||
|
= { 4, 'u', 'u', 'i', 'd', 4, 'l', 'd', 'a', 'p', 0 };
|
||||||
|
static unsigned char uuid_rootname_offsets[] = { 0, 5, 10 };
|
||||||
|
-static dns_name_t uuid_rootname =
|
||||||
|
-{
|
||||||
|
- DNS_NAME_MAGIC,
|
||||||
|
- uuid_rootname_ndata,
|
||||||
|
- sizeof(uuid_rootname_ndata),
|
||||||
|
- sizeof(uuid_rootname_offsets),
|
||||||
|
- DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
|
||||||
|
- uuid_rootname_offsets,
|
||||||
|
- NULL,
|
||||||
|
- { (void *)-1, (void *)-1 },
|
||||||
|
- { NULL, NULL }
|
||||||
|
-};
|
||||||
|
+static dns_name_t uuid_rootname = DNS_NAME_INITABSOLUTE(uuid_rootname_ndata, uuid_rootname_offsets);
|
||||||
|
|
||||||
|
struct mldapdb {
|
||||||
|
isc_mem_t *mctx;
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
Name: bind-dyndb-ldap
|
Name: bind-dyndb-ldap
|
||||||
Version: 11.10
|
Version: 11.10
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: LDAP back-end plug-in for BIND
|
Summary: LDAP back-end plug-in for BIND
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://releases.pagure.org/bind-dyndb-ldap
|
URL: https://releases.pagure.org/bind-dyndb-ldap
|
||||||
@ -16,6 +16,8 @@ Patch1: bind-dyndb-ldap-bind-9.18.10-db-options.patch
|
|||||||
Patch2: bind-dyndb-ldap-bind-9.18.10-logs.patch
|
Patch2: bind-dyndb-ldap-bind-9.18.10-logs.patch
|
||||||
Patch3: bind-dyndb-ldap-bind-9.18.10-staleok.patch
|
Patch3: bind-dyndb-ldap-bind-9.18.10-staleok.patch
|
||||||
Patch4: bind-dyndb-ldap-11.10-bind-9.18.11.patch
|
Patch4: bind-dyndb-ldap-11.10-bind-9.18.11.patch
|
||||||
|
Patch5: backport-bind-dyndb-ldap-bind-9.18.24.patch
|
||||||
|
Patch6: backport-bind-dyndb-ldap-dns_name_init.patch
|
||||||
|
|
||||||
BuildRequires: bind-devel >= %{bind_version}
|
BuildRequires: bind-devel >= %{bind_version}
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
@ -96,6 +98,12 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 20 2024 xinghe <xinghe2@h-partners.com> - 11.10-2
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix build failed
|
||||||
|
|
||||||
* Sun Jan 29 2023 xinghe <xinghe2@h-partners.com> - 11.10-1
|
* Sun Jan 29 2023 xinghe <xinghe2@h-partners.com> - 11.10-1
|
||||||
- Type:requirement
|
- Type:requirement
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user