de-fuzz dnsmasq patches

When do Centos 7.5 upgraded, some patches didn't resolve and cause
the fuzzy in the line numbers of the patches. And it may cause
.orig file is created when do patch. And this .orig file will lead
to rpm packaging failure due to the unexpected and unpackaged .orig
file.

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Solution:
  Safest solution is to de-fuzz our patches.

Story: 2003389
Task: 26755

Change-Id: Ic7d7d8b060861a8d6af5555872add23ee8b348bf
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 08:09:34 +08:00
parent 5ebcaeedb8
commit 79eb1d3a08
1 changed files with 6 additions and 7 deletions

View File

@ -1,18 +1,17 @@
From c68370ac5678b1052592877ede04886d5f62d2dc Mon Sep 17 00:00:00 2001
From 1a91b72146893dab1cca1354dd3b0a8fa74d6b55 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Tue, 18 Oct 2016 13:07:56 -0400
Subject: [PATCH 1/4] WRS: Patch22:
dnsmasq-update-ipv6-leases-from-config.patch
Subject: WRS: Patch22: dnsmasq-update-ipv6-leases-from-config.patch
---
src/lease.c | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/lease.c b/src/lease.c
index e5fe8a6..ffa683a 100644
index 69e698c..bc56c47 100644
--- a/src/lease.c
+++ b/src/lease.c
@@ -179,6 +179,18 @@ void lease_init(time_t now)
@@ -210,6 +210,18 @@ void lease_init(time_t now)
dns_dirty = 1;
}
@ -31,7 +30,7 @@ index e5fe8a6..ffa683a 100644
void lease_update_from_configs(void)
{
/* changes to the config may change current leases. */
@@ -187,16 +199,37 @@ void lease_update_from_configs(void)
@@ -218,16 +230,37 @@ void lease_update_from_configs(void)
struct dhcp_config *config;
char *name;
@ -80,5 +79,5 @@ index e5fe8a6..ffa683a 100644
static void ourprintf(int *errp, char *format, ...)
--
1.9.1
2.7.4