From ea8dc6d647a0c6036c022c864cb6fbb4b8a9f74f Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Wed, 18 Jan 2023 00:18:32 +0800 Subject: [PATCH 1/3] update to dhcp-4.3.6-48.el8_7.1 Signed-off-by: anolis-bot --- 0001-dhcp-anolis-rebrand.patch | 25 ------------------------- dhcp-dhcp6-vendor-opts.patch | 12 ++++++++++++ dhcp.spec | 21 ++++++++------------- dist | 2 +- 4 files changed, 21 insertions(+), 39 deletions(-) delete mode 100644 0001-dhcp-anolis-rebrand.patch create mode 100644 dhcp-dhcp6-vendor-opts.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-dhcp6-vendor-opts.patch b/dhcp-dhcp6-vendor-opts.patch new file mode 100644 index 0000000..4bd685e --- /dev/null +++ b/dhcp-dhcp6-vendor-opts.patch @@ -0,0 +1,12 @@ +diff --git a/common/options.c b/common/options.c +index 3e6383a..9216ae4 100644 +--- a/common/options.c ++++ b/common/options.c +@@ -1122,7 +1122,6 @@ store_options6(char *buf, int buflen, + */ + if (code == vsio_option_code) { + vsio_wanted = 1; +- continue; + } + + /* diff --git a/dhcp.spec b/dhcp.spec index 6cdf28e..7b9ceb9 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: 48%{anolis_release}%{?dist} +Release: 48%{?dist}.1 # 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. @@ -86,11 +85,7 @@ Patch49: dhcp-detect-system-time-jumps.patch Patch50: dhcp-key_algorithm.patch Patch51: dhcp-statement_parser.patch Patch52: dhcp-omshell-hmac-sha512-support.patch - -#Add by anolis -Patch1001: 0001-dhcp-anolis-rebrand.patch - -#end +Patch53: dhcp-dhcp6-vendor-opts.patch BuildRequires: autoconf BuildRequires: automake @@ -375,6 +370,9 @@ rm bind/bind.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=2016248 %patch52 -p1 +# https://bugzilla.redhat.com/show_bug.cgi?id=2142025 +%patch53 -p1 + # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ client/dhclient-script.8 client/dhclient.8 ; do @@ -391,15 +389,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 \ @@ -710,9 +706,8 @@ done %endif %changelog -* Tue Jan 03 2023 yangxiaoxuan - 12:4.3.6-48.0.1 -- Rebrand for Anolis OS -- Fix gcc10 -fno-common compile issue for compatible with gcc10 build +* Sun Nov 20 2022 Martin Osvald - 12:4.3.6-48.1 +- send back dhcp6.vendor-opts again (#2142025) * Tue May 10 2022 Martin Osvald - 12:4.3.6-48 - omshell: add support for hmac-sha512 algorithm (#2016248) diff --git a/dist b/dist index 9c0e36e..535c690 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_7 -- Gitee From 6fe4887c7c6f62a682cae20ad17025c5187e3df7 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 7b9ceb9..f657689 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: 48%{?dist}.1 +Release: 48%{anolis_release}%{?dist}.1 # 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. @@ -87,6 +88,11 @@ Patch51: dhcp-statement_parser.patch Patch52: dhcp-omshell-hmac-sha512-support.patch Patch53: dhcp-dhcp6-vendor-opts.patch +#Add by anolis +Patch1001: 0001-dhcp-anolis-rebrand.patch + +#end + BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -389,6 +395,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 @@ -706,6 +714,9 @@ done %endif %changelog +* Mon Jan 30 2023 yangxiaoxuan - 12:4.3.6-48.0.1.1 +- Rebrand for Anolis OS + * Sun Nov 20 2022 Martin Osvald - 12:4.3.6-48.1 - send back dhcp6.vendor-opts again (#2142025) -- Gitee From 89053a57dd5a012e751214fc789aeee2582d3c6a 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 f657689..4a84244 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -403,7 +403,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 \ @@ -716,6 +716,7 @@ done %changelog * Mon Jan 30 2023 yangxiaoxuan - 12:4.3.6-48.0.1.1 - Rebrand for Anolis OS +- Fix gcc10 -fno-common compile issue for compatible with gcc10 build * Sun Nov 20 2022 Martin Osvald - 12:4.3.6-48.1 - send back dhcp6.vendor-opts again (#2142025) -- Gitee