diff --git a/0001-dhcp-anolis-rebrand.patch b/0001-dhcp-anolis-rebrand.patch deleted file mode 100644 index 176c5893f45927a45d58cf423b6d2c4f7c72e522..0000000000000000000000000000000000000000 --- 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://bugs.openanolis.cn"); - - if (!file) - return url; --- -2.18.2 - diff --git a/dhcp-4.3.6.tar.gz b/dhcp-4.3.6.tar.gz deleted file mode 100644 index f77bfc0445608eeb97c52c33c08bdad4809739d1..0000000000000000000000000000000000000000 Binary files a/dhcp-4.3.6.tar.gz and /dev/null differ diff --git a/dhcp.spec b/dhcp.spec index 68398de8adad34b29f817be9ad2651a2fed60f15..2d7c8d903215b2fab70007b3bea6a058549f2825 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: 45%{anolis_release}%{?dist} +Release: 47%{?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. @@ -86,11 +85,6 @@ 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 @@ -387,15 +381,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 \ @@ -706,9 +698,11 @@ done %endif %changelog -* Fri Jan 14 2022 yangxiaoxuan - 12:4.3.6-45.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) + +* Thu Dec 16 2021 Martin Osvald - 12:4.3.6-46 +- Rebuild with new bind (#2022715) * Thu May 27 2021 Pavel Zhukov - 12:4.3.6-45 - Fix for CVE-2021-25217 diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..50d71a952b468e12111ec50db45b240a564eb9d0 --- /dev/null +++ b/download @@ -0,0 +1 @@ +afa6e9b3eb7539ea048421a82c668adc dhcp-4.3.6.tar.gz