From patchwork Fri Mar 9 18:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131216 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1342100lja; Fri, 9 Mar 2018 11:03:27 -0800 (PST) X-Google-Smtp-Source: AG47ELvl1ZBLypUeAgfLEJGw0AhCDcuXkYbfDklNgYFAONu8tVuiGxeLz5Vmy9iJtfiNDhQDOfDu X-Received: by 10.101.101.4 with SMTP id x4mr25365004pgv.275.1520622207349; Fri, 09 Mar 2018 11:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622207; cv=none; d=google.com; s=arc-20160816; b=XReMTHocwFeej+c2/QRIfDcpejUUYZvS21ApP0GUWl4QBDJOi2N8+HkhWm+GQ6pNmb xU3qsSXslJU1XGFu+d8G/o1SV3m/99Y+wMPuuKw8DgBjjZ+jOR2deEx0vneOc/Xqr8sD QlIDmIgpTwTYi5VZhZ0HNkGbIZmOxD50BeIqfKMg04b6xObTqO558bXKbLOw3PqZf4Xy E0V5F/B6OSLaqOCqALaLcdzSbX3o4cnySaXawC+cHOqQZd+rj5tHqj1/6QDrKPy+2pv6 L0T6Sn0jOSKyDgum1lSRmOg6vICJ/G/B3EmUKgkyTDr6Mjuvzp+fVAuWUcgVb9JQeUus Cx7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=+7tsttdA/Tlofrw1Crbb8XZCkCLPJ/FH+mxoG70jKXM=; b=la3rlSqdxe7wrOsdFHRl6el7Y33EALzXnXYE5gGo/Vu3XXUfi+N1jrr/GXkbJH31UO dAOrNZeofbB2ElqOqFMZNfG3zq6Tk3z1TSAddDXkVuFdIiM+YmdwqOKVipmfIob6w3Sp JR0UArpID8i+QMd70rw3qTHoM4kN1xzmkR4JQ0MjxWuef11h+WgKZLQEQiuAr+W8yAQ3 +NZIUKGwxtN6BNRKzPjG2Jmhk7QU+kq4CaQhN5fe3ZMbUP/k2VqdkL8ukmPJ7mmRHIb1 u5JGcxhHhdtIdeyCIF+unFGejrCWR2etBQyjHumPeJ1dYRqI/yXe/l3rklk0J36ibA5/ RKBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o1-v6si1290500plk.138.2018.03.09.11.03.26; Fri, 09 Mar 2018 11:03:27 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B416278948; Fri, 9 Mar 2018 19:03:14 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id D2C0D78937 for ; Fri, 9 Mar 2018 19:02:56 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2018 11:02:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651863" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:02:57 -0800 From: Alexander Kanavin 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> X-Mailer: git-send-email 2.16.1 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 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton 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 Signed-off-by: Alexander Kanavin --- .../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. + #