[packages/dhcp] - build fix from Fedora

hawk hawk at pld-linux.org
Wed Sep 10 12:32:19 CEST 2025


commit aac9b73e204ca96efd3798b74bb68825a7b940e7
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Tue Sep 9 22:46:18 2025 +0200

    - build fix from Fedora

 declarations-fix.patch | 39 +++++++++++++++++++++++++++++++++++++++
 dhcp.spec              |  2 ++
 2 files changed, 41 insertions(+)
---
diff --git a/dhcp.spec b/dhcp.spec
index a5d9d32..21f516e 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -72,6 +72,7 @@ Patch27:	%{name}-option97-pxe-client-id.patch
 Patch28:	%{name}-detect-time-changes.patch
 Patch29:	bind-detect-time-changes.patch
 Patch30:	bind-system-getaddrinfo.patch
+Patch31:	declarations-fix.patch
 URL:		https://www.isc.org/dhcp/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -259,6 +260,7 @@ komunikacji z działającym serwerem ISC DHCP i jego kontroli.
 %patch -P26 -p1
 %patch -P27 -p1
 %patch -P28 -p1
+%patch -P31 -p1
 
 cd bind
 tar -xvf bind.tar.gz
diff --git a/declarations-fix.patch b/declarations-fix.patch
new file mode 100644
index 0000000..b809b16
--- /dev/null
+++ b/declarations-fix.patch
@@ -0,0 +1,39 @@
+From f7eb324f5b0deef285b0eaa0d504af77f06c779f Mon Sep 17 00:00:00 2001
+From: Stepan Broz <sbroz at redhat.com>
+Date: Fri, 24 Jan 2025 15:41:41 +0100
+Subject: [PATCH] Correct declarations of ia_na_[no]match and ia_pd_[no]match
+ in server/dhcpv6.c.
+
+---
+ server/dhcpv6.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/server/dhcpv6.c b/server/dhcpv6.c
+index 7d61dc5..c1f227c 100644
+--- a/server/dhcpv6.c
++++ b/server/dhcpv6.c
+@@ -5852,8 +5852,8 @@ iterate_over_ia_na(struct data_string *reply_ret,
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_na_match)(),
+-		   void (*ia_na_nomatch)())
++		   void (*ia_na_match)(const struct data_string *, const struct data_string *, struct iasubopt *),
++		   void (*ia_na_nomatch)(const struct data_string *, const struct data_string *, u_int32_t *, struct packet *, char *, int *, int))
+ {
+ 	struct option_state *opt_state;
+ 	struct host_decl *packet_host;
+@@ -6354,8 +6354,8 @@ iterate_over_ia_pd(struct data_string *reply_ret,
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_pd_match)(),
+-		   void (*ia_pd_nomatch)())
++		   void (*ia_pd_match)(const struct data_string *, const struct data_string *, struct iasubopt *),
++		   void (*ia_pd_nomatch)(const struct data_string *, const struct data_string *, u_int32_t *, struct packet *, char *, int *, int))
+ {
+ 	struct data_string reply_new;
+ 	int reply_len;
+-- 
+2.48.1
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dhcp.git/commitdiff/aac9b73e204ca96efd3798b74bb68825a7b940e7



More information about the pld-cvs-commit mailing list