From 93bca9664f162422b22aa35428cae1f195873875 Mon Sep 17 00:00:00 2001 From: yangl777 Date: Thu, 27 Apr 2023 06:27:56 +0000 Subject: [PATCH] remove useless patch (cherry picked from commit a36a83805a3ca63ceb069efe5bfca226b84093dd) --- backport-dnsmasq-2.85-lease-hostname.patch | 26 ---------------------- dnsmasq.spec | 10 +++++++-- 2 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 backport-dnsmasq-2.85-lease-hostname.patch diff --git a/backport-dnsmasq-2.85-lease-hostname.patch b/backport-dnsmasq-2.85-lease-hostname.patch deleted file mode 100644 index 849ae7c..0000000 --- a/backport-dnsmasq-2.85-lease-hostname.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bea12dc31409180f6cb3a0578c2340c0116ef003 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= -Date: Fri, 2 Jul 2021 10:03:47 +0200 -Subject: [PATCH] Modify and propagate changed lease - -If hostname is reset on existing lease, propagate such change to leases -file and script. ---- - src/lease.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lease.c b/src/lease.c -index b56647d..1a9f1c6 100644 ---- a/src/lease.c -+++ b/src/lease.c -@@ -1021,6 +1021,7 @@ void lease_set_hostname(struct dhcp_lease *lease, const char *name, int auth, ch - } - - kill_name(lease_tmp); -+ lease_tmp->flags |= LEASE_CHANGED; /* run script on change */ - break; - } - } --- -2.31.1 - diff --git a/dnsmasq.spec b/dnsmasq.spec index 5612d7a..b272976 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.86 -Release: 5 +Release: 6 Summary: Dnsmasq provides network infrastructure for small networks License: GPLv2 or GPLv3 URL: http://www.thekelleys.org.uk/dnsmasq/ @@ -135,7 +135,13 @@ install -Dpm644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysusersdir}/dnsmasq.conf %{_mandir}/man8/dnsmasq* %changelog -* Tue Mar 28 2023 renmingshuai - 2.88-5 +* Thu Apr 27 2023 yanglu - 2.86-6 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:remove useless patch + +* Tue Mar 28 2023 renmingshuai - 2.86-5 - Type:bugfix - Id:NA - SUG:NA -- Gitee