diff --git a/dhcp.spec b/dhcp.spec index 6de7cfc35405967f66cace4e6da69242ff9fd762..bd5111f913c1699c416a3eb28c511e985e03ef3b 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -3,7 +3,7 @@ Name: dhcp Version: 4.4.3 -Release: 8 +Release: 9 Summary: Dynamic host configuration protocol software #Please don't change the epoch on this package Epoch: 12 @@ -61,13 +61,14 @@ Patch42: backport-CVE-2022-2795.patch Patch43: backport-CVE-2022-38177.patch Patch44: backport-CVE-2022-38178.patch Patch45: IAID-is-output-has-hexe-if-it-contains-or.patch -Patch46: bugfix-cancel-rebind6-timer-after-ipv6-expire.patch -Patch47: backport-CVE-2024-1975.patch -Patch48: backport-optimize-the-slabheader-placement-for-certain-RRtype.patch -Patch49: backport-0001-CVE-2024-1737.patch -Patch50: backport-0002-CVE-2024-1737.patch -Patch51: backport-0003-CVE-2024-1737.patch -Patch52: backport-0004-CVE-2024-1737.patch +Patch46: support-for-building-with-clang.patch +Patch47: bugfix-cancel-rebind6-timer-after-ipv6-expire.patch +Patch48: backport-CVE-2024-1975.patch +Patch49: backport-optimize-the-slabheader-placement-for-certain-RRtype.patch +Patch50: backport-0001-CVE-2024-1737.patch +Patch51: backport-0002-CVE-2024-1737.patch +Patch52: backport-0003-CVE-2024-1737.patch +Patch53: backport-0004-CVE-2024-1737.patch BuildRequires: gcc autoconf automake libtool openldap-devel krb5-devel libcap-ng-devel BuildRequires: systemd systemd-devel @@ -316,6 +317,12 @@ exit 0 %{_mandir}/man3/omapi.3.gz %changelog +* Wed Nov 13 2024 huyizhen - 12:4.4.3-9 +- Type:enhancement +- ID:NA +- SUG:build with clang +- DESC:Support for building with clang + * Mon Nov 11 2024 huyizhen - 12:4.4.3-8 - Type:CVE - ID:NA diff --git a/support-for-building-with-clang.patch b/support-for-building-with-clang.patch new file mode 100644 index 0000000000000000000000000000000000000000..3845aef0f16d69e726716beac06ced5ae747daa1 --- /dev/null +++ b/support-for-building-with-clang.patch @@ -0,0 +1,29 @@ +From eb6f6bd959c2f496e4db1a90ea0629bbf9b12185 Mon Sep 17 00:00:00 2001 +From: cf-zhao +Date: Thu, 21 Mar 2024 13:04:26 +0800 +Subject: [PATCH] Support for building with clang + +--- + client/dhclient.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/client/dhclient.c b/client/dhclient.c +index 3e31dbf..a1f8849 100644 +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -48,7 +48,12 @@ + /* + * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define + * that when building ISC code. ++ * When build with clang, there is also a macro defined in stdio2.h, ++ * undefine it so that we still use the prototype in stdio.h. + */ ++#ifdef asprintf ++#undef asprintf ++#endif + extern int asprintf(char **strp, const char *fmt, ...); + + TIME default_lease_time = 43200; /* 12 hours... */ +-- +2.33.0 +