[04/36] avahi: refresh patches

Message ID	20180309185614.31113-4-alexander.kanavin@linux.intel.com
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; From: Alexander Kanavin <alexander.kanavin@linux.intel.com> To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:42 +0200 Message-Id: <20180309185614.31113-4-alexander.kanavin@linux.intel.com> In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 04/36] avahi: refresh patches Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org
Series	[01/36] pciutils: refresh patches \| expand [01/36] pciutils: refresh patches [03/36] u-boot: refresh patches [04/36] avahi: refresh patches [05/36] iproute2: refresh patches [06/36] openssl: refresh patches [08/36] e2fsprogs: refresh patches [10/36] i2c-tools: refresh patches [11/36] m4: refresh patches [12/36] opkg-utils: refresh patches [13/36] python: refresh patches [14/36] qemu: refresh patches [16/36] ruby: refresh patches [17/36] tcf-agent: refresh patches [18/36] cups: refresh patches [19/36] ethtool: refresh patches [20/36] ltp: refresh patches [21/36] net-tools: refresh patches [22/36] newt: refresh patches [23/36] rpcbind: refresh patches [24/36] sysstat: refresh patches [25/36] gnome: refresh patches [26/36] gtk-doc: refresh patches [27/36] drm: refresh patches [28/36] mesa: refresh patches [30/36] xorg-xserver: refresh patches [31/36] blktrace: refresh patches [32/36] cryptodev: refresh patches [33/36] libtiff: refresh patches [34/36] libunwind: refresh patches [35/36] attr: refresh patches

Message ID

20180309185614.31113-4-alexander.kanavin@linux.intel.com

State

New

Headers

Received-SPF: pass (google.com: best guess record for domain of
	openembedded-core-bounces@lists.openembedded.org designates
	140.211.169.62 as permitted sender) client-ip=140.211.169.62; 
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Date: Fri,  9 Mar 2018 20:55:42 +0200
Message-Id: <20180309185614.31113-4-alexander.kanavin@linux.intel.com>
In-Reply-To: <20180309185614.31113-1-alexander.kanavin@linux.intel.com>
References: <20180309185614.31113-1-alexander.kanavin@linux.intel.com>
Subject: [OE-core] [PATCH 04/36] avahi: refresh patches
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: openembedded-core-bounces@lists.openembedded.org
Errors-To: openembedded-core-bounces@lists.openembedded.org

Series

[01/36] pciutils: refresh patches | expand

Commit Message

Alexander Kanavin March 9, 2018, 6:55 p.m. UTC

From: Ross Burton <ross.burton@intel.com>


The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton <ross.burton@intel.com>

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>

---
 .../avahi/files/initscript.patch                   | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

-- 
2.16.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch
index 193889eb5c2..c856c3df046 100644
--- a/meta/recipes-connectivity/avahi/files/initscript.patch
+++ b/meta/recipes-connectivity/avahi/files/initscript.patch
@@ -1,10 +1,10 @@ 
 Upstream-Status: Pending
 
-diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
-index 30a2c2f..b5848a8 100755
---- a/initscript/debian/avahi-daemon.in
-+++ b/initscript/debian/avahi-daemon.in
-@@ -1,2 +1,14 @@
+Index: avahi-0.7/initscript/debian/avahi-daemon.in
+===================================================================
+--- avahi-0.7.orig/initscript/debian/avahi-daemon.in
++++ avahi-0.7/initscript/debian/avahi-daemon.in
+@@ -1,5 +1,17 @@
  #!/bin/sh
 -
 +### BEGIN INIT INFO
@@ -20,11 +20,14 @@  index 30a2c2f..b5848a8 100755
 +#                    automatically
 +### END INIT INFO
 +#
-diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in
-index ac34804..f95c340 100755
---- a/initscript/debian/avahi-dnsconfd.in
-+++ b/initscript/debian/avahi-dnsconfd.in
-@@ -1,1 +1,14 @@
+ # This file is part of avahi.
+ #
+ # avahi is free software; you can redistribute it and/or modify it
+Index: avahi-0.7/initscript/debian/avahi-dnsconfd.in
+===================================================================
+--- avahi-0.7.orig/initscript/debian/avahi-dnsconfd.in
++++ avahi-0.7/initscript/debian/avahi-dnsconfd.in
+@@ -1,4 +1,17 @@
  #!/bin/sh
 +### BEGIN INIT INFO
 +# Provides:          avahi-dnsconfd
@@ -39,3 +42,6 @@  index ac34804..f95c340 100755
 +#                    automatically
 +### END INIT INFO
 +#
+ 
+ # This file is part of avahi.
+ #