From patchwork Thu Mar 8 18:17:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131043 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51487lja; Thu, 8 Mar 2018 10:26:11 -0800 (PST) X-Google-Smtp-Source: AG47ELsg4QL9g8gtv7BDDjcvaWM3CfF8QlEY87eQxbYD/g1bRQa5D034S78O/a9Sen+dBRrDa74z X-Received: by 10.98.86.15 with SMTP id k15mr27499287pfb.187.1520533571581; Thu, 08 Mar 2018 10:26:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533571; cv=none; d=google.com; s=arc-20160816; b=Xw1hQAohPEAFE1uuCgCCjciphmnALOHmdoBL6mkk4KWZ2APySnJV/jQvS8z/PxsZUj TE9h5NOMFPI1D9QLR268iA0xw9bVfBTiYN9MLcNgDzlaAjvJHHtHsAELjESZbPU5bG7p Z/mB5DSsDrKuNPyz+3fqWUa7kk3M+xcJxOwJVvjTBO21nPXIafawK6m5321QIWQ7k7V0 MC+v4a5VykP1zdGZgA96JAdsaaujcBasVq2hu0JpFf+WTImt55rRMm6GZ79RzUf92bQX VFdlrFahsXKmt10u8GEctjYVITjEz7GO0gv9ZxOozlnRSdU660yVBE7jjg8qH3ysOljj oVtg== 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=w3WKdjHGaRpCCvQVySJBmX2qKCNrogUNe67NLJT9H/s=; b=XfyCtiw/dPsXa6xpomwdYl5WTiUgyXBfahnWvUEavAnVMveEmkmIZ55rVPM1Cdul9l n+GFpA8A0ffB26njjEY8xU29I5zJTwo9140PXJmiLA1t/ySh8MDsa6lZn3Y/fmhIjGsz XjEWBE+53zJK6hfGkyBkvC4Vq6pqu55a9/nowvf0HLwEVbjr+RZ0VM/8cY3q7HsjgJd8 4hI8IxlpU+Qk69nMr/vUS4Rfnw7E61dwe08xhnzXjtDruSjbVhrCP5w1BOEzTceH3w+/ RDnno7f5GjqdYPak5ULim0eHijxk8+AC0Nr8NrVgp8v8t6b86pNg1kTST93y711OHCzb cvUQ== 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 t13si13259133pgp.450.2018.03.08.10.26.11; Thu, 08 Mar 2018 10:26:11 -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 C792B789BE; Thu, 8 Mar 2018 18:25:18 +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 B73417897D for ; Thu, 8 Mar 2018 18:24:56 +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:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053700" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:57 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:32 +0200 Message-Id: <20180308181804.31261-10-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 10/42] libksba: 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 --- .../libksba/ksba-add-pkgconfig-support.patch | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 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/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index d28dfd9ebeb..5afe6de923f 100644 --- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -6,13 +6,13 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile. Signed-off-by: Chen Qi -Index: libksba-1.3.0/Makefile.am +Index: libksba-1.3.5/Makefile.am =================================================================== ---- libksba-1.3.0.orig/Makefile.am 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/Makefile.am 2014-05-13 21:39:22.462385646 +0000 -@@ -21,6 +21,9 @@ +--- libksba-1.3.5.orig/Makefile.am ++++ libksba-1.3.5/Makefile.am +@@ -20,6 +20,9 @@ + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 - AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip +pkgconfigdir = ${libdir}/pkgconfig +pkgconfig_DATA = ksba.pc @@ -20,11 +20,11 @@ Index: libksba-1.3.0/Makefile.am # (A suitable gitlog-to-changelog script can be found in GnuPG master.) GITLOG_TO_CHANGELOG=gitlog-to-changelog -Index: libksba-1.3.0/configure.ac +Index: libksba-1.3.5/configure.ac =================================================================== ---- libksba-1.3.0.orig/configure.ac 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/configure.ac 2014-05-13 21:39:22.462385646 +0000 -@@ -400,6 +400,7 @@ +--- libksba-1.3.5.orig/configure.ac ++++ libksba-1.3.5/configure.ac +@@ -414,6 +414,7 @@ gl/Makefile src/Makefile src/ksba-config src/versioninfo.rc @@ -32,10 +32,10 @@ Index: libksba-1.3.0/configure.ac tests/Makefile doc/Makefile ]) -Index: libksba-1.3.0/ksba.pc.in +Index: libksba-1.3.5/ksba.pc.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libksba-1.3.0/ksba.pc.in 2014-05-13 21:39:22.462385646 +0000 +--- /dev/null ++++ libksba-1.3.5/ksba.pc.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -54,11 +54,11 @@ Index: libksba-1.3.0/ksba.pc.in +Libs.private: -L${libdir} -lgpg-error +Cflags: -I${includedir} + -Index: libksba-1.3.0/src/ksba.m4 +Index: libksba-1.3.5/src/ksba.m4 =================================================================== ---- libksba-1.3.0.orig/src/ksba.m4 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/src/ksba.m4 2014-05-13 21:49:03.650382696 +0000 -@@ -22,18 +22,7 @@ +--- libksba-1.3.5.orig/src/ksba.m4 ++++ libksba-1.3.5/src/ksba.m4 +@@ -22,18 +22,7 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], [AC_REQUIRE([AC_CANONICAL_HOST]) @@ -77,7 +77,7 @@ Index: libksba-1.3.0/src/ksba.m4 tmp=ifelse([$1], ,1:1.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -43,48 +32,13 @@ +@@ -43,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA], min_ksba_version="$tmp" fi @@ -129,7 +129,7 @@ Index: libksba-1.3.0/src/ksba.m4 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([KSBA API version]) if test "$req_ksba_api" -eq "$tmp" ; then -@@ -97,10 +51,8 @@ +@@ -97,10 +51,8 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then @@ -141,7 +141,7 @@ Index: libksba-1.3.0/src/ksba.m4 if test x"$libksba_config_host" != xnone ; then if test x"$libksba_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -114,8 +66,6 @@ +@@ -114,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA], fi fi else