From patchwork Fri Mar 9 18:55:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131218 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1342363lja; Fri, 9 Mar 2018 11:03:42 -0800 (PST) X-Google-Smtp-Source: AG47ELsLIr7L8C+saoBH+khnimPlyazR6fvWuo+HJYZB8E3kF6N896I13R396dqthIJT5q7s1DYl X-Received: by 2002:a17:902:20e6:: with SMTP id v35-v6mr28619114plg.226.1520622221600; Fri, 09 Mar 2018 11:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520622221; cv=none; d=google.com; s=arc-20160816; b=EN0YdEWNkM0r6pgGSNuU13Ff6AL8OWNVhGnXU9mal0oKM2Evfu+0kQgN/EnDY4B+Sm o1BkRJAGxZT2QVtCKZgzIRRnLscGb0BhzWpxacc6zvFqtLHlwPUycohL4etaVs2MH6Rl NxfTRvzXsNj7e8x7mZnlR21kBkWSAQcuaw+KV4kvy8nUpQJKCBy3gmrjALk8XEt+NIhl EB/EVgChX4j4rtgq3jWoKHBgK+vtBMNj/vu/37d51SzsFGUPrmmy4glUAbZRfA1wfFTD QVQVS6QMbn+6NR00MyVdNwZuAb0UZUMQ+N5u8lw4wVDhAdDEt6sr7SAhYc34WYBs8YEg GxPA== 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=L+xgCQ6eH6uboIQJwAFNFUc7zRyTtbHrVy9mTUI++W8=; b=N5vCijhjjZn6r1VrCg6onQgEz0gNzHQmwj4HXdUYl36oPSbnVtMIA7pzrg82R0p1JH uHxKSVjjc8OanUpk+hbJhuqIG1HH3/StrRUFg1tHxcvH9wY681+caRTCxbzodFvbJymk 2VpBp7JRLBBPTc/Ok2caVv7ijmAUb1K3HmpKQJ4+FIC23hZE/b30+mP0ETlsLQLt4tgL lTmxX377XOMCERApeRtdjO9Tc2TF766IzR4qkg/O1UObdfs8kUrnGdOCF0n5aPfrMrs2 +OJXZ2YX/S74FfS10C8IQ17yH8HJSJ5XEMBCoczZM9kOSF42qmNua6lUA0x7xhwXk/uC XTsg== 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 a2-v6si1261967plp.544.2018.03.09.11.03.41; Fri, 09 Mar 2018 11:03:41 -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 EE4207894F; Fri, 9 Mar 2018 19:03:16 +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 F416A7892F for ; Fri, 9 Mar 2018 19:02:59 +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:03:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,446,1515484800"; d="scan'208";a="32651882" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by FMSMGA003.fm.intel.com with ESMTP; 09 Mar 2018 11:03:00 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Fri, 9 Mar 2018 20:55:44 +0200 Message-Id: <20180309185614.31113-6-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 06/36] openssl: 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 --- .../openssl/openssl-1.0.2n/debian/c_rehash-compat.patch | 10 +++++----- .../openssl/openssl-1.0.2n/debian/debian-targets.patch | 14 +++++++------- 2 files changed, 12 insertions(+), 12 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/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch index 68e54d561e5..3820e3e306b 100644 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch @@ -5,10 +5,10 @@ Subject: [PATCH] also create old hash for compatibility Upstream-Status: Backport [debian] -diff --git a/tools/c_rehash.in b/tools/c_rehash.in -index b086ff9..b777d79 100644 ---- a/tools/c_rehash.in -+++ b/tools/c_rehash.in +Index: openssl-1.0.2n/tools/c_rehash.in +=================================================================== +--- openssl-1.0.2n.orig/tools/c_rehash.in ++++ openssl-1.0.2n/tools/c_rehash.in @@ -8,8 +8,6 @@ my $prefix; my $openssl = $ENV{OPENSSL} || "openssl"; @@ -48,7 +48,7 @@ index b086ff9..b777d79 100644 $fname =~ s/'/'\\''/g; my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`; chomp $hash; -@@ -176,11 +174,21 @@ sub link_hash_cert { +@@ -177,10 +175,20 @@ sub link_hash_cert { $hashlist{$hash} = $fprint; } diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch index 39d4328184b..35d92bedb74 100644 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch @@ -1,12 +1,12 @@ Upstream-Status: Backport [debian] -Index: openssl-1.0.2/Configure +Index: openssl-1.0.2n/Configure =================================================================== ---- openssl-1.0.2.orig/Configure -+++ openssl-1.0.2/Configure -@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic - - my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum"; +--- openssl-1.0.2n.orig/Configure ++++ openssl-1.0.2n/Configure +@@ -133,6 +133,10 @@ my $clang_devteam_warn = "-Wno-unused-pa + # Warn that "make depend" should be run? + my $warn_make_depend = 0; +# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS +my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; @@ -15,7 +15,7 @@ Index: openssl-1.0.2/Configure my $strict_warnings = 0; my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; -@@ -343,6 +347,55 @@ my %table=( +@@ -369,6 +373,55 @@ my %table=( "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",