From patchwork Thu Mar 8 18:17:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131037 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50639lja; Thu, 8 Mar 2018 10:25:21 -0800 (PST) X-Google-Smtp-Source: AG47ELvJmNxGPKbOqdiMq9qaNDBrT3c2OjGEabAfqtbXtGC0cK7/yPLs9vvdv+80BWfBcMI3C2+T X-Received: by 2002:a17:902:900b:: with SMTP id a11-v6mr15811703plp.366.1520533521693; Thu, 08 Mar 2018 10:25:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533521; cv=none; d=google.com; s=arc-20160816; b=IZGuPO4JygbmFs1CqrY4Nvh7r0HaZ21Xo0mvUH1lmA+f3NoQ7SJVew8zwki/HrTrHb WLEBkp4TMdmDnri2SnZQ0/tX9UKVC/5ZH5/RQdbE3aElDq7gyYiVrEOd0ma46KkiV0BN +OjLJBzY+V6z5ateirtIO/irYxbD19SdWbM4s0JRfCUdzfiVRc/idiWHq9xNAVYOSSPp /wth7hmaDCLznvYE/xh4fLCsQsY8LykZCvSXQjHd67dsTQKJRSmjXuSIBnn5gme1aLoS un0CiRP762kCql7XTvx46w2V387uED91F2d8m3Wk0zWtLADkeLlgGJ/IZJICuxkVCgmo ehFA== 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=r+HIebDS/SDb/23G1fwB2Ldkb2s1jqduXVn6s/DQ7qc=; b=lf10JRIRsn0s/iaied4ulGxqdTZQ6oTnFpHYKggKu35Tutnnb/3hf9F48KF9JisKii fcDpvS5I0WiKqn173UCo3y4hC8iD2Ocv/aPY9uEGSKZUUwhZgWcsCdeGbUx1RhYwnRfT HN76IdSs4KNVvEmeB421Xvm0j6i8Afhe91sp/UhSMR9rsjxg1OIhVT7DH1ULUdiK7+se 5aA09Z2015ySTs+lTrenBYyjdtpBddPc/CzYuKOhQpDU8DRM+mFMixnDNMJmcHRKCrYE uMAM8etz+F0CJ2MRflZBq5dSfRRw+4/UHdDVLX9jDdPz/Wv/KgAY2kVZ1Hr9TAV1wBNe OdPw== 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 f22-v6si15833688pli.181.2018.03.08.10.25.21; Thu, 08 Mar 2018 10:25:21 -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 25D617899D; Thu, 8 Mar 2018 18:25:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 8135A7886F for ; Thu, 8 Mar 2018 18:24:47 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053629" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:47 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:26 +0200 Message-Id: <20180308181804.31261-4-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 04/42] serf: 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 --- meta/recipes-support/serf/serf/norpath.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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-support/serf/serf/norpath.patch b/meta/recipes-support/serf/serf/norpath.patch index 380f5d00d2d..c392444f7b3 100644 --- a/meta/recipes-support/serf/serf/norpath.patch +++ b/meta/recipes-support/serf/serf/norpath.patch @@ -5,11 +5,11 @@ Upstream-Status: Inappropriate RP 2014/7/17 -Index: serf-1.3.6/SConstruct +Index: serf-1.3.9/SConstruct =================================================================== ---- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000 -+++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000 -@@ -218,8 +218,7 @@ +--- serf-1.3.9.orig/SConstruct ++++ serf-1.3.9/SConstruct +@@ -224,8 +224,7 @@ if sys.platform != 'win32': else: LIBNAMESTATIC = 'serf-${MAJOR}' @@ -17,9 +17,9 @@ Index: serf-1.3.6/SConstruct - PDB='${TARGET.filebase}.pdb') +env.Append(PDB='${TARGET.filebase}.pdb') - #for i in env: - # print(str(env[i])) -@@ -371,12 +370,6 @@ + if sys.platform == 'darwin': + # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) +@@ -385,12 +384,6 @@ if gssapi and CALLOUT_OKAY: if sys.platform == 'win32': env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) @@ -32,8 +32,8 @@ Index: serf-1.3.6/SConstruct # Set up the construction of serf-*.pc pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), env.File('build/serf.pc.in'), -@@ -446,7 +439,6 @@ - ENV={'PATH' : os.environ['PATH']})) +@@ -461,7 +454,6 @@ else: + TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ] # Find the (dynamic) library in this directory -tenv.Replace(RPATH=thisdir)