From: Philip Prindeville <redacted>
Date: Mon, 11 Aug 2025 05:22:23 +0000 (-0600)
Subject: isc-dhcp: fix build issues with stricter compilers
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=808d025126b6624bf872cbb2b8afae629211e6c9;p=openwrt-packages.git

isc-dhcp: fix build issues with stricter compilers

The new gcc in the toolchain is failing K&R style prototypes. There
are also some function pointers passed as parameters that didn't
have prototypes so were causing incompatible pointer clashes.

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
index c1458f336..fad4aa437 100644
--- a/net/isc-dhcp/Makefile
+++ b/net/isc-dhcp/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=isc-dhcp
 UPSTREAM_NAME:=dhcp
 PKG_REALVERSION:=4.4.3-P1
 PKG_VERSION:=4.4.3_p1
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
@@ -190,6 +190,9 @@ endif
 
 TARGET_CFLAGS += -fcommon
 
+# don't know why anyone is still publishing K&R-style C code
+TARGET_CFLAGS += -Wno-old-style-definition
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)			\
 		BUILD_CC="$(HOSTCC_NOCACHE)"		\
diff --git a/net/isc-dhcp/patches/910-incompatible-pointers.patch b/net/isc-dhcp/patches/910-incompatible-pointers.patch
new file mode 100644
index 000000000..bebb192ab
--- /dev/null
+++ b/net/isc-dhcp/patches/910-incompatible-pointers.patch
@@ -0,0 +1,45 @@
+--- a/server/dhcpv6.c
++++ b/server/dhcpv6.c
+@@ -5843,14 +5843,29 @@ exit:
+ 	option_state_dereference(&host_opt_state, MDL);
+ }
+ 
++typedef void ia_na_match_t(
++	const struct data_string *client_id,
++	const struct data_string *iaaddr,
++	struct iasubopt *lease
++	);
++
++typedef void ia_na_nomatch_t(
++	const struct data_string *client_id,
++	const struct data_string *iaaddr,
++	u_int32_t *data,
++	struct packet *packet,
++	char *reply_data,
++	int *reply_ofs,
++	int reply_data_sz);
++
+ static void
+ iterate_over_ia_na(struct data_string *reply_ret,
+ 		   struct packet *packet,
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_na_match)(),
+-		   void (*ia_na_nomatch)())
++		   ia_na_match_t ia_na_match,
++		   ia_na_nomatch_t ia_na_nomatch)
+ {
+ 	struct option_state *opt_state;
+ 	struct host_decl *packet_host;
+@@ -6351,8 +6366,8 @@ iterate_over_ia_pd(struct data_string *r
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_pd_match)(),
+-		   void (*ia_pd_nomatch)())
++		   ia_na_match_t ia_pd_match,
++		   ia_na_nomatch_t ia_pd_nomatch)
+ {
+ 	struct data_string reply_new;
+ 	int reply_len;