From a3cdb8d8222491111055cf9a87deb1cc77de408f Mon Sep 17 00:00:00 2001 From: Renbo Date: Mon, 27 May 2024 17:12:49 +0800 Subject: [PATCH 1/3] update to dhcp-4.3.6-50.src.rpm Signed-off-by: Renbo --- 0001-dhcp-anolis-rebrand.patch | 25 ------------------------- dhcp.spec | 17 ++++------------- dist | 2 +- 3 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 0001-dhcp-anolis-rebrand.patch diff --git a/0001-dhcp-anolis-rebrand.patch b/0001-dhcp-anolis-rebrand.patch deleted file mode 100644 index 2a14960..0000000 --- a/0001-dhcp-anolis-rebrand.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d319974cc9cf532adccfea235d2a1c3e80d47fe9 Mon Sep 17 00:00:00 2001 -From: yangxiaoxuan -Date: Mon, 25 Jan 2021 22:10:36 +0800 -Subject: [PATCH] dhcp anolis rebrand - ---- - omapip/errwarn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/omapip/errwarn.c b/omapip/errwarn.c -index f1f6fcd..be425e5 100644 ---- a/omapip/errwarn.c -+++ b/omapip/errwarn.c -@@ -57,7 +57,7 @@ char * bug_report_url(void) { - size_t url_len = 256; - - url = (char *) malloc(url_len * sizeof(char)); -- strcpy(url, "https://bugzilla.redhat.com/"); -+ strcpy(url, "https://bugzilla.openanolis.cn/"); - - if (!file) - return url; --- -2.18.2 - diff --git a/dhcp.spec b/dhcp.spec index 4c882f4..e0d3f99 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,7 +1,6 @@ # SystemTap support is disabled by default %{!?sdt:%global sdt 0} -%define anolis_release .0.1 #http://lists.fedoraproject.org/pipermail/devel/2011-August/155358.html %global _hardened_build 1 @@ -17,7 +16,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.6 -Release: 49%{anolis_release}%{?dist} +Release: 50%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -90,11 +89,6 @@ Patch53: dhcp-CVE-2022-2928.patch Patch54: dhcp-CVE-2022-2929.patch Patch55: dhcp-dhcp6-vendor-opts.patch -#Add by anolis -Patch1001: 0001-dhcp-anolis-rebrand.patch - -#end - BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -403,15 +397,13 @@ for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8 ; do -e 's|ETCDIR|%{dhcpconfdir}|g' $page done -%patch1001 -p1 - sed -i -e 's|/var/db/|%{_localstatedir}/lib/dhcpd/|g' contrib/dhcp-lease-list.pl %build #libtoolize --copy --force autoreconf --verbose --force --install -CFLAGS="%{optflags} -fno-strict-aliasing -fcommon" \ +CFLAGS="%{optflags} -fno-strict-aliasing" \ %configure \ --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \ --with-srv6-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd6.leases \ @@ -722,9 +714,8 @@ done %endif %changelog -* Fri May 26 2023 yangxiaoxuan - 12:4.3.6-49.0.1 -- Rebrand for Anolis OS -- Fix gcc10 -fno-common compile issue for compatible with gcc10 build +* Tue Mar 05 2024 Petr Menšík - 12:4.3.6-50 +- Rebuild because of bind ABI changes related to CVE-2023-50387 * Tue Oct 11 2022 Martin Osvald - 12:4.3.6-49 - Fix for CVE-2022-2928 diff --git a/dist b/dist index 9c0e36e..1fe92cf 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_10 -- Gitee From 5c99e279edb2c4db7a33eaf2ea712365882655b6 Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Mon, 25 Jan 2021 23:09:37 +0800 Subject: [PATCH 2/3] rebrand: rebrand for anolis Signed-off-by: yangxiaoxuan Change-Id: Ibdb49ddee2e62f880cc2b33c237cd76ec4757ec6 --- 0001-dhcp-anolis-rebrand.patch | 25 +++++++++++++++++++++++++ dhcp.spec | 13 ++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-dhcp-anolis-rebrand.patch diff --git a/0001-dhcp-anolis-rebrand.patch b/0001-dhcp-anolis-rebrand.patch new file mode 100644 index 0000000..2a14960 --- /dev/null +++ b/0001-dhcp-anolis-rebrand.patch @@ -0,0 +1,25 @@ +From d319974cc9cf532adccfea235d2a1c3e80d47fe9 Mon Sep 17 00:00:00 2001 +From: yangxiaoxuan +Date: Mon, 25 Jan 2021 22:10:36 +0800 +Subject: [PATCH] dhcp anolis rebrand + +--- + omapip/errwarn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/omapip/errwarn.c b/omapip/errwarn.c +index f1f6fcd..be425e5 100644 +--- a/omapip/errwarn.c ++++ b/omapip/errwarn.c +@@ -57,7 +57,7 @@ char * bug_report_url(void) { + size_t url_len = 256; + + url = (char *) malloc(url_len * sizeof(char)); +- strcpy(url, "https://bugzilla.redhat.com/"); ++ strcpy(url, "https://bugzilla.openanolis.cn/"); + + if (!file) + return url; +-- +2.18.2 + diff --git a/dhcp.spec b/dhcp.spec index e0d3f99..7254d32 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,6 +1,7 @@ # SystemTap support is disabled by default %{!?sdt:%global sdt 0} +%define anolis_release .0.1 #http://lists.fedoraproject.org/pipermail/devel/2011-August/155358.html %global _hardened_build 1 @@ -16,7 +17,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.6 -Release: 50%{?dist} +Release: 50%{anolis_release}%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -89,6 +90,11 @@ Patch53: dhcp-CVE-2022-2928.patch Patch54: dhcp-CVE-2022-2929.patch Patch55: dhcp-dhcp6-vendor-opts.patch +#Add by anolis +Patch1001: 0001-dhcp-anolis-rebrand.patch + +#end + BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -397,6 +403,8 @@ for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8 ; do -e 's|ETCDIR|%{dhcpconfdir}|g' $page done +%patch1001 -p1 + sed -i -e 's|/var/db/|%{_localstatedir}/lib/dhcpd/|g' contrib/dhcp-lease-list.pl %build @@ -714,6 +722,9 @@ done %endif %changelog +* Mon May 27 2024 yangxiaoxuan - 12:4.3.6-50.0.1 +- Rebrand for Anolis OS + * Tue Mar 05 2024 Petr Menšík - 12:4.3.6-50 - Rebuild because of bind ABI changes related to CVE-2023-50387 -- Gitee From 25795ddf20a62359ae3df45bca8fe9eeb4a03c96 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Fri, 25 Sep 2020 15:00:40 +0800 Subject: [PATCH 3/3] spec: [gcc10] Fix gcc10 -fno-common compile issue until upstream fixes this change has given better compatible with gcc10 toolchain, should be maintained util upstream fixes 'multiple definition ...' warnings Fix gcc10 -fno-common compile issue for compatible with gcc10 build Signed-off-by: weitao zhou --- dhcp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dhcp.spec b/dhcp.spec index 7254d32..74df24f 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -411,7 +411,7 @@ sed -i -e 's|/var/db/|%{_localstatedir}/lib/dhcpd/|g' contrib/dhcp-lease-list.pl #libtoolize --copy --force autoreconf --verbose --force --install -CFLAGS="%{optflags} -fno-strict-aliasing" \ +CFLAGS="%{optflags} -fno-strict-aliasing -fcommon" \ %configure \ --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \ --with-srv6-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd6.leases \ @@ -724,6 +724,7 @@ done %changelog * Mon May 27 2024 yangxiaoxuan - 12:4.3.6-50.0.1 - Rebrand for Anolis OS +- Fix gcc10 -fno-common compile issue for compatible with gcc10 build * Tue Mar 05 2024 Petr Menšík - 12:4.3.6-50 - Rebuild because of bind ABI changes related to CVE-2023-50387 -- Gitee