From a592fd03eddda1af4a9766e3866de0091df2ef7d Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Mon, 25 Jan 2021 23:09:37 +0800 Subject: [PATCH 1/2] 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..176c589 --- /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://bugs.openanolis.cn"); + + if (!file) + return url; +-- +2.18.2 + diff --git a/dhcp.spec b/dhcp.spec index 2d7c8d9..adc7d32 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: 47%{?dist} +Release: 47%{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. @@ -85,6 +86,11 @@ Patch49: dhcp-detect-system-time-jumps.patch Patch50: dhcp-key_algorithm.patch Patch51: dhcp-statement_parser.patch +#Add by anolis +Patch1001: 0001-dhcp-anolis-rebrand.patch + +#end + BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -381,6 +387,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 @@ -698,6 +706,9 @@ done %endif %changelog +* Fri Jan 14 2022 yangxiaoxuan - 12:4.3.6-47.0.1 +- Rebrand for Anolis OS + * Tue Dec 21 2021 Petr Menšík - 12:4.3.6-47 - Rebuilt on a new side-tag (#2022715) -- Gitee From 0159f401fa5619b5f5a59e6e5c6a7a93841e3202 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Fri, 25 Sep 2020 15:00:40 +0800 Subject: [PATCH 2/2] 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 adc7d32..fef0ba6 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -395,7 +395,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 \ @@ -708,6 +708,7 @@ done %changelog * Fri Jan 14 2022 yangxiaoxuan - 12:4.3.6-47.0.1 - Rebrand for Anolis OS +- Fix gcc10 -fno-common compile issue for compatible with gcc10 build * Tue Dec 21 2021 Petr Menšík - 12:4.3.6-47 - Rebuilt on a new side-tag (#2022715) -- Gitee