From patchwork Wed Sep 5 21:02:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146040 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp29156ljw; Wed, 5 Sep 2018 14:02:39 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYD9ojOKJBGQMwj7ZFw9tDkwyZhDNBuJc91lTlaQrOspvtZUVOdg7vG1s10HMnfJFF0DfCu X-Received: by 2002:a17:902:4081:: with SMTP id c1-v6mr40939616pld.169.1536181358912; Wed, 05 Sep 2018 14:02:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181358; cv=none; d=google.com; s=arc-20160816; b=uARMnurV/ROFYdSufuj8Zc2R16ZsElVdl3t1Pyo6gxH+GLX/FhQgmCimD7cGqmqxJ4 A1vyZPkPDttK4A4gkHOeDI2n0b7x4ZfG6264dq20DwtHD0BPlfP6BMCvFhbtxcT6IWZ5 PYLbE2qVF3vF5DPGwWsxrbTDVzS5ypw9gwK6XCyrIfW3EK67eTe+Y/DueN+wNZBFcNBZ AkXObl+z+cz94mlG6P5LN82iqidQYbawtTtLDVLXfKwAE3F+tknR5Xhq+ZHRI0qIlEFv DSf6ZTy/88w7HSm/8RK46bZDgXUCIpj/pxLe2g66Dy+WaBswOIXdJAaWVqI3B0TaQPlE TIZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=VrXpURpv7GBO2ymfUGwIMWQ8LGuOJAeVNBPO1Q4hn5E=; b=tcD+wy3pQm6ake23Vi1Iwx12kCZHY8BZIubQsk3QtXAd1+WJLrfn0BDaVAbzm8DMW9 ws2hvlDLM/t4gGvw8Am8n/os33JqHF4PbKaybMu3wfFXnzy/E8umwAJ5XECDJJr83DPB TN5UFxwsq2W+1tAeilW+uwJ/vpkJDV/Ri6669aV4UgJ5p/WlpNKT8vGIA83rYluGH0q/ /Iu4z9PUFiouHs7k/8lcas0Onxa+lzPPlOEf+nyb2WvnyVFmyiiPSL6PBbWLEvesLnSa jjQDPPPFviNlr+dczN5yBIwoEatzgAAjuPLBTIpkbzshMIO4mH2L+vhbv/SyFVzhNwd8 wxdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nrkONzua; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y141-v6si3269913pfb.331.2018.09.05.14.02.38; Wed, 05 Sep 2018 14:02:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nrkONzua; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E18F179412; Wed, 5 Sep 2018 21:02:33 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mail.openembedded.org (Postfix) with ESMTP id D6DFD79034 for ; Wed, 5 Sep 2018 21:02:31 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id s17-v6so3866361plp.7 for ; Wed, 05 Sep 2018 14:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0qRc9bRKR+UN4ao1n8C3gCb5ThqOkyH9GRJ6WFCslyE=; b=nrkONzuaHHGsbvcuh0ia+sAO70z9AWowtZ4HoE6gizW0IjV3bIznRzdg7C5i/nKhtE OE29pbRh303TpxgMXZ07fCFBXW0LsTmhXCQloDG1Zz7batOj/xWO0IZnh/zwkRSKRDYd i6kaddldHg9i+hR+eXKgtDKDfddxATQu5U4yGbFuMokeWleBWEkDXoKy/thCSc157SML CbE3T5iLdKbDs5srLS0pPxf/rRXa/oIAU72WJ+l66Ox1mbjkZhsPI1K+IsWmKi3gms87 8+zoriuqU+P/yXBvpJIeFrMNrFzsDet9fMQJ5SI+WrtM8OSrmPh2EI76O0ekdP0tfUSG SWLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0qRc9bRKR+UN4ao1n8C3gCb5ThqOkyH9GRJ6WFCslyE=; b=BLBXVTDR3bKR50TTYJKK/NLDs9SZCsKAo5xrs4JKZ0PbBCZJCPeA5lb1vxs6MhAacQ OmuBmCFpKhE3TpqqEv6m+fEx/sDHjtgfD+H/NBjBhvG6Bur07EM7ZUeCeL8TPraLr+F0 32GjXz8M3rCHMVUy1ErPsW7Jr0C2C4K3CD1IRhBGs+ui1sTflZQxASS4B4P2HYm9EBHP erC648C2Kf4m/YKNKO6KvoDvT7SFiPLSh96uQqezhrZH36k6btAnLzrn3lSPnilVjS8N l9dj/Q7nWG+B1JN4HATgYJ6EXg+fvFXizQbIXaTaYudF87V31gHUidTm4cR4G1OUBnqI vq2A== X-Gm-Message-State: APzg51CZM4UKpLkK6aji1F/ZPBXB1fWYhK5fga0Er42O3ZZC/is/xnAl YMT1wvJJEwtIcY06JJ5XXslK00Fk X-Received: by 2002:a17:902:7845:: with SMTP id e5-v6mr40836412pln.197.1536181352215; Wed, 05 Sep 2018 14:02:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:13 -0700 Message-Id: <20180905210224.21225-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 01/12] asio: Upgrade to 1.12.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org * Fixes build with openSSL 1.1.x * Merge .inc into .bb its a single recipe using it License-Update: Change Copyright years Signed-off-by: Khem Raj --- ...ndle-glibc-variant-of-strerror_r-wit.patch | 46 ------------- ...e-POSIX-poll.h-instead-of-sys-poll.h.patch | 64 ------------------- meta-oe/recipes-support/asio/asio_1.10.6.bb | 11 ---- .../asio/{asio.inc => asio_1.12.1.bb} | 7 ++ 4 files changed, 7 insertions(+), 121 deletions(-) delete mode 100644 meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch delete mode 100644 meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch delete mode 100644 meta-oe/recipes-support/asio/asio_1.10.6.bb rename meta-oe/recipes-support/asio/{asio.inc => asio_1.12.1.bb} (63%) diff --git a/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch b/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch deleted file mode 100644 index 4244b97a8c..0000000000 --- a/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 45c855400842fd40f200ae9b7abf9debf4ab5436 Mon Sep 17 00:00:00 2001 -From: Christopher Kohlhoff -Date: Sun, 28 Aug 2016 09:21:53 +1000 -Subject: [PATCH] Automatically handle glibc variant of strerror_r without - #ifdefs. - ---- -Upstream-Status: Backport https://github.com/chriskohlhoff/asio/commit/443bc17d13eb5e37de780ea6e23157493cf7b3b9 - include/asio/impl/error_code.ipp | 16 +++++++--------- - 1 file changed, 7 insertions(+), 9 deletions(-) - -diff --git a/include/asio/impl/error_code.ipp b/include/asio/impl/error_code.ipp -index ccb70dd..a117658 100644 ---- a/include/asio/impl/error_code.ipp -+++ b/include/asio/impl/error_code.ipp -@@ -97,20 +97,18 @@ public: - #if defined(__sun) || defined(__QNX__) || defined(__SYMBIAN32__) - using namespace std; - return strerror(value); --#elif defined(__MACH__) && defined(__APPLE__) \ -- || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) \ -- || defined(_AIX) || defined(__hpux) || defined(__osf__) \ -- || defined(__ANDROID__) -- char buf[256] = ""; -- using namespace std; -- strerror_r(value, buf, sizeof(buf)); -- return buf; - #else - char buf[256] = ""; -- return strerror_r(value, buf, sizeof(buf)); -+ using namespace std; -+ return strerror_result(strerror_r(value, buf, sizeof(buf)), buf); - #endif - #endif // defined(ASIO_WINDOWS) - } -+ -+private: -+ // Helper function to adapt the result from glibc's variant of strerror_r. -+ static const char* strerror_result(int, const char* s) { return s; } -+ static const char* strerror_result(const char* s, const char*) { return s; } - }; - - } // namespace detail --- -2.9.3 - diff --git a/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch b/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index 7f95f5a25e..0000000000 --- a/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dac36a170188917e2f61b0394ba8a2f6509ddf3a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Tue, 8 Nov 2016 20:39:55 +0000 -Subject: [PATCH] use POSIX poll.h instead of sys/poll.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -POSIX specifies that is the correct header to -include for poll() - http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html -whereas is only needed for ancient glibc (<2.3), -so let's follow POSIX instead. - -As a side-effect, this silences numerous compilation warnings -when compiling against the musl C-library: - -In file included from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/socket_types.hpp:57:0, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/impl/error_code.ipp:29, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/error_code.hpp:185, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/throw_error.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/impl/posix_tss_ptr.ipp:23, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/posix_tss_ptr.hpp:74, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/tss_ptr.hpp:27, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/call_stack.hpp:20, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/impl/handler_alloc_hook.ipp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/handler_alloc_hook.hpp:78, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/handler_alloc_helpers.hpp:21, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/bind_handler.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/wrapped_handler.hpp:18, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/io_service.hpp:24, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_io_object.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_socket.hpp:20, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_datagram_socket.hpp:20, - from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio.hpp:19, - from ../../../../asio-1.10.6/src/examples/cpp03/buffers/reference_counted.cpp:11: -/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include to [-Wcpp] - #warning redirecting incorrect #include to - ^~~~~~~ - -etc. - -Signed-off-by: André Draszik ---- -Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419 - include/asio/detail/socket_types.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/asio/detail/socket_types.hpp b/include/asio/detail/socket_types.hpp -index f2600c2..cb61b8e 100644 ---- a/include/asio/detail/socket_types.hpp -+++ b/include/asio/detail/socket_types.hpp -@@ -54,7 +54,7 @@ - #else - # include - # if !defined(__SYMBIAN32__) --# include -+# include - # endif - # include - # include --- -2.10.2 - diff --git a/meta-oe/recipes-support/asio/asio_1.10.6.bb b/meta-oe/recipes-support/asio/asio_1.10.6.bb deleted file mode 100644 index 5656039846..0000000000 --- a/meta-oe/recipes-support/asio/asio_1.10.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -require asio.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=fede5286a78559dd646e355ab0cc8f04" - -SRC_URI[md5sum] = "85d014a356a6e004cd30ccd4c9b6a5c2" -SRC_URI[sha256sum] = "e0d71c40a7b1f6c1334008fb279e7361b32a063e020efd21e40d9d8ff037195e" - -SRC_URI += "\ - file://0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch \ - file://0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch \ -" diff --git a/meta-oe/recipes-support/asio/asio.inc b/meta-oe/recipes-support/asio/asio_1.12.1.bb similarity index 63% rename from meta-oe/recipes-support/asio/asio.inc rename to meta-oe/recipes-support/asio/asio_1.12.1.bb index 54f78e41d1..28cd9c0e19 100644 --- a/meta-oe/recipes-support/asio/asio.inc +++ b/meta-oe/recipes-support/asio/asio_1.12.1.bb @@ -13,3 +13,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" inherit autotools ALLOW_EMPTY_${PN} = "1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3e73f311a3af69e6df275e8c3b1c09b5" + +SRC_URI[md5sum] = "037854d113024f57c9753d6326b339bc" +SRC_URI[sha256sum] = "a9091b4de847539fa5b2259bf76a5355339c7eaaa5e33d7d4ae74d614c21965a" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" From patchwork Wed Sep 5 21:02:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146041 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp29445ljw; Wed, 5 Sep 2018 14:02:54 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaWEcrYdGhnMWXFyi1H1Ygl1iu7pwpMvLuQ3NfNYvl+HTAoGfAA3fHLrgoA7GOCKRvriw8E X-Received: by 2002:a17:902:683:: with SMTP id 3-v6mr41314902plh.52.1536181373997; Wed, 05 Sep 2018 14:02:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181373; cv=none; d=google.com; s=arc-20160816; b=e/uyEYe5VPyg+9N+tmZl5OdLmZG4ssavC+/Y+yvHII5YTAALYghJFDrxAfBe8OjN8/ bQxLmGqi64raJVzuMjE+kpR0HyGV1H6UoX6GnpbXJs+dF7ixST3e/jm+Wno/v51bIIvp tvhsbM1vE0dO5vVx1EMnRiBgNea7Ffcxz0mOvwFl0cDRuJALdkBAGJZxt6WXXHe112CT TE/pixpN0ziu1M/LrkuXsd2sIAlhtR+ASB6+lRBTWvL8P8dKapMzATV7VeCWJbCUBotu cSKxwYPpwv3yZ45czeUoi5TUkMP66TezJPuU+n7RPmB2qxf4LedZRqfkJJ8sYFZNewZZ CDFw== 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:dkim-signature:delivered-to; bh=eKT8nt86r4bUOfp2FAa/euQkJmEKLnSPombnExR6oIA=; b=OoZEhLdTI5NzwAZr7s+Frt6/a4rpUe+G9izc1rTad9f2xwjh080ZbNctmQU5gswchk /Yb4jbgx3pDsTjjS1rC5iKdUGoDhndDpO3eENT/9JrsxGSY5dG1knuwPCbNbLSggffMX HXgKgN7OBo0fn1TIbMroXyyO6y5ewNI4CYzew++25YLGAJ41l+Wrb05K8XyamS1BTIui Gz2z573FR5acSQ1gReBZjXYusQEscCt8KuNrCImssI55IUUys+OS57JnT934gOJSzG9V pZ3e4unFIG8JKKOk8D4/GNkp9/CFdUHnkk0UKc+BIYGo++YhHNwv/hEJbxwCN2Dty626 d8Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C9sH3ath; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a1-v6si3277682pfd.273.2018.09.05.14.02.53; Wed, 05 Sep 2018 14:02:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C9sH3ath; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 98E4079449; Wed, 5 Sep 2018 21:02:50 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mail.openembedded.org (Postfix) with ESMTP id 5800F79034 for ; Wed, 5 Sep 2018 21:02:32 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id i26-v6so4077550pfo.12 for ; Wed, 05 Sep 2018 14:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tMvxzMxjsuJ3Cy8rbLzNlCOHtDfN9JGhtnutPD1x7Ww=; b=C9sH3athhDF8dkM/m/spEzRRHwnuYhejk1TfsU4EpDVqabHDDcnZMprwT8+blpefgF EerERq0lt7p8H/zynay+/oLkOYURrQ5NX20YvFNc3r88zyqDOrogs4bbFwp3c7oJWhAl LPPoT0yiRHYxYs3elIrP/vaGmu+FCpRUts3N0LkEXtBe+J+AiOEF/F9devwJoqDLizi4 j2Q0OWWMZ8rxaGl5QXCiY1RPtbFrJBNHVALZ+BA1HyVp9Q/LEbaZ42+buXLbqF5S/AVL 69vX/D5/JFdRo2NWHU3DVZcYcoCWIdLyIs+Sx9uU+I7/7CrsP9wGm001VaI8G36wS++7 EBVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tMvxzMxjsuJ3Cy8rbLzNlCOHtDfN9JGhtnutPD1x7Ww=; b=U897Ilz8AoK3vQiSA64aNL5syAlLYtcGG9/jxFwlfZH4He3qqvVlzBPs07v/VMu1jS PWVlksdXDuFuQ9Ps8euBooFCRwgfzNqTaFR+FMPYfYj05O5e9saPpPSi6LgOZTkeW1If i6jJ3QlMK+Kqdnfx3NBoeZsR5UEdvgV+Q2RDOcN4bEnSmQ8wgZu7aEfsaaLPgPcUpehB e/iU74xCYDgxlfKs53pM+S61pnsEXK1EbcZqfTHt1jFrb33qwdBWF1cIey5KNzO6Tb4i Z70myyl1TuupNLZ7H3cHV+ADtytpFdd8jOswc8RIN3s3HhXRjmbXYAfPQ5+ZjMEMNXxx eROg== X-Gm-Message-State: APzg51DZ8YWxMXDVIBbBu6VEeqjAxlwMLhZCgfm2pyPqWslnFPi6cLUr v5Qt5Xyg0ZkXBeQpFlJl8CZD2mcJ X-Received: by 2002:a63:c544:: with SMTP id g4-v6mr18722368pgd.113.1536181352974; Wed, 05 Sep 2018 14:02:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:14 -0700 Message-Id: <20180905210224.21225-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 02/12] libtorrent: Upgrade to latest 0.13.7+master X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org * Fixes build with OpenSSL 1.1.x * Adjust patches to rebase on top of current master Signed-off-by: Khem Raj --- ...t-run-code-while-configuring-package.patch | 98 +++---------------- .../libtorrent/libtorrent_git.bb | 4 +- 2 files changed, 18 insertions(+), 84 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch b/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch index 79d4f29fab..8d8867aea7 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch @@ -4,91 +4,25 @@ cross-compiling. Don't run code while configuring package. Upstream-Status: Pending Signed-off-by: Andrei Gherzan -Index: libtorrent-0.13.3/scripts/checks.m4 +Index: git/scripts/common.m4 =================================================================== ---- libtorrent-0.13.3.orig/scripts/checks.m4 2012-05-14 14:17:04.000000000 +0300 -+++ libtorrent-0.13.3/scripts/checks.m4 2013-02-10 15:28:37.414445524 +0200 -@@ -95,40 +95,6 @@ - - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) -- -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -- #include -- #include -- #include -- #include -- #include -- int main() { -- struct kevent ev@<:@2@:>@, ev_out@<:@2@:>@; -- struct timespec ts = { 0, 0 }; -- int pfd@<:@2@:>@, pty@<:@2@:>@, kfd, n; -- char buffer@<:@9001@:>@; -- if (pipe(pfd) == -1) return 1; -- if (fcntl(pfd@<:@1@:>@, F_SETFL, O_NONBLOCK) == -1) return 2; -- while ((n = write(pfd@<:@1@:>@, buffer, sizeof(buffer))) == sizeof(buffer)); -- if ((pty@<:@0@:>@=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3; -- if ((pty@<:@1@:>@=grantpt(pty@<:@0@:>@)) == -1) return 4; -- EV_SET(ev+0, pfd@<:@1@:>@, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL); -- EV_SET(ev+1, pty@<:@1@:>@, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL); -- if ((kfd = kqueue()) == -1) return 5; -- if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6; -- if (ev_out@<:@0@:>@.flags & EV_ERROR) return 7; -- if (ev_out@<:@1@:>@.flags & EV_ERROR) return 8; -- read(pfd@<:@0@:>@, buffer, sizeof(buffer)); -- if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(yes) -- ], [ -- AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.) -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_WITH_KQUEUE], [ -Index: libtorrent-0.13.3/scripts/common.m4 -=================================================================== ---- libtorrent-0.13.3.orig/scripts/common.m4 2012-05-14 14:17:04.000000000 +0300 -+++ libtorrent-0.13.3/scripts/common.m4 2013-02-10 15:27:55.874446741 +0200 -@@ -222,38 +222,10 @@ - +--- git.orig/scripts/common.m4 ++++ git/scripts/common.m4 +@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_MSG_CHECKING(for execinfo.h) -- -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -- #include -- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} -- ])], -- [ -- AC_MSG_RESULT(yes) -- AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) -- ], [ -- AC_MSG_RESULT(no) -- ]) - ]) - + +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include + int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} + ])], +@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_DEFUN([TORRENT_CHECK_ALIGNED], [ AC_MSG_CHECKING(the byte alignment) -- + - AC_RUN_IFELSE([AC_LANG_SOURCE([ -- #include -- int main() { -- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; -- int i; -- for (i = 1; i < 4; ++i) -- if (*(uint32_t*)(buf + i) == 0) return -1; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(none needed) -- ], [ -- AC_DEFINE(USE_ALIGNED, 1, Require byte alignment) -- AC_MSG_RESULT(required) -- ]) - ]) - - ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include + int main() { + char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 92e65289a9..b2dffcdb91 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -11,9 +11,9 @@ SRC_URI = "git://github.com/rakshasa/libtorrent \ file://0001-implement-64bit-atomic-for-mips.patch \ file://0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch \ " -SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87" +SRCREV = "074f6ec51a2e4bc5c6140b4dad13c9bb56f3f0dc" -PV = "0.13.6+git${SRCPV}" +PV = "0.13.7+git${SRCPV}" S = "${WORKDIR}/git" From patchwork Wed Sep 5 21:02:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146042 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp29588ljw; Wed, 5 Sep 2018 14:03:01 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbC4nWTjCzL3YSgvjeXaMIFEEzpGUFrzRFNi9fOB/Ner+yoeRq91IHvUK8xYSzM4FtPs3Iv X-Received: by 2002:a62:56d9:: with SMTP id h86-v6mr19077846pfj.229.1536181381677; Wed, 05 Sep 2018 14:03:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181381; cv=none; d=google.com; s=arc-20160816; b=cybN0ImAa/DAXY4uNBYs6mGO4NQRasYhPSn11gzS2KSL4+CuGN7eFAtakFFF0LSnQN 3irl5ljy/QGJeG3dgKxmz79myNPpSDnmJuES5u5bYX49yUtH7pL2auQMWsyVf9u3pbpc w/iHLj30eH+3gVxDUD4PIz2dK+P10m5tUGIZ0F91oBSDYcWYZkQvhCWwi1MXSew4EMfw Y9zB+Oj87mGwB7mcv9ez5TKuIucF77dYEfGlzKXoyLkkk4YOwYaa+cVMKEv49yZ0XnK2 O1TdubyivqK2i/L2/L7MNvS6Pae4iwB5u57hncFcISy/Xdi7MdwFOjQqBUw+i+TW15Ax BgZw== 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:dkim-signature:delivered-to; bh=AVS75irEKZANsC5KCusiUIQLX2yTCw3lA340e0WWAjk=; b=BdphtwfGgADQ4zRJFq1tqU/XEdSeK1aEB6JbbaFE/pbqje22N3SRYoD/yqSEKrKlhe ZLv+7GJUX2iHJ3yyFv7p9A4CA4Pbu2gKdWSeILOB76dZJzIEKwrrqAXCG4BEcBl4gEI+ WWAFXavTpSbeS91mDXec7qDOcNIZzDttRtalXlAEKG4JhNvUNahVGBH5WOFbIl0WrJl6 xadFwhvX/7hPTCTAfCEGIoHmvL7HaKefanX8pIfGEKB2dSA+RC6oO9u4eD536y5CxQzM rk7jX8a2Y8kCS9Tuo6eTl18S72Wfndkq8nMpT+AvFCQDN2QU6n1L8lRP8yePon9o5F28 lZDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="LrZy/I7I"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a68-v6si3116520pla.361.2018.09.05.14.03.01; Wed, 05 Sep 2018 14:03:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="LrZy/I7I"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 808EC7940B; Wed, 5 Sep 2018 21:02:55 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mail.openembedded.org (Postfix) with ESMTP id 7E45F79034 for ; Wed, 5 Sep 2018 21:02:33 +0000 (UTC) Received: by mail-pl1-f179.google.com with SMTP id b30-v6so1583959pla.0 for ; Wed, 05 Sep 2018 14:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CvFeAWXQj17d3zjCDnp+7uWIzscsBUHToancjiL6tP4=; b=LrZy/I7I5/vB6+chVFcrXfOwUzNIiBHCF3y+Lk2JbD08POLzBklzzwGZOTLIdmozd8 AX5NFDguwyrj7l2BnNiTOMleTMXo72nuQYuAz3hGkj/6K7SLmZrZLJ/t32EdSVmZbLO+ zhSR24JDpZ4PaCRDhqt9pbJTkDM8j3yHngH+h4IPN9PZiv+RLRn2+sQRKK0W6LehXkTa N//6mT6xUvneBS5x6yASDp4QEUxrc9b5BGEI7+nAcF5LA8d778OjESBjKtYe3+Uk+rqV NaYfXHOwLmAPIGjWKBi9blZ6Hiws7LvB7rlDwm2Y5CPk17ZdukkOn8ek0L3+J3NUUun2 ICWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CvFeAWXQj17d3zjCDnp+7uWIzscsBUHToancjiL6tP4=; b=TUULaXYcPFrD27tJItheB+TYXbVHNuYr/aC33rE1svWdthzeuyXc+YiVoCSeDpiOuA DlOpmWLYlJY429Y8i7itvv5y15VME7B2nD5u7k+fz10DId9CVlb3IXW/kdLRGKNiJMIz jEA6NEGTYPolaRIyG7QQkANUOuDxneNxgDqM8zrAzShtdYHm6vrhoBMheUSVXelNm+wg zW/nhOY+QVf3kX2gD4Q7p/fLZ2nnXfTgnxmF7nKdAAiBScooapIUWFfwFpRrmaiZyjgC Ikl4CpUUVxMsArUnPG5LB4IY2qW3NtGr21raNp0PcAIL5BhEP4H6OyjyPuw2FbRdweay R9+Q== X-Gm-Message-State: APzg51BKtdVNhmT1dMFy0teppC/jzCA6C3Rc67Z9GNHeZ5oanaZQEm1X c7k28mSlGBExzNz73Di3LJ+ex+hc X-Received: by 2002:a17:902:82c5:: with SMTP id u5-v6mr40421835plz.83.1536181354231; Wed, 05 Sep 2018 14:02:34 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:15 -0700 Message-Id: <20180905210224.21225-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 03/12] openwsman: Upgrade to 2.6.5 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org * Backport patches to fix build with OpenSSL 1.1.x Signed-off-by: Khem Raj --- .../0001-Port-to-OpenSSL-1.1.0.patch | 162 ++++++++++++++++++ ...rsion-number-to-allow-builds-with-ol.patch | 48 ++++++ ...{openwsman_2.6.4.bb => openwsman_2.6.5.bb} | 7 +- 3 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/openwsman/openwsman/0001-Port-to-OpenSSL-1.1.0.patch create mode 100644 meta-oe/recipes-extended/openwsman/openwsman/0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch rename meta-oe/recipes-extended/openwsman/{openwsman_2.6.4.bb => openwsman_2.6.5.bb} (92%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0001-Port-to-OpenSSL-1.1.0.patch b/meta-oe/recipes-extended/openwsman/openwsman/0001-Port-to-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..49afa56f56 --- /dev/null +++ b/meta-oe/recipes-extended/openwsman/openwsman/0001-Port-to-OpenSSL-1.1.0.patch @@ -0,0 +1,162 @@ +From f78643d2388dd0697f83f17880403253a0596d83 Mon Sep 17 00:00:00 2001 +From: Vitezslav Crhonek +Date: Wed, 5 Sep 2018 11:23:46 -0700 +Subject: [PATCH 1/2] Port to OpenSSL 1.1.0 + +Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/99] +Signed-off-by: Khem Raj +--- + src/lib/wsman-curl-client-transport.c | 6 +++- + src/server/shttpd/io_ssl.c | 17 ---------- + src/server/shttpd/shttpd.c | 20 ++++-------- + src/server/shttpd/ssl.h | 46 --------------------------- + 4 files changed, 12 insertions(+), 77 deletions(-) + +diff --git a/src/lib/wsman-curl-client-transport.c b/src/lib/wsman-curl-client-transport.c +index cd7f517a..e64ad097 100644 +--- a/src/lib/wsman-curl-client-transport.c ++++ b/src/lib/wsman-curl-client-transport.c +@@ -241,12 +241,16 @@ write_handler( void *ptr, size_t size, size_t nmemb, void *data) + static int ssl_certificate_thumbprint_verify_callback(X509_STORE_CTX *ctx, void *arg) + { + unsigned char *thumbprint = (unsigned char *)arg; +- X509 *cert = ctx->cert; + EVP_MD *tempDigest; + + unsigned char tempFingerprint[EVP_MAX_MD_SIZE]; + unsigned int tempFingerprintLen; + tempDigest = (EVP_MD*)EVP_sha1( ); ++ ++ X509 *cert = X509_STORE_CTX_get_current_cert(ctx); ++ if(!cert) ++ return 0; ++ + if ( X509_digest(cert, tempDigest, tempFingerprint, &tempFingerprintLen ) <= 0) + return 0; + if(!memcmp(tempFingerprint, thumbprint, tempFingerprintLen)) +diff --git a/src/server/shttpd/io_ssl.c b/src/server/shttpd/io_ssl.c +index 6de0db2a..7ac669e4 100644 +--- a/src/server/shttpd/io_ssl.c ++++ b/src/server/shttpd/io_ssl.c +@@ -11,23 +11,6 @@ + #include "defs.h" + + #if !defined(NO_SSL) +-struct ssl_func ssl_sw[] = { +- {"SSL_free", {0}}, +- {"SSL_accept", {0}}, +- {"SSL_connect", {0}}, +- {"SSL_read", {0}}, +- {"SSL_write", {0}}, +- {"SSL_get_error", {0}}, +- {"SSL_set_fd", {0}}, +- {"SSL_new", {0}}, +- {"SSL_CTX_new", {0}}, +- {"SSLv23_server_method", {0}}, +- {"SSL_library_init", {0}}, +- {"SSL_CTX_use_PrivateKey_file", {0}}, +- {"SSL_CTX_use_certificate_file",{0}}, +- {NULL, {0}} +-}; +- + void + _shttpd_ssl_handshake(struct stream *stream) + { +diff --git a/src/server/shttpd/shttpd.c b/src/server/shttpd/shttpd.c +index 5876392e..4c1dbf32 100644 +--- a/src/server/shttpd/shttpd.c ++++ b/src/server/shttpd/shttpd.c +@@ -1476,20 +1476,14 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) + int retval = FALSE; + EC_KEY* key; + +- /* Load SSL library dynamically */ +- if ((lib = dlopen(SSL_LIB, RTLD_LAZY)) == NULL) { +- _shttpd_elog(E_LOG, NULL, "set_ssl: cannot load %s", SSL_LIB); +- return (FALSE); +- } +- +- for (fp = ssl_sw; fp->name != NULL; fp++) +- if ((fp->ptr.v_void = dlsym(lib, fp->name)) == NULL) { +- _shttpd_elog(E_LOG, NULL,"set_ssl: cannot find %s", fp->name); +- return (FALSE); +- } +- + /* Initialize SSL crap */ ++ debug("Initialize SSL"); ++ SSL_load_error_strings(); ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_library_init(); ++ #else ++ OPENSSL_init_ssl(0, NULL); ++ #endif + + if ((CTX = SSL_CTX_new(SSLv23_server_method())) == NULL) + _shttpd_elog(E_LOG, NULL, "SSL_CTX_new error"); +@@ -1532,7 +1526,7 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) + if (strncasecmp(protocols[idx].name, ssl_disabled_protocols, blank_ptr-ssl_disabled_protocols) == 0) { + //_shttpd_elog(E_LOG, NULL, "SSL: disable %s protocol", protocols[idx].name); + debug("SSL: disable %s protocol", protocols[idx].name); +- SSL_CTX_ctrl(CTX, SSL_CTRL_OPTIONS, protocols[idx].opt, NULL); ++ SSL_CTX_set_options(CTX, protocols[idx].opt); + break; + } + } +diff --git a/src/server/shttpd/ssl.h b/src/server/shttpd/ssl.h +index a863f2c7..8dad0109 100644 +--- a/src/server/shttpd/ssl.h ++++ b/src/server/shttpd/ssl.h +@@ -12,50 +12,4 @@ + + #include + +-#else +- +-/* +- * Snatched from OpenSSL includes. I put the prototypes here to be independent +- * from the OpenSSL source installation. Having this, shttpd + SSL can be +- * built on any system with binary SSL libraries installed. +- */ +- +-typedef struct ssl_st SSL; +-typedef struct ssl_method_st SSL_METHOD; +-typedef struct ssl_ctx_st SSL_CTX; +- +-#define SSL_ERROR_WANT_READ 2 +-#define SSL_ERROR_WANT_WRITE 3 +-#define SSL_ERROR_SYSCALL 5 +-#define SSL_FILETYPE_PEM 1 +- + #endif +- +-/* +- * Dynamically loaded SSL functionality +- */ +-struct ssl_func { +- const char *name; /* SSL function name */ +- union variant ptr; /* Function pointer */ +-}; +- +-extern struct ssl_func ssl_sw[]; +- +-#define FUNC(x) ssl_sw[x].ptr.v_func +- +-#define SSL_free(x) (* (void (*)(SSL *)) FUNC(0))(x) +-#define SSL_accept(x) (* (int (*)(SSL *)) FUNC(1))(x) +-#define SSL_connect(x) (* (int (*)(SSL *)) FUNC(2))(x) +-#define SSL_read(x,y,z) (* (int (*)(SSL *, void *, int)) FUNC(3))((x),(y),(z)) +-#define SSL_write(x,y,z) \ +- (* (int (*)(SSL *, const void *,int)) FUNC(4))((x), (y), (z)) +-#define SSL_get_error(x,y)(* (int (*)(SSL *, int)) FUNC(5))((x), (y)) +-#define SSL_set_fd(x,y) (* (int (*)(SSL *, int)) FUNC(6))((x), (y)) +-#define SSL_new(x) (* (SSL * (*)(SSL_CTX *)) FUNC(7))(x) +-#define SSL_CTX_new(x) (* (SSL_CTX * (*)(SSL_METHOD *)) FUNC(8))(x) +-#define SSLv23_server_method() (* (SSL_METHOD * (*)(void)) FUNC(9))() +-#define SSL_library_init() (* (int (*)(void)) FUNC(10))() +-#define SSL_CTX_use_PrivateKey_file(x,y,z) (* (int (*)(SSL_CTX *, \ +- const char *, int)) FUNC(11))((x), (y), (z)) +-#define SSL_CTX_use_certificate_file(x,y,z) (* (int (*)(SSL_CTX *, \ +- const char *, int)) FUNC(12))((x), (y), (z)) +-- +2.18.0 + diff --git a/meta-oe/recipes-extended/openwsman/openwsman/0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch b/meta-oe/recipes-extended/openwsman/openwsman/0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch new file mode 100644 index 0000000000..5ae2e0006e --- /dev/null +++ b/meta-oe/recipes-extended/openwsman/openwsman/0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch @@ -0,0 +1,48 @@ +From 75669b077bd54bedbc086c60cbe137e7f4c685b5 Mon Sep 17 00:00:00 2001 +From: Vitezslav Crhonek +Date: Mon, 24 Apr 2017 11:28:39 +0200 +Subject: [PATCH 2/2] Check OpenSSL version number to allow builds with older + version + +Upstream-Status: Submitted [https://github.com/Openwsman/openwsman/pull/99] +Signed-off-by: Khem Raj +--- + src/lib/wsman-curl-client-transport.c | 4 ++++ + src/server/shttpd/shttpd.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/lib/wsman-curl-client-transport.c b/src/lib/wsman-curl-client-transport.c +index e64ad097..4fc047e8 100644 +--- a/src/lib/wsman-curl-client-transport.c ++++ b/src/lib/wsman-curl-client-transport.c +@@ -247,7 +247,11 @@ static int ssl_certificate_thumbprint_verify_callback(X509_STORE_CTX *ctx, void + unsigned int tempFingerprintLen; + tempDigest = (EVP_MD*)EVP_sha1( ); + ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L ++ X509 *cert = ctx->cert; ++ #else + X509 *cert = X509_STORE_CTX_get_current_cert(ctx); ++ #endif + if(!cert) + return 0; + +diff --git a/src/server/shttpd/shttpd.c b/src/server/shttpd/shttpd.c +index 4c1dbf32..161720c8 100644 +--- a/src/server/shttpd/shttpd.c ++++ b/src/server/shttpd/shttpd.c +@@ -1526,7 +1526,11 @@ set_ssl(struct shttpd_ctx *ctx, const char *pem) + if (strncasecmp(protocols[idx].name, ssl_disabled_protocols, blank_ptr-ssl_disabled_protocols) == 0) { + //_shttpd_elog(E_LOG, NULL, "SSL: disable %s protocol", protocols[idx].name); + debug("SSL: disable %s protocol", protocols[idx].name); ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L ++ SSL_CTX_ctrl(CTX, SSL_CTRL_OPTIONS, protocols[idx].opt, NULL); ++ #else + SSL_CTX_set_options(CTX, protocols[idx].opt); ++ #endif + break; + } + } +-- +2.18.0 + diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.4.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.5.bb similarity index 92% rename from meta-oe/recipes-extended/openwsman/openwsman_2.6.4.bb rename to meta-oe/recipes-extended/openwsman/openwsman_2.6.5.bb index f46a3bd25c..5fba3855c0 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.4.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.5.bb @@ -15,13 +15,15 @@ DEPENDS = "curl libxml2 openssl libpam" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -SRCREV = "4aff7eaf5df948b6ed74cf4f8dd721a397bfb759" -PV = "2.6.4" +SRCREV = "e90e5c96e3006c372bf45e0185e33c9250e67df6" +PV = "2.6.5" SRC_URI = "git://github.com/Openwsman/openwsman.git \ file://libssl-is-required-if-eventint-supported.patch \ file://openwsmand.service \ file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ + file://0001-Port-to-OpenSSL-1.1.0.patch \ + file://0002-Check-OpenSSL-version-number-to-allow-builds-with-ol.patch \ " S = "${WORKDIR}/git" @@ -68,3 +70,4 @@ FILES_${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ " INSANE_SKIP_${PN} = "dev-so" +RDEPENDS_${PN} = "ruby" From patchwork Wed Sep 5 21:02:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146043 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp29756ljw; Wed, 5 Sep 2018 14:03:10 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYBap1B7dsgPNHoxy5ivJSN1BJBwYn6KkAMhMVgSAvdqBoy5P6BBDI8oVHFtQu4p7BZi+49 X-Received: by 2002:a17:902:6b05:: with SMTP id o5-v6mr41218967plk.338.1536181389882; Wed, 05 Sep 2018 14:03:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181389; cv=none; d=google.com; s=arc-20160816; b=0ppAhi/Mw7TBXC0uHHqN/J0oU0F0tB01E38L0wRkM8QT1t0tU3PyAdYS/J9oBb0YZt 9S/VMNkGzX4XaSDUzYkTsH1+Ea4VAYyNkUW1g6UcWRjqaAdGGR05/BchbgKkyRqUEra1 S7FMpXhYSrPDB1sNt79lDQAhBsiDG85hxVgwbYTB3BZdGSLfLA8xIcm3mHDh+HUEKbHv vNM9czS7HkG+mT4osltzaFbRXSbKzja2U3ogMxDhVRMKkqVdGktz7skbpO1u/f3gfWU2 J6w6NbrHK7Afa+qWSjdLpRNM+cYjKRQgvbb1b9x4UgD68ukBlr9PkC8WTcM1rOHrzj8L LjGw== 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:dkim-signature:delivered-to; bh=kgdn3Q6+8G2NQFrBrk27rq4P33/AdjCE8oaw6Wyp33o=; b=P3wVRF0/nDYnv6HwOvE63+572yhvp9B1U712l96Fo/Mw+0Dj+2QGD4jlJF8ndledgF QzhIztC/LY/0nUfS/t4oj5uOlVv619PKhKJGivYxub+MB71wPDB8+gE7aZCIS5qWh8oY IjxEh3YclK1t1p8AraXaMsJvV03Qy7wT4sDT5gSFlWCaEZrQ4iuv9GcYCPczUs7/scpY M7C2y5aCJnNzPblu2TCSNSBmRHFKPXHCFuIV9OKJG3XZdV6DCq7uPRS/IsBF/ckGeHRc b1WK1jufftNCcY5CnoywJf8hPkjcKRfpT5sZ89jiuKkL0Eu/Mqr/8beklVMMX1JOYn4A XFyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W2osT3Ni; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q9-v6si2997457pgj.134.2018.09.05.14.03.09; Wed, 05 Sep 2018 14:03:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W2osT3Ni; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9328879498; Wed, 5 Sep 2018 21:02:56 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mail.openembedded.org (Postfix) with ESMTP id 80151793E6 for ; Wed, 5 Sep 2018 21:02:34 +0000 (UTC) Received: by mail-pf1-f175.google.com with SMTP id x17-v6so4098864pfh.5 for ; Wed, 05 Sep 2018 14:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=92yGilmE9OqroRARrFBtJ7KLgFlxEZT5FVL7UeXN9BM=; b=W2osT3Ni8fVOUd9F7z1l46N8DOfvicPaX6CqAJzLiAH3BzApQvyttCrtu88fG/Ig0c DxgyMXuURBlSrf5mK3vzsXmR3CJKvKP6iQNdf7H8XLWac6W54sq+M8YEhdNAEWJ8izYE 5BiDaZT3Ap6Nt8TvuZB6JWnwabEITTFQYVIquro6S1kGQJtnj/RlK+bPsWFQa+Alg7Uc 1a8OXmE0dGWrsKLb76CQgKyHucxWrVmyYDvs/JpwFS38VdDl0CmFymR1uzSLhEX4YyzI WMt5I84QVRXLslOl25hdU4NgvZqvYKDKg0K31qI3ykpY8Ibpi0nmellLrcKuDM7L6paY lqDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=92yGilmE9OqroRARrFBtJ7KLgFlxEZT5FVL7UeXN9BM=; b=BwBnlC/fg2KeAXC8DOaNK2VfO27IQRGyyy9/TJOrews9xGxGAKY5tb9aEdPXURsI+p SY7WjmpW/3zcNvZhT5O3leIjZehVS8tfR0toHwkMmEYjpkawQoZgjsiU/MRMRO/kTaBi ut0/CHsl3KUJQFyALGh+NiVFqFK6SK054U5F1SjWqDlFBsv0dVPKC6NHXX0FVQhez7cI sQ+g3u05ItLMAagXrTXZlMA0OdO1lCasr7Nm59tYkSeco/TgRfiNNPT9wXR1qMm09Dw1 hlSqfqPvbrWFDuEJvJOTlD8fkBVcwgAXa9Hh6VyfcyYqI6PPRH34C+qnpvWnzFGrsLu9 eP9A== X-Gm-Message-State: APzg51DXn8tDcQ97XDiFEhYKLC28B2diAFhvWVqGYoQujrq1NOr0rUax Hc0OGvThJQIgI5o2GTQzuajOITrB X-Received: by 2002:a63:e14a:: with SMTP id h10-v6mr38116041pgk.358.1536181355315; Wed, 05 Sep 2018 14:02:35 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:16 -0700 Message-Id: <20180905210224.21225-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 04/12] opensc: Upgrade to 0.18.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org * Fixes build with OpenSSL 1.1.x Signed-off-by: Khem Raj --- .../opensc/{opensc_0.16.0.bb => opensc_0.18.0.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/opensc/{opensc_0.16.0.bb => opensc_0.18.0.bb} (87%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/opensc/opensc_0.16.0.bb b/meta-oe/recipes-support/opensc/opensc_0.18.0.bb similarity index 87% rename from meta-oe/recipes-support/opensc/opensc_0.16.0.bb rename to meta-oe/recipes-support/opensc/opensc_0.18.0.bb index fd67181dc2..92a3bfeffb 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.16.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.18.0.bb @@ -11,8 +11,8 @@ SECTION = "System Environment/Libraries" SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz" -SRC_URI[md5sum] = "724d128f23cd7a74b28d04300ce7bcbd" -SRC_URI[sha256sum] = "3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729" +SRC_URI[md5sum] = "bce516f752e0db5327aa06cc0136fe27" +SRC_URI[sha256sum] = "6ef62b00e8fdbe3e386c3ee25c2cadb56c1931ea42f1a11dce8c947f51b45033" DEPENDS = "openct pcsc-lite virtual/libiconv openssl" @@ -21,6 +21,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" inherit autotools pkgconfig +S = "${WORKDIR}/OpenSC-${PV}" EXTRA_OECONF = " \ --disable-static \ --enable-openct \ From patchwork Wed Sep 5 21:02:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146045 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30018ljw; Wed, 5 Sep 2018 14:03:25 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbM9jr5s0XA6gW7gl66NIcGGHwdDfunJ2STravWBhV/apK1l6yCW+YonvE2biF7qQvMjpSJ X-Received: by 2002:a17:902:ba86:: with SMTP id k6-v6mr40883264pls.84.1536181405146; Wed, 05 Sep 2018 14:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181405; cv=none; d=google.com; s=arc-20160816; b=JVyo6kh6Nn51FVP8NcGEiJwLUK5+p4u+cBBMsETr/cj/6U2oRVjp/pX1CKA+2ze9BE C0yCYmS2+0gte4qbLd8zLCd8r6XELoSOx5mO+ARI7ajb5NTG7mhYO+ztRpdhfxoz9lp0 bJ+iNYRzCHRkD0XIFKB7wRF+65+VJpaciQ+4yrC5AiSKUrBIM3bPkuz1bNow+DjAV0Zm wm/Ndh0r9Gj2hNC5N+64/dyBTbUeo2xP+6ZGjAaYJ8g09ZIkVznGGPe13m+8ucQhE2+j pkLH9B0JuIkaKq50q3sFc4P+da2WCklboFe+4PLcut4sV1NUzobt+tHhf6gSE5XqaUiX /bnw== 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:dkim-signature:delivered-to; bh=sLtdGoiEtDNG+VEo1uxvItZpAL3FKrGeGzIqp8E0l9M=; b=rfp+V6juPB55R1pVdRNtMX7wiJtbqvb39l48dFW2yS2LBroVFyqvkCDu2aKbj4hr+B akI+NNmtqSMufmvXttspPdQfaRTgaKZI3a9nFyZhkAgyI15qHcwSRBTqyMgHA++taCdg hOd+OlMNprKEZuoO1mOUBTK5S5MN3VqDBSFlNnCRvlJbGEBGQWIQdMlKSFjLxHqNNpan Q6Ab6pzSt/Y9YACEstq3iTq9GSJiqKfy6X7G+C9rc6cvrW7Oxc6a7UdaUAe1k3b0oA8Q 3yUI2OHblFPax5yTUVEFbGBPKPGvDfsVWn/dQAtd2XcgF7yuCFZ4o3rdPP9oit1h30Ms 0iYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eZV9KQq9; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w126-v6si3021074pfb.232.2018.09.05.14.03.24; Wed, 05 Sep 2018 14:03:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eZV9KQq9; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C099F794C8; Wed, 5 Sep 2018 21:02:58 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mail.openembedded.org (Postfix) with ESMTP id 0AD0B793FC for ; Wed, 5 Sep 2018 21:02:36 +0000 (UTC) Received: by mail-pf1-f171.google.com with SMTP id i26-v6so4077644pfo.12 for ; Wed, 05 Sep 2018 14:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xXRx8fyqX6R1wmJxqNEYGOkZ40a1OQFlk/c1c2P5+uk=; b=eZV9KQq9PHlN2RDjNHLWZmVryAt8cxg3DD+q/2u8ojuhmRfVHCYu3Jeu9p6RNkXpdb hhdkZE7n0XvFE+NYrTdY02iGYcDc8VzRz54J0KK1SLAffFIawlqyDaQSpE1kg6jLwWo6 PKBth3pFTWESvFlCkeFdCkds63uvRlx5YgxGJxgLq8UaHUC8dHTWcRzhxKAIxx9wmVYQ hD0dXMHkVrSPpar+7qiqQ6nVhQersNiR5tC9JCBNss6Tc2nucyRbg0H+n6WLcwuugmvd /YAczJ3fArfbCZoLrycKho5Nyu6ROhYIKqYD8spjFcpAQmLeEvQdfk1WkpR1HM/g94KX cWrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xXRx8fyqX6R1wmJxqNEYGOkZ40a1OQFlk/c1c2P5+uk=; b=iXjOgKs2MhboUG+rtrFcIhTAoQS++vaLEU8GIbE3xv9AJ7EqXOQTPKneVwUeNKSIw5 AMUEFTjmT+6gea8A04ioMe/mMn3Jm5e41MMaNTB66WVYw4C4C/DdYekRC5UQTqVlbPb3 Ow1vvgiJI9499MFKe5D7cNaZaRfO1J6R3KjjaqVoazxKzPvNLhZ/9e5FX5cAXUhO5Kht xOE0wioao0wG7Jax2fL3tqpp5/IyFX/sralBb0mcYuFa2XTPRG3ALsWZASb+GY6EwRFJ 9ItOhWO/PSCrtZFDXbrl5TOnwpxu5ymQ3GJsvoJlzdKp5yCCtfaOt33zEs6lbQSCak0c uk4w== X-Gm-Message-State: APzg51Du56Aba23hCVBJMV+8gSogcR0GcdnibAYh3/pJWM+F2U+ZK+l1 YHnAvn3jYlaUCt/JUrUT2LLveP8C X-Received: by 2002:a63:fb07:: with SMTP id o7-v6mr38358828pgh.333.1536181356564; Wed, 05 Sep 2018 14:02:36 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:35 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:17 -0700 Message-Id: <20180905210224.21225-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 05/12] fetchmail: Fix build with OpenSSL X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Backport a patch from Debian Signed-off-by: Khem Raj --- .../fetchmail/fetchmail/02_remove_SSLv3.patch | 1576 +++++++++++++++++ .../fetchmail/fetchmail_6.3.26.bb | 4 +- 2 files changed, 1579 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/fetchmail/fetchmail/02_remove_SSLv3.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/fetchmail/fetchmail/02_remove_SSLv3.patch b/meta-networking/recipes-support/fetchmail/fetchmail/02_remove_SSLv3.patch new file mode 100644 index 0000000000..95cfa2f4a1 --- /dev/null +++ b/meta-networking/recipes-support/fetchmail/fetchmail/02_remove_SSLv3.patch @@ -0,0 +1,1576 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + fetchmail (6.3.26-2) unstable; urgency=low + . + * New maintainer (closes: #800750). + * Backport upstream fix for SSLv3 removal (closes: #804604) and do not + recommend SSLv3 (closes: #801178). + * Remove quilt and its usage. + * Add dh-python to build depends. + * Update upstream URLs. + * Update watch file. + * Update Standards-Version to 3.9.6 . +Author: Laszlo Boszormenyi (GCS) +Bug-Debian: https://bugs.debian.org/800750 +Bug-Debian: https://bugs.debian.org/801178 +Bug-Debian: https://bugs.debian.org/804604 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- fetchmail-6.3.26.orig/Makefile.am ++++ fetchmail-6.3.26/Makefile.am +@@ -31,7 +31,7 @@ libfm_a_SOURCES= xmalloc.c base64.c rfc8 + servport.c ntlm.h smbbyteorder.h smbdes.h smbmd4.h \ + smbencrypt.h smbdes.c smbencrypt.c smbmd4.c smbutil.c \ + libesmtp/gethostbyname.h libesmtp/gethostbyname.c \ +- smbtypes.h fm_getaddrinfo.c tls.c rfc822valid.c \ ++ smbtypes.h fm_getaddrinfo.c starttls.c rfc822valid.c \ + xmalloc.h sdump.h sdump.c x509_name_match.c \ + fm_strl.h md5c.c + if NTLM_ENABLE +--- fetchmail-6.3.26.orig/Makefile.in ++++ fetchmail-6.3.26/Makefile.in +@@ -97,14 +97,14 @@ am__libfm_a_SOURCES_DIST = xmalloc.c bas + rfc2047e.c servport.c ntlm.h smbbyteorder.h smbdes.h smbmd4.h \ + smbencrypt.h smbdes.c smbencrypt.c smbmd4.c smbutil.c \ + libesmtp/gethostbyname.h libesmtp/gethostbyname.c smbtypes.h \ +- fm_getaddrinfo.c tls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ ++ fm_getaddrinfo.c starttls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ + x509_name_match.c fm_strl.h md5c.c ntlmsubr.c + @NTLM_ENABLE_TRUE@am__objects_1 = ntlmsubr.$(OBJEXT) + am_libfm_a_OBJECTS = xmalloc.$(OBJEXT) base64.$(OBJEXT) \ + rfc822.$(OBJEXT) report.$(OBJEXT) rfc2047e.$(OBJEXT) \ + servport.$(OBJEXT) smbdes.$(OBJEXT) smbencrypt.$(OBJEXT) \ + smbmd4.$(OBJEXT) smbutil.$(OBJEXT) gethostbyname.$(OBJEXT) \ +- fm_getaddrinfo.$(OBJEXT) tls.$(OBJEXT) rfc822valid.$(OBJEXT) \ ++ fm_getaddrinfo.$(OBJEXT) starttls.$(OBJEXT) rfc822valid.$(OBJEXT) \ + sdump.$(OBJEXT) x509_name_match.$(OBJEXT) md5c.$(OBJEXT) \ + $(am__objects_1) + libfm_a_OBJECTS = $(am_libfm_a_OBJECTS) +@@ -483,7 +483,7 @@ libfm_a_SOURCES = xmalloc.c base64.c rfc + servport.c ntlm.h smbbyteorder.h smbdes.h smbmd4.h \ + smbencrypt.h smbdes.c smbencrypt.c smbmd4.c smbutil.c \ + libesmtp/gethostbyname.h libesmtp/gethostbyname.c smbtypes.h \ +- fm_getaddrinfo.c tls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ ++ fm_getaddrinfo.c starttls.c rfc822valid.c xmalloc.h sdump.h sdump.c \ + x509_name_match.c fm_strl.h md5c.c $(am__append_1) + libfm_a_LIBADD = $(EXTRAOBJ) + libfm_a_DEPENDENCIES = $(EXTRAOBJ) +--- fetchmail-6.3.26.orig/NEWS ++++ fetchmail-6.3.26/NEWS +@@ -51,8 +51,6 @@ removed from a 6.4.0 or newer release.) + * The --bsmtp - mode of operation may be removed in a future release. + * Given that OpenSSL is severely underdocumented, and needs license exceptions, + fetchmail may switch to a different SSL library. +-* SSLv2 support will be removed from a future fetchmail release. It has been +- obsolete for more than a decade. + + -------------------------------------------------------------------------------- + +--- fetchmail-6.3.26.orig/README.SSL ++++ fetchmail-6.3.26/README.SSL +@@ -11,36 +11,45 @@ specific to fetchmail. + In case of troubles, mail the README.SSL-SERVER file to your ISP and + have them check their server configuration against it. + +-Unfortunately, fetchmail confuses SSL/TLS protocol levels with whether +-a service needs to use in-band negotiation (STLS/STARTTLS for POP3/IMAP4) or is +-totally SSL-wrapped on a separate port. For compatibility reasons, this cannot +-be fixed in a bugfix release. ++Unfortunately, fetchmail confuses SSL/TLS protocol levels with whether a ++service needs to use in-band negotiation (STLS/STARTTLS for POP3/IMAP4) ++or is totally SSL-wrapped on a separate port. For compatibility ++reasons, this cannot be fixed in a bugfix or minor release. ++ ++Also, fetchmail 6.4.0 and newer releases changed some of the semantics ++as the result of a bug-fix, and will auto-negotiate TLSv1 or newer only. ++If your server does not support this, you may have to specify --sslproto ++ssl3. This is in order to prefer the newer TLS protocols, because SSLv2 ++and v3 are broken. + +- -- Matthias Andree, 2009-05-09 ++ -- Matthias Andree, 2015-01-16 + + + Quickstart + ---------- + ++Use an up-to-date release of OpenSSL 1.0.1 or newer, so as to get ++TLSv1.2 support. ++ + For use of SSL or TLS with in-band negotiation on the regular service's port, + i. e. with STLS or STARTTLS, use these command line options + +- --sslproto tls1 --sslcertck ++ --sslproto auto --sslcertck + + or these options in the rcfile (after the respective "user"... options) + +- sslproto tls1 sslcertck ++ sslproto auto sslcertck + + + For use of SSL or TLS on a separate port, if the whole TCP connection is +-SSL-encrypted from the very beginning, use these command line options (in the +-rcfile, omit all leading "--"): ++SSL-encrypted from the very beginning (SSL- or TLS-wrapped), use these ++command line options (in the rcfile, omit all leading "--"): + +- --ssl --sslproto ssl3 --sslcertck ++ --ssl --sslproto auto --sslcertck + + or these options in the rcfile (after the respective "user"... options) + +- ssl sslproto ssl3 sslcertck ++ ssl sslproto auto sslcertck + + + Background and use (long version :-)) +--- fetchmail-6.3.26.orig/config.h.in ++++ fetchmail-6.3.26/config.h.in +@@ -49,9 +49,9 @@ + don't. */ + #undef HAVE_DECL_H_ERRNO + +-/* Define to 1 if you have the declaration of `SSLv2_client_method', and to 0 ++/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0 + if you don't. */ +-#undef HAVE_DECL_SSLV2_CLIENT_METHOD ++#undef HAVE_DECL_SSLV3_CLIENT_METHOD + + /* Define to 1 if you have the declaration of `strerror', and to 0 if you + don't. */ +--- fetchmail-6.3.26.orig/configure ++++ fetchmail-6.3.26/configure +@@ -1,13 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.68 for fetchmail 6.3.26. ++# Generated by GNU Autoconf 2.69 for fetchmail 6.3.26. + # + # Report bugs to . + # + # +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +-# Foundation, Inc. ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -136,6 +134,31 @@ export LANGUAGE + # CDPATH. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + ++# Use a proper internal environment variable to ensure we don't fall ++ # into an infinite loop, continuously re-executing ourselves. ++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then ++ _as_can_reexec=no; export _as_can_reexec; ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++as_fn_exit 255 ++ fi ++ # We don't want this to propagate to other subprocesses. ++ { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh +@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test + else + exitcode=1; echo positional parameters were not saved. + fi +-test x\$exitcode = x0 || exit 1" ++test x\$exitcode = x0 || exit 1 ++test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && +@@ -214,21 +238,25 @@ IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : +- # We cannot yet assume a decent shell, so we have to provide a +- # neutralization value for shells without unset; and this also +- # works around shells that cannot unset nonexistent variables. +- # Preserve -v and -x to the replacement shell. +- BASH_ENV=/dev/null +- ENV=/dev/null +- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +- export CONFIG_SHELL +- case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +- esac +- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} ++ export CONFIG_SHELL ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++exit 255 + fi + + if test x$as_have_required = xno; then : +@@ -331,6 +359,14 @@ $as_echo X"$as_dir" | + + + } # as_fn_mkdir_p ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p + # as_fn_append VAR VALUE + # ---------------------- + # Append the text in VALUE to the end of the definition contained in VAR. Take +@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have ++ # already done that, so ensure we don't try to do so again and fall ++ # in an infinite loop. This has already happened in practice. ++ _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). +@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -507,28 +547,8 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -742,6 +762,7 @@ infodir + docdir + oldincludedir + includedir ++runstatedir + localstatedir + sharedstatedir + sysconfdir +@@ -841,6 +862,7 @@ datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' ++runstatedir='${localstatedir}/run' + includedir='${prefix}/include' + oldincludedir='/usr/include' + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +@@ -1093,6 +1115,15 @@ do + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + ++ -runstatedir | --runstatedir | --runstatedi | --runstated \ ++ | --runstate | --runstat | --runsta | --runst | --runs \ ++ | --run | --ru | --r) ++ ac_prev=runstatedir ;; ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ ++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ ++ | --run=* | --ru=* | --r=*) ++ runstatedir=$ac_optarg ;; ++ + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +@@ -1230,7 +1261,7 @@ fi + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +- libdir localedir mandir ++ libdir localedir mandir runstatedir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +@@ -1258,8 +1289,6 @@ target=$target_alias + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1385,6 +1414,7 @@ Fine tuning of the installation director + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +@@ -1548,9 +1578,9 @@ test -n "$ac_init_help" && exit $ac_stat + if $ac_init_version; then + cat <<\_ACEOF + fetchmail configure 6.3.26 +-generated by GNU Autoconf 2.68 ++generated by GNU Autoconf 2.69 + +-Copyright (C) 2010 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1827,7 +1857,7 @@ $as_echo "$ac_try_echo"; } >&5 + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext ++ test -x conftest$ac_exeext + }; then : + ac_retval=0 + else +@@ -2030,7 +2060,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= 0)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2046,7 +2077,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2072,7 +2104,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) < 0)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2088,7 +2121,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2122,7 +2156,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2195,7 +2230,7 @@ This file contains any messages produced + running configure, to aid debugging if configure makes a mistake. + + It was created by fetchmail $as_me 6.3.26, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +@@ -2689,7 +2724,7 @@ case $as_dir/ in #(( + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -2858,7 +2893,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2898,7 +2933,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2949,7 +2984,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do +- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ +@@ -3002,7 +3037,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3295,7 +3330,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3466,7 +3501,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3512,7 +3547,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3552,7 +3587,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3605,7 +3640,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3646,7 +3681,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -3704,7 +3739,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3748,7 +3783,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4194,8 +4229,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ + /* end confdefs.h. */ + #include + #include +-#include +-#include ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -4751,7 +4785,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4791,7 +4825,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4859,7 +4893,7 @@ do + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ as_fn_executable_p "$ac_path_GREP" || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -4925,7 +4959,7 @@ do + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ as_fn_executable_p "$ac_path_EGREP" || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -5132,8 +5166,8 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-# define __EXTENSIONS__ 1 +- $ac_includes_default ++# define __EXTENSIONS__ 1 ++ $ac_includes_default + int + main () + { +@@ -5513,11 +5547,11 @@ else + int + main () + { +-/* FIXME: Include the comments suggested by Paul. */ ++ + #ifndef __cplusplus +- /* Ultrix mips cc rejects this. */ ++ /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; +- const charset cs; ++ const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; +@@ -5534,8 +5568,9 @@ main () + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; +- { /* SCO 3.2v4 cc rejects this. */ +- char *t; ++ { /* SCO 3.2v4 cc rejects this sort of thing. */ ++ char tx; ++ char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; +@@ -5551,10 +5586,10 @@ main () + iptr p = 0; + ++p; + } +- { /* AIX XL C 1.02.0.0 rejects this saying ++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; }; +- struct s *b; b->j = 5; ++ struct s { int j; const int *ap[3]; } bx; ++ struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +@@ -5600,7 +5635,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LEX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5632,7 +5667,8 @@ a { ECHO; } + b { REJECT; } + c { yymore (); } + d { yyless (1); } +-e { yyless (input () != 0); } ++e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ ++ yyless ((input () != 0)); } + f { unput (yytext[0]); } + . { BEGIN INITIAL; } + %% +@@ -5792,7 +5828,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_YACC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6044,7 +6080,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8548,7 +8584,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_procmail="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8590,7 +8626,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_sendmail="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8632,7 +8668,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_maildrop="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -10121,16 +10157,16 @@ $as_echo "$as_me: WARNING: Consider re-r + fi + + case "$LIBS" in *-lssl*) +- ac_fn_c_check_decl "$LINENO" "SSLv2_client_method" "ac_cv_have_decl_SSLv2_client_method" "#include ++ ac_fn_c_check_decl "$LINENO" "SSLv3_client_method" "ac_cv_have_decl_SSLv3_client_method" "#include + " +-if test "x$ac_cv_have_decl_SSLv2_client_method" = xyes; then : ++if test "x$ac_cv_have_decl_SSLv3_client_method" = xyes; then : + ac_have_decl=1 + else + ac_have_decl=0 + fi + + cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_SSLV2_CLIENT_METHOD $ac_have_decl ++#define HAVE_DECL_SSLV3_CLIENT_METHOD $ac_have_decl + _ACEOF + + ;; +@@ -11334,16 +11370,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -11403,28 +11439,16 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -11446,7 +11470,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri + # values after options handling. + ac_log=" + This file was extended by fetchmail $as_me 6.3.26, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -11512,10 +11536,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + fetchmail config.status 6.3.26 +-configured by $0, generated by GNU Autoconf 2.68, ++configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2010 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -11606,7 +11630,7 @@ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' +--- fetchmail-6.3.26.orig/configure.ac ++++ fetchmail-6.3.26/configure.ac +@@ -802,7 +802,7 @@ else + fi + + case "$LIBS" in *-lssl*) +- AC_CHECK_DECLS([SSLv2_client_method],,,[#include ]) ++ AC_CHECK_DECLS([SSLv3_client_method],,,[#include ]) + ;; + esac + +--- fetchmail-6.3.26.orig/fetchmail-FAQ.html ++++ fetchmail-6.3.26/fetchmail-FAQ.html +@@ -667,8 +667,8 @@ because there is not currently a standar + also uses this method, so the two will interoperate happily. They + better, because this is how Craig gets his mail ;-)

+ +-

Finally, you can use SSL for complete +-end-to-end encryption if you have an SSL-enabled mailserver.

++

Finally, you can use SSL or TLS for complete ++end-to-end encryption if you have a TLS-enabled mailserver.

+ +

G11. Is any special configuration needed + to use a dynamic IP address?

+@@ -2120,7 +2120,7 @@ SSL? + +

You'll need to have the OpenSSL libraries installed, and they +-should at least be version 0.9.7. ++should at least be version 0.9.8, with 1.0.1 preferred. + Configure with --with-ssl. If you have the OpenSSL libraries + installed in commonly-used default locations, this will + suffice. If you have them installed in a non-default location, +@@ -2130,7 +2130,7 @@ to --with-ssl after an equal sign.

+

Fetchmail binaries built this way support ssl, + sslkey, and sslcert options that control + SSL encryption, and will automatically use tls if the +-server offers it. You will need to have an SSL-enabled mailserver to ++server offers it. You will need to have an SSL/TLS-enabled mailserver to + use these options. See the manual page for details and some words + of care on the limited security provided.

+ +@@ -2155,13 +2155,14 @@ poll MYSERVER port 993 plugin "openssl s + protocol imap username MYUSERNAME password MYPASSWORD + + +-

You should note that SSL is only secure against a "man-in-the-middle" +-attack if the client is able to verify that the peer's public key is the +-correct one, and has not been substituted by an attacker. fetchmail can do +-this in one of two ways: by verifying the SSL certificate, or by checking +-the fingerprint of the peer's public key.

++

You should note that SSL or TLS are only secure against a ++"man-in-the-middle" attack if the client is able to verify that the ++peer's public key is the correct one, and has not been substituted by an ++attacker. fetchmail can do this in one of two ways: by verifying the SSL ++certificate, or by checking the fingerprint of the peer's public ++key.

+ +-

There are three parts to SSL certificate verification: checking that the ++

There are three parts to TLS certificate verification: checking that the + domain name in the certificate matches the hostname you asked to connect to; + checking that the certificate expiry date has not passed; and checking that + the certificate has been signed by a known Certificate Authority (CA). This +@@ -2227,8 +2228,12 @@ will automatically attempt TLS negotiati + time. This can however cause problems if the upstream didn't configure + his certificates properly.

+ +-

In order to prevent fetchmail from trying TLS (STLS, STARTTLS) +-negotiation, add this option:

++

In order to prevent fetchmail 6.4.0 and newer versions from trying ++STLS or STARTTLS negotiation, add this option:

++
sslproto ''
++ ++

In order to prevent older fetchmail versions from trying TLS (STLS, STARTTLS) ++negotiation where the above does not work, try this option:

+ + 
sslproto ssl23
+ +@@ -2876,15 +2881,22 @@ need to say something like 'envelo + + 
+ Received: from send103.yahoomail.com (send103.yahoomail.com [205.180.60.92])
+-    by iserv.ttns.net (8.8.5/8.8.5) with SMTP id RAA10088
+-    for <ksturgeon@fbceg.org>; Wed, 9 Sep 1998 17:01:59 -0700
++    by iserv.example.net (8.8.5/8.8.5) with SMTP id RAA10088
++    for <ksturgeon@fbceg.example.org>; Wed, 9 Sep 1998 17:01:59 -0700
+
+ +-

it checks to see if 'iserv.ttns.net' is a DNS alias of your +-mailserver before accepting 'ksturgeon@fbceg.org' as an envelope ++

it checks to see if 'iserv.example.net' is a DNS alias of your ++mailserver before accepting 'ksturgeon@fbceg.example.org' as an envelope + address. This check might fail if your DNS were misconfigured, or +-if you were using 'no dns' and had failed to declare iserv.ttns.net +-as an alias of your server.

++if you were using 'no dns' and had failed to declare iserv.example.net ++as an alias of your server. The typical hint is logging similar to: ++line rejected, iserv.example.net is not an alias of the mailserver, ++if you use fetchmail in verbose mode.

++ ++

Workaround: You can specify the alias explicitly, with aka ++ iserv.example.net statements in the rcfile. Replace ++iserv.example.net by the name you find in your ++'by' part of the 'Received:' line.

+ +

M8. Users are getting multiple copies of + messages.

+@@ -3237,6 +3249,8 @@ Hayes mode escape "+++".

+

X8. A spurious ) is being appended to my + messages.

+ ++

Fetchmail 6.3.5 and newer releases are supposed to fix this.

++ +

Due to the problem described in S2, the + IMAP support in fetchmail cannot follow the IMAP protocol 100 %. + Most of the time it doesn't matter, but if you combine it with an +@@ -3279,8 +3293,6 @@ it at the end of the message it forwards + on, you'll get a message about actual != expected. + + +-

There is no fix for this.

+- +

X9. Missing "Content-Transfer-Encoding" header + with Domino IMAP

+ +--- fetchmail-6.3.26.orig/fetchmail.c ++++ fetchmail-6.3.26/fetchmail.c +@@ -54,6 +54,10 @@ + #define ENETUNREACH 128 /* Interactive doesn't know this */ + #endif /* ENETUNREACH */ + ++#ifdef SSL_ENABLE ++#include /* for OPENSSL_NO_SSL2 and ..._SSL3 checks */ ++#endif ++ + /* prototypes for internal functions */ + static int load_params(int, char **, int); + static void dump_params (struct runctl *runp, struct query *, flag implicit); +@@ -138,7 +142,7 @@ static void printcopyright(FILE *fp) { + "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" + " Robert M. Funk, Graham Wilson\n" + "Copyright (C) 2005 - 2012 Sunil Shetye\n" +- "Copyright (C) 2005 - 2013 Matthias Andree\n" ++ "Copyright (C) 2005 - 2015 Matthias Andree\n" + )); + fprintf(fp, GT_("Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" + "are welcome to redistribute it under certain conditions. For details,\n" +@@ -262,6 +266,9 @@ int main(int argc, char **argv) + #endif /* ODMR_ENABLE */ + #ifdef SSL_ENABLE + "+SSL" ++#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0) || defined(OPENSSL_NO_SSL3) ++ "-SSLv3" ++#endif + #endif + #ifdef OPIE_ENABLE + "+OPIE" +--- fetchmail-6.3.26.orig/fetchmail.h ++++ fetchmail-6.3.26/fetchmail.h +@@ -771,9 +771,9 @@ int servport(const char *service); + int fm_getaddrinfo(const char *node, const char *serv, const struct addrinfo *hints, struct addrinfo **res); + void fm_freeaddrinfo(struct addrinfo *ai); + +-/* prototypes from tls.c */ +-int maybe_tls(struct query *ctl); +-int must_tls(struct query *ctl); ++/* prototypes from starttls.c */ ++int maybe_starttls(struct query *ctl); ++int must_starttls(struct query *ctl); + + /* prototype from rfc822valid.c */ + int rfc822_valid_msgid(const unsigned char *); +--- fetchmail-6.3.26.orig/fetchmail.man ++++ fetchmail-6.3.26/fetchmail.man +@@ -412,23 +412,22 @@ from. The folder information is written + .B \-\-ssl + (Keyword: ssl) + .br +-Causes the connection to the mail server to be encrypted +-via SSL. Connect to the server using the specified base protocol over a +-connection secured by SSL. This option defeats opportunistic starttls +-negotiation. It is highly recommended to use \-\-sslproto 'SSL3' +-\-\-sslcertck to validate the certificates presented by the server and +-defeat the obsolete SSLv2 negotiation. More information is available in +-the \fIREADME.SSL\fP file that ships with fetchmail. +-.IP +-Note that fetchmail may still try to negotiate SSL through starttls even +-if this option is omitted. You can use the \-\-sslproto option to defeat +-this behavior or tell fetchmail to negotiate a particular SSL protocol. ++Causes the connection to the mail server to be encrypted via SSL, by ++negotiating SSL directly after connecting (SSL-wrapped mode). It is ++highly recommended to use \-\-sslcertck to validate the certificates ++presented by the server. Please see the description of \-\-sslproto ++below! More information is available in the \fIREADME.SSL\fP file that ++ships with fetchmail. ++.IP ++Note that even if this option is omitted, fetchmail may still negotiate ++SSL in-band for POP3 or IMAP, through the STLS or STARTTLS feature. You ++can use the \-\-sslproto option to modify that behavior. + .IP + If no port is specified, the connection is attempted to the well known + port of the SSL version of the base protocol. This is generally a + different port than the port used by the base protocol. For IMAP, this + is port 143 for the clear protocol and port 993 for the SSL secured +-protocol, for POP3, it is port 110 for the clear text and port 995 for ++protocol; for POP3, it is port 110 for the clear text and port 995 for + the encrypted variant. + .IP + If your system lacks the corresponding entries from /etc/services, see +@@ -470,39 +469,73 @@ cause some complications in daemon mode. + .IP + Also see \-\-sslcert above. + .TP +-.B \-\-sslproto +-(Keyword: sslproto) ++.B \-\-sslproto ++(Keyword: sslproto, NOTE: semantic changes since v6.4.0) + .br +-Forces an SSL/TLS protocol. Possible values are \fB''\fP, +-\&'\fBSSL2\fP' (not supported on all systems), +-\&'\fBSSL23\fP', (use of these two values is discouraged +-and should only be used as a last resort) \&'\fBSSL3\fP', and +-\&'\fBTLS1\fP'. The default behaviour if this option is unset is: for +-connections without \-\-ssl, use \&'\fBTLS1\fP' so that fetchmail will +-opportunistically try STARTTLS negotiation with TLS1. You can configure +-this option explicitly if the default handshake (TLS1 if \-\-ssl is not +-used) does not work for your server. +-.IP +-Use this option with '\fBTLS1\fP' value to enforce a STARTTLS +-connection. In this mode, it is highly recommended to also use +-\-\-sslcertck (see below). Note that this will then cause fetchmail +-v6.3.19 to force STARTTLS negotiation even if it is not advertised by +-the server. +-.IP +-To defeat opportunistic TLSv1 negotiation when the server advertises +-STARTTLS or STLS, and use a cleartext connection use \fB''\fP. This +-option, even if the argument is the empty string, will also suppress the +-diagnostic 'SERVER: opportunistic upgrade to TLS.' message in verbose +-mode. The default is to try appropriate protocols depending on context. ++This option has a dual use, out of historic fetchmail behaviour. It ++controls both the SSL/TLS protocol version and, if \-\-ssl is not ++specified, the STARTTLS behaviour (upgrading the protocol to an SSL or ++TLS connection in-band). Some other options may however make TLS ++mandatory. ++.PP ++Only if this option and \-\-ssl are both missing for a poll, there will ++be opportunistic TLS for POP3 and IMAP, where fetchmail will attempt to ++upgrade to TLSv1 or newer. ++.PP ++Recognized values for \-\-sslproto are given below. You should normally ++chose one of the auto-negotiating options, i. e. '\fBauto\fP' or one of ++the options ending in a plus (\fB+\fP) character. Note that depending ++on OpenSSL library version and configuration, some options cause ++run-time errors because the requested SSL or TLS versions are not ++supported by the particular installed OpenSSL library. ++.RS ++.IP "\fB''\fP, the empty string" ++Disable STARTTLS. If \-\-ssl is given for the same server, log an error ++and pretend that '\fBauto\fP' had been used instead. ++.IP '\fBauto\fP' ++(default). Since v6.4.0. Require TLS. Auto-negotiate TLSv1 or newer, disable SSLv3 downgrade. ++(fetchmail 6.3.26 and older have auto-negotiated all protocols that ++their OpenSSL library supported, including the broken SSLv3). ++.IP "\&'\fBSSL23\fP' ++see '\fBauto\fP'. ++.IP \&'\fBSSL3\fP' ++Require SSLv3 exactly. SSLv3 is broken, not supported on all systems, avoid it ++if possible. This will make fetchmail negotiate SSLv3 only, and is the ++only way besides '\fBSSL3+\fP' to have fetchmail 6.4.0 or newer permit SSLv3. ++.IP \&'\fBSSL3+\fP' ++same as '\fBauto\fP', but permit SSLv3 as well. This is the only way ++besides '\fBSSL3\fP' to have fetchmail 6.4.0 or newer permit SSLv3. ++.IP \&'\fBTLS1\fP' ++Require TLSv1. This does not negotiate TLSv1.1 or newer, and is ++discouraged. Replace by TLS1+ unless the latter chokes your server. ++.IP \&'\fBTLS1+\fP' ++Since v6.4.0. See 'fBauto\fP'. ++.IP \&'\fBTLS1.1\fP' ++Since v6.4.0. Require TLS v1.1 exactly. ++.IP \&'\fBTLS1.1+\fP' ++Since v6.4.0. Require TLS. Auto-negotiate TLSv1.1 or newer. ++.IP \&'\fBTLS1.2\fP' ++Since v6.4.0. Require TLS v1.2 exactly. ++.IP '\fBTLS1.2+\fP' ++Since v6.4.0. Require TLS. Auto-negotiate TLSv1.2 or newer. ++.IP "Unrecognized parameters" ++are treated the same as '\fBauto\fP'. ++.RE ++.IP ++NOTE: you should hardly ever need to use anything other than '' (to ++force an unencrypted connection) or 'auto' (to enforce TLS). + .TP + .B \-\-sslcertck + (Keyword: sslcertck) + .br +-Causes fetchmail to strictly check the server certificate against a set of +-local trusted certificates (see the \fBsslcertfile\fP and \fBsslcertpath\fP +-options). If the server certificate cannot be obtained or is not signed by one +-of the trusted ones (directly or indirectly), the SSL connection will fail, +-regardless of the \fBsslfingerprint\fP option. ++Causes fetchmail to require that SSL/TLS be used and disconnect if it ++can not successfully negotiate SSL or TLS, or if it cannot successfully ++verify and validate the certificate and follow it to a trust anchor (or ++trusted root certificate). The trust anchors are given as a set of local ++trusted certificates (see the \fBsslcertfile\fP and \fBsslcertpath\fP ++options). If the server certificate cannot be obtained or is not signed ++by one of the trusted ones (directly or indirectly), fetchmail will ++disconnect, regardless of the \fBsslfingerprint\fP option. + .IP + Note that CRL (certificate revocation lists) are only supported in + OpenSSL 0.9.7 and newer! Your system clock should also be reasonably +@@ -1202,31 +1235,33 @@ capability response. Specify a user opti + username and the part to the right as the NTLM domain. + + .SS Secure Socket Layers (SSL) and Transport Layer Security (TLS) ++.PP All retrieval protocols can use SSL or TLS wrapping for the ++transport. Additionally, POP3 and IMAP retrival can also negotiate ++SSL/TLS by means of STARTTLS (or STLS). + .PP + Note that fetchmail currently uses the OpenSSL library, which is + severely underdocumented, so failures may occur just because the + programmers are not aware of OpenSSL's requirement of the day. + For instance, since v6.3.16, fetchmail calls + OpenSSL_add_all_algorithms(), which is necessary to support certificates +-using SHA256 on OpenSSL 0.9.8 -- this information is deeply hidden in the +-documentation and not at all obvious. Please do not hesitate to report +-subtle SSL failures. +-.PP +-You can access SSL encrypted services by specifying the \-\-ssl option. +-You can also do this using the "ssl" user option in the .fetchmailrc +-file. With SSL encryption enabled, queries are initiated over a +-connection after negotiating an SSL session, and the connection fails if +-SSL cannot be negotiated. Some services, such as POP3 and IMAP, have ++using SHA256 on OpenSSL 0.9.8 -- this information is deeply hidden in ++the documentation and not at all obvious. Please do not hesitate to ++report subtle SSL failures. ++.PP ++You can access SSL encrypted services by specifying the options starting ++with \-\-ssl, such as \-\-ssl, \-\-sslproto, \-\-sslcertck, and others. ++You can also do this using the corresponding user options in the .fetchmailrc ++file. Some services, such as POP3 and IMAP, have + different well known ports defined for the SSL encrypted services. The + encrypted ports will be selected automatically when SSL is enabled and +-no explicit port is specified. The \-\-sslproto 'SSL3' option should be +-used to select the SSLv3 protocol (default if unset: v2 or v3). Also, +-the \-\-sslcertck command line or sslcertck run control file option +-should be used to force strict certificate checking - see below. ++no explicit port is specified. Also, the \-\-sslcertck command line or ++sslcertck run control file option should be used to force strict ++certificate checking - see below. + .PP + If SSL is not configured, fetchmail will usually opportunistically try to use +-STARTTLS. STARTTLS can be enforced by using \-\-sslproto "TLS1". TLS +-connections use the same port as the unencrypted version of the ++STARTTLS. STARTTLS can be enforced by using \-\-sslproto\~auto and ++defeated by using \-\-sslproto\~''. ++TLS connections use the same port as the unencrypted version of the + protocol and negotiate TLS via special command. The \-\-sslcertck + command line or sslcertck run control file option should be used to + force strict certificate checking - see below. +--- fetchmail-6.3.26.orig/imap.c ++++ fetchmail-6.3.26/imap.c +@@ -405,6 +405,8 @@ static int imap_getauth(int sock, struct + /* apply for connection authorization */ + { + int ok = 0; ++ char *commonname; ++ + (void)greeting; + + /* +@@ -429,25 +431,21 @@ static int imap_getauth(int sock, struct + return(PS_SUCCESS); + } + +-#ifdef SSL_ENABLE +- if (maybe_tls(ctl)) { +- char *commonname; +- +- commonname = ctl->server.pollname; +- if (ctl->server.via) +- commonname = ctl->server.via; +- if (ctl->sslcommonname) +- commonname = ctl->sslcommonname; ++ commonname = ctl->server.pollname; ++ if (ctl->server.via) ++ commonname = ctl->server.via; ++ if (ctl->sslcommonname) ++ commonname = ctl->sslcommonname; + +- if (strstr(capabilities, "STARTTLS") +- || must_tls(ctl)) /* if TLS is mandatory, ignore capabilities */ ++#ifdef SSL_ENABLE ++ if (maybe_starttls(ctl)) { ++ if ((strstr(capabilities, "STARTTLS") && maybe_starttls(ctl)) ++ || must_starttls(ctl)) /* if TLS is mandatory, ignore capabilities */ + { +- /* Use "tls1" rather than ctl->sslproto because tls1 is the only +- * protocol that will work with STARTTLS. Don't need to worry +- * whether TLS is mandatory or opportunistic unless SSLOpen() fails +- * (see below). */ ++ /* Don't need to worry whether TLS is mandatory or ++ * opportunistic unless SSLOpen() fails (see below). */ + if (gen_transact(sock, "STARTTLS") == PS_SUCCESS +- && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, "tls1", ctl->sslcertck, ++ && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, ctl->sslproto, ctl->sslcertck, + ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname, + ctl->server.pollname, &ctl->remotename)) != -1) + { +@@ -470,7 +468,7 @@ static int imap_getauth(int sock, struct + { + report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); + } +- } else if (must_tls(ctl)) { ++ } else if (must_starttls(ctl)) { + /* Config required TLS but we couldn't guarantee it, so we must + * stop. */ + set_timeout(0); +@@ -492,6 +490,10 @@ static int imap_getauth(int sock, struct + /* Usable. Proceed with authenticating insecurely. */ + } + } ++ } else { ++ if (strstr(capabilities, "STARTTLS") && outlevel >= O_VERBOSE) { ++ report(stdout, GT_("%s: WARNING: server offered STARTTLS but sslproto '' given.\n"), commonname); ++ } + } + #endif /* SSL_ENABLE */ + +--- fetchmail-6.3.26.orig/po/Makevars ++++ fetchmail-6.3.26/po/Makevars +@@ -46,3 +46,15 @@ MSGID_BUGS_ADDRESS = fetchmail-devel@lis + # This is the list of locale categories, beyond LC_MESSAGES, for which the + # message catalogs shall be used. It is usually empty. + EXTRA_LOCALE_CATEGORIES = ++ ++# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' ++# context. Possible values are "yes" and "no". Set this to yes if the ++# package uses functions taking also a message context, like pgettext(), or ++# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. ++USE_MSGCTXT = no ++ ++# These options get passed to msgmerge. ++# Useful options are in particular: ++# --previous to keep previous msgids of translated messages, ++# --quiet to reduce the verbosity. ++MSGMERGE_OPTIONS = +--- fetchmail-6.3.26.orig/pop3.c ++++ fetchmail-6.3.26/pop3.c +@@ -281,6 +281,7 @@ static int pop3_getauth(int sock, struct + #endif /* OPIE_ENABLE */ + #ifdef SSL_ENABLE + flag connection_may_have_tls_errors = FALSE; ++ char *commonname; + #endif /* SSL_ENABLE */ + + done_capa = FALSE; +@@ -393,7 +394,7 @@ static int pop3_getauth(int sock, struct + (ctl->server.authenticate == A_KERBEROS_V5) || + (ctl->server.authenticate == A_OTP) || + (ctl->server.authenticate == A_CRAM_MD5) || +- maybe_tls(ctl)) ++ maybe_starttls(ctl)) + { + if ((ok = capa_probe(sock)) != PS_SUCCESS) + /* we are in STAGE_GETAUTH => failure is PS_AUTHFAIL! */ +@@ -406,12 +407,12 @@ static int pop3_getauth(int sock, struct + (ok == PS_SOCKET && !ctl->wehaveauthed)) + { + #ifdef SSL_ENABLE +- if (must_tls(ctl)) { ++ if (must_starttls(ctl)) { + /* fail with mandatory STLS without repoll */ + report(stderr, GT_("TLS is mandatory for this session, but server refused CAPA command.\n")); + report(stderr, GT_("The CAPA command is however necessary for TLS.\n")); + return ok; +- } else if (maybe_tls(ctl)) { ++ } else if (maybe_starttls(ctl)) { + /* defeat opportunistic STLS */ + xfree(ctl->sslproto); + ctl->sslproto = xstrdup(""); +@@ -431,24 +432,19 @@ static int pop3_getauth(int sock, struct + } + + #ifdef SSL_ENABLE +- if (maybe_tls(ctl)) { +- char *commonname; ++ commonname = ctl->server.pollname; ++ if (ctl->server.via) ++ commonname = ctl->server.via; ++ if (ctl->sslcommonname) ++ commonname = ctl->sslcommonname; + +- commonname = ctl->server.pollname; +- if (ctl->server.via) +- commonname = ctl->server.via; +- if (ctl->sslcommonname) +- commonname = ctl->sslcommonname; +- +- if (has_stls +- || must_tls(ctl)) /* if TLS is mandatory, ignore capabilities */ ++ if (maybe_starttls(ctl)) { ++ if (has_stls || must_starttls(ctl)) /* if TLS is mandatory, ignore capabilities */ + { +- /* Use "tls1" rather than ctl->sslproto because tls1 is the only +- * protocol that will work with STARTTLS. Don't need to worry +- * whether TLS is mandatory or opportunistic unless SSLOpen() fails +- * (see below). */ ++ /* Don't need to worry whether TLS is mandatory or ++ * opportunistic unless SSLOpen() fails (see below). */ + if (gen_transact(sock, "STLS") == PS_SUCCESS +- && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, "tls1", ctl->sslcertck, ++ && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, ctl->sslproto, ctl->sslcertck, + ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname, + ctl->server.pollname, &ctl->remotename)) != -1) + { +@@ -475,7 +471,7 @@ static int pop3_getauth(int sock, struct + { + report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); + } +- } else if (must_tls(ctl)) { ++ } else if (must_starttls(ctl)) { + /* Config required TLS but we couldn't guarantee it, so we must + * stop. */ + set_timeout(0); +@@ -495,7 +491,11 @@ static int pop3_getauth(int sock, struct + } + } + } +- } /* maybe_tls() */ ++ } else { /* maybe_starttls() */ ++ if (has_stls && outlevel >= O_VERBOSE) { ++ report(stdout, GT_("%s: WARNING: server offered STLS, but sslproto '' given.\n"), commonname); ++ } ++ } /* maybe_starttls() */ + #endif /* SSL_ENABLE */ + + /* +--- fetchmail-6.3.26.orig/socket.c ++++ fetchmail-6.3.26/socket.c +@@ -876,7 +876,9 @@ int SSLOpen(int sock, char *mycert, char + { + struct stat randstat; + int i; ++ int avoid_ssl_versions = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; + long sslopts = SSL_OP_ALL; ++ int ssle_connect = 0; + + SSL_load_error_strings(); + SSL_library_init(); +@@ -906,25 +908,57 @@ int SSLOpen(int sock, char *mycert, char + /* Make sure a connection referring to an older context is not left */ + _ssl_context[sock] = NULL; + if(myproto) { +- if(!strcasecmp("ssl2",myproto)) { +-#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 +- _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); ++ if(!strcasecmp("ssl3",myproto)) { ++#if (HAVE_DECL_SSLV3_CLIENT_METHOD > 0) && (0 == OPENSSL_NO_SSL3 + 0) ++ _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); ++ avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; + #else +- report(stderr, GT_("Your operating system does not support SSLv2.\n")); ++ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); + return -1; + #endif +- } else if(!strcasecmp("ssl3",myproto)) { +- _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); ++ } else if(!strcasecmp("ssl3+",myproto)) { ++ avoid_ssl_versions &= ~SSL_OP_NO_SSLv3; ++ myproto = NULL; + } else if(!strcasecmp("tls1",myproto)) { + _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); +- } else if (!strcasecmp("ssl23",myproto)) { ++ } else if(!strcasecmp("tls1+",myproto)) { ++ myproto = NULL; ++#if defined(TLS1_1_VERSION) && TLS_MAX_VERSION >= TLS1_1_VERSION ++ } else if(!strcasecmp("tls1.1",myproto)) { ++ _ctx[sock] = SSL_CTX_new(TLSv1_1_client_method()); ++ } else if(!strcasecmp("tls1.1+",myproto)) { ++ myproto = NULL; ++ avoid_ssl_versions |= SSL_OP_NO_TLSv1; ++#else ++ } else if(!strcasecmp("tls1.1",myproto) || !strcasecmp("tls1.1+", myproto)) { ++ report(stderr, GT_("Your OpenSSL version does not support TLS v1.1.\n")); ++ return -1; ++#endif ++#if defined(TLS1_2_VERSION) && TLS_MAX_VERSION >= TLS1_2_VERSION ++ } else if(!strcasecmp("tls1.2",myproto)) { ++ _ctx[sock] = SSL_CTX_new(TLSv1_2_client_method()); ++ } else if(!strcasecmp("tls1.2+",myproto)) { ++ myproto = NULL; ++ avoid_ssl_versions |= SSL_OP_NO_TLSv1; ++ avoid_ssl_versions |= SSL_OP_NO_TLSv1_1; ++#else ++ } else if(!strcasecmp("tls1.2",myproto) || !strcasecmp("tls1.2+", myproto)) { ++ report(stderr, GT_("Your OpenSSL version does not support TLS v1.2.\n")); ++ return -1; ++#endif ++ } else if (!strcasecmp("ssl23",myproto) || 0 == strcasecmp("auto",myproto)) { + myproto = NULL; + } else { +- report(stderr,GT_("Invalid SSL protocol '%s' specified, using default (SSLv23).\n"), myproto); ++ report(stderr,GT_("Invalid SSL protocol '%s' specified, using default autoselect (SSL23).\n"), myproto); + myproto = NULL; + } + } +- if(!myproto) { ++ // do not combine into an else { } as myproto may be nulled ++ // above! ++ if (!myproto) { ++ // SSLv23 is a misnomer and will in fact use the best ++ // available protocol, subject to SSL_OP_NO* ++ // constraints. + _ctx[sock] = SSL_CTX_new(SSLv23_client_method()); + } + if(_ctx[sock] == NULL) { +@@ -938,7 +972,7 @@ int SSLOpen(int sock, char *mycert, char + sslopts &= ~ SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; + } + +- SSL_CTX_set_options(_ctx[sock], sslopts); ++ SSL_CTX_set_options(_ctx[sock], sslopts | avoid_ssl_versions); + + if (certck) { + SSL_CTX_set_verify(_ctx[sock], SSL_VERIFY_PEER, SSL_ck_verify_callback); +@@ -1008,8 +1042,18 @@ int SSLOpen(int sock, char *mycert, char + } + + if (SSL_set_fd(_ssl_context[sock], sock) == 0 +- || SSL_connect(_ssl_context[sock]) < 1) { ++ || (ssle_connect = SSL_connect(_ssl_context[sock])) < 1) { ++ int e = errno; ++ unsigned long ssle_err_from_queue = ERR_peek_error(); ++ unsigned long ssle_err_from_get_error = SSL_get_error(_ssl_context[sock], ssle_connect); + ERR_print_errors_fp(stderr); ++ if (SSL_ERROR_SYSCALL == ssle_err_from_get_error && 0 == ssle_err_from_queue) { ++ if (0 == ssle_connect) { ++ report(stderr, GT_("Server shut down connection prematurely during SSL_connect().\n")); ++ } else if (ssle_connect < 0) { ++ report(stderr, GT_("System error during SSL_connect(): %s\n"), strerror(e)); ++ } ++ } + SSL_free( _ssl_context[sock] ); + _ssl_context[sock] = NULL; + SSL_CTX_free(_ctx[sock]); +@@ -1017,6 +1061,24 @@ int SSLOpen(int sock, char *mycert, char + return(-1); + } + ++ if (outlevel >= O_VERBOSE) { ++ SSL_CIPHER const *sc; ++ int bitsmax, bitsused; ++ ++ const char *ver; ++ ++ ver = SSL_get_version(_ssl_context[sock]); ++ ++ sc = SSL_get_current_cipher(_ssl_context[sock]); ++ if (!sc) { ++ report (stderr, GT_("Cannot obtain current SSL/TLS cipher - no session established?\n")); ++ } else { ++ bitsused = SSL_CIPHER_get_bits(sc, &bitsmax); ++ report(stdout, GT_("SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"), ++ ver, SSL_CIPHER_get_name(sc), bitsused, bitsmax); ++ } ++ } ++ + /* Paranoia: was the callback not called as we expected? */ + if (!_depth0ck) { + report(stderr, GT_("Certificate/fingerprint verification was somehow skipped!\n")); +--- /dev/null ++++ fetchmail-6.3.26/starttls.c +@@ -0,0 +1,37 @@ ++/** \file tls.c - collect common TLS functionality ++ * \author Matthias Andree ++ * \date 2006 ++ */ ++ ++#include "fetchmail.h" ++ ++#include ++ ++#ifdef HAVE_STRINGS_H ++#include ++#endif ++ ++/** return true if user allowed opportunistic STARTTLS/STLS */ ++int maybe_starttls(struct query *ctl) { ++#ifdef SSL_ENABLE ++ /* opportunistic or forced TLS */ ++ return (!ctl->sslproto || strlen(ctl->sslproto)) ++ && !ctl->use_ssl; ++#else ++ (void)ctl; ++ return 0; ++#endif ++} ++ ++/** return true if user requires STARTTLS/STLS, note though that this ++ * code must always use a logical AND with maybe_tls(). */ ++int must_starttls(struct query *ctl) { ++#ifdef SSL_ENABLE ++ return maybe_starttls(ctl) ++ && (ctl->sslfingerprint || ctl->sslcertck ++ || (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1"))); ++#else ++ (void)ctl; ++ return 0; ++#endif ++} diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb index 1d78288c88..5af5d0df62 100644 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbb509e0303f5ded1cbfc0cc8705f28c" DEPENDS = "openssl" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ + file://02_remove_SSLv3.patch \ + " SRC_URI[md5sum] = "61b66faad044afa26e142bb1791aa2b3" SRC_URI[sha256sum] = "79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850" From patchwork Wed Sep 5 21:02:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146044 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp29887ljw; Wed, 5 Sep 2018 14:03:17 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda2H7Hy7CHhgPRyQ2NPhGwnRXRVO2RXiAR+ku+LlR8smdCo/lj0o02bVOXoPFp4vxy8vlQV X-Received: by 2002:a63:1363:: with SMTP id 35-v6mr38673090pgt.202.1536181397512; Wed, 05 Sep 2018 14:03:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181397; cv=none; d=google.com; s=arc-20160816; b=FzP/HAEqUqVg778DxHtavtj5VM1ACIiQxFNT/DuyyyGPdk6vGVLicdwl23WsdAMlBe GLWgHUFPv7DG4wFSuRKvTS3J/NPSfIEGqSxZcjCr90bDazomwxysnMnb2ipAWSM/dtl9 ay5a8PcG3aH3OxfhGkF40OroQsuNWJoNkFtWTezP9nziNQQe6yckmFBdv8skd1mWn0O9 yDRCf5maMYGbBEkEGtLcABZBFKAQR1cb23gQjs4AsgcV1QrJSeTEVAKuZiBL9spP5ZkX 2rPOj1yUPWEg/XSIOK6aLiVxYK8kXBlnFfv6Yh9SelwdfZ56ZMJwVk3zeEyynyngTiPr jaXg== 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:dkim-signature:delivered-to; bh=8N3yMwYYI5h+pfty5rFEDgA6UL/psl1dRl9BPjDU8TI=; b=WGMTAAZx8sfZxnFFJDU74tqNK6NqbfJ7T2uxQZigUw4q9uAa3YbARBiWJlq36Nok4e SeT2nMKw/yvMrW6wOZLTB7dK6QymZ/2Xaeg8/Is+tqwsV0xlKaIP2w052rMRSCogRlEB d58RKm8RAvMxQzh0EGgmGZRVo7ME1ZI7e8LdSxGiX3dUkwIz/syku5ywq3e6wZ5cnCD1 be+lMjKm7B/cI4HFhcGIBSjuLm2bnM6xXvEuKFvonRSV21mn4rSqj6nhRcjIxp2qA+1I yVb6HeuCzcwH8Z9IiD+whkIUw6Q67I7n12Awt8Zh/GqqXAGi5Mi6UU9mNvhyv8aXtmH/ HJWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KTr7jqAO; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f29-v6si3150949pgl.570.2018.09.05.14.03.17; Wed, 05 Sep 2018 14:03:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KTr7jqAO; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AA163794A2; Wed, 5 Sep 2018 21:02:57 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mail.openembedded.org (Postfix) with ESMTP id E1F00793E6 for ; Wed, 5 Sep 2018 21:02:36 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id d19-v6so4044882pgv.1 for ; Wed, 05 Sep 2018 14:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=muKjt7AYmpPdhmepByEc2LWX7VJ7wXc6naC8xbI2LiU=; b=KTr7jqAO+R5bSYYmo2qzS7dJp4ehYqpWYs2KQnH052qEZVjXcPhlbmjSN537WNBR/7 GsYS7fsieuj37gRVmpA7hNTTgP7yvBirRTZiRv9pTU62kdZrC+qkmHi6ygCpA5VXq643 no1SAA2ZOY9aeyYzMN+Y/N1EvbbJR/Tdo8WK1L6sVzYRwxp5bqh3eJKKqRdXeT90Moyu ygYp+szBVw533BaEg2Z4dBKq8ZSgwK1Lk9hSFTUeKoa1Lh7Ivj1vy9autgdylm40uket 9C6sGl7R86BeX+WrzhO+xuUMF5/BeR/L1pl7INIO4PIFDQ6B9KM5cIl5Pzpx9EZ7u6Ka pjPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=muKjt7AYmpPdhmepByEc2LWX7VJ7wXc6naC8xbI2LiU=; b=PDPgFhGCsrNEYS287S7jBa55VttP/Dd9F8BGi4KwkOkI74uxGpmlrRirgCnhlL/bBh dkgFa8fGgsYZRgdcdzXzuVytTeWsuBDHl8vRMPasG3gzh1s4L0rX6JL6nFlXiHt3xpvu zVRljpQhe6Ea4WVK3PHtvbUGw8PM77NNWiUa/vpGgqiCQ/RFnwr6PQBjW7auizYWOFE4 moGzKoSm/dZNshNuLhdUb4q4OMAkbUzxsb3x3nMqqaeupwVzthFk26x8X6MNtWuGDayd lMCg01h9l6P7OOTOI3LW3fw/yIG9XbtKYpTH4crMAfOH+TJl7lw2gFGRN3NMcs3fi6lP 9UJg== X-Gm-Message-State: APzg51A8Eaq4CCWeay6MM0qdn4b20hcqT5KBPiHFimMOG5HHeSUQ6AtE 98PFwSAkvWx6jIlmANtZjNTju/Qf X-Received: by 2002:a65:450a:: with SMTP id n10-v6mr36732135pgq.392.1536181357527; Wed, 05 Sep 2018 14:02:37 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:18 -0700 Message-Id: <20180905210224.21225-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 06/12] uw-imap: Fix build with openSSL 1.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../uw-imap/0001-Support-OpenSSL-1.1.patch | 71 +++++++++++++++++++ .../recipes-devtools/uw-imap/uw-imap_2007f.bb | 1 + 2 files changed, 72 insertions(+) create mode 100644 meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch new file mode 100644 index 0000000000..d5610bbcd5 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Support-OpenSSL-1.1.patch @@ -0,0 +1,71 @@ +From 4c684542816a08b95444b8e2515f24d084e6e3c3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 4 Sep 2018 22:05:17 -0700 +Subject: [PATCH] Support OpenSSL 1.1 + +When building with OpenSSL 1.1 and newer, use the new built-in + hostname verification instead of code that doesn't compile due to + structs having been made opaque. +Bug-Debian: https://bugs.debian.org/828589 + +Upstream-Status: Unknown + +Signed-off-by: Khem Raj +--- + src/osdep/unix/ssl_unix.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c +index 3bfdff3..dec9467 100644 +--- a/src/osdep/unix/ssl_unix.c ++++ b/src/osdep/unix/ssl_unix.c +@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags) + /* disable certificate validation? */ + if (flags & NET_NOVALIDATECERT) + SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL); +- else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify); ++ else { ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context); ++ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); ++ X509_VERIFY_PARAM_set1_host(param, host, 0); ++#endif ++ ++ SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify); + /* set default paths to CAs... */ ++ } + SSL_CTX_set_default_verify_paths (stream->context); + /* ...unless a non-standard path desired */ + if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL)) +@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags) + if (SSL_write (stream->con,"",0) < 0) + return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; + /* need to validate host names? */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + if (!(flags & NET_NOVALIDATECERT) && + (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con), + host))) { +@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags) + sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???"); + return ssl_last_error = cpystr (tmp); + } ++#endif + return NIL; + } + +@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_STORE_CTX *ctx) + * Returns: NIL if validated, else string of error message + */ + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + static char *ssl_validate_cert (X509 *cert,char *host) + { + int i,n; +@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *cert,char *host) + else ret = "Unable to locate common name in certificate"; + return ret; + } ++#endif + + /* Case-independent wildcard pattern match + * Accepts: base string diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 4c055e54ca..0000f05ae4 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -10,6 +10,7 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ file://quote_cctype.patch \ file://imap-2007e-shared.patch \ file://imap-2007f-format-security.patch \ + file://0001-Support-OpenSSL-1.1.patch \ " SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" From patchwork Wed Sep 5 21:02:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146046 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30191ljw; Wed, 5 Sep 2018 14:03:34 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY7yxFb5+OIke3LYKNgNAw416nOkRj2G8PUmUL7bScA+ECOpdrbmvHnB7cAEl1Z+iWVbvpO X-Received: by 2002:a17:902:6681:: with SMTP id e1-v6mr41201239plk.109.1536181414404; Wed, 05 Sep 2018 14:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181414; cv=none; d=google.com; s=arc-20160816; b=FztpzVYpeFmdXG2GdXhFuj10KjGUqKo9aVTe2M+QbpBySGxF9PVhw5Tz7AGQE6JFak J5S5UbHdzH4uqJ8XKRrmoLyXoe35xKsnDak1nfh2fhWjXn5zSgCnCb2yA4IuqI+rBv71 RvMJcNvEum7Usfy6niBc7ET/l9ygcV4lI4NqHYzdEntCtSw8O9qaPitD1+hH2LssO2VK nX7U5u7k5cU89H921lnis8MmwcFZ10rOPjA+xNgf3txiAQWOFmklq0OVqXEHrzIfrmRV 7zWzggZbDI4B93Meqt7SC+xbYg1SmxALzxuOjQE0/gNNJ94cf8Slf/JBppnWHe1OW8Gp ym6w== 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:dkim-signature:delivered-to; bh=wEKcY6i9gDfs/TgktgNYg9K935hcFY69J1nJS3uvu+g=; b=tun1y6EKWW5Ywwh3rMfmhtvVDQ1kM6kZqdC91Pew1fCTFllg32SlUDqhWN65Xvzg5s WZAb0pj1yZ1Ddk4vfxxEACHiNeZx+8zuk9KRhMvsMnuNlbl/U14CyZF3WPxagivfObtb Mjda5qAp1NOsP9Isr7fKUPs3ckxjA0xMFWhM6BG8sByMOOL8TsHafXNBlYk/Y1sWntYI KZ0o0UovQq9u1SMwVmvN3gXUyBb0ZcbTUR4tCNARfnB2pj9TQGTyQ+GYrYOEQ4ULGki9 KoUYP3QbV/k4susNvqe7XQWMrrhrcOgjRdTsssIzp9bakOCadrqkZ7MKImb7ETXo0IFt nUwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Fbn2JK3Q; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s65-v6si3245915pfb.271.2018.09.05.14.03.34; Wed, 05 Sep 2018 14:03:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Fbn2JK3Q; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DEE08794DE; Wed, 5 Sep 2018 21:02:59 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mail.openembedded.org (Postfix) with ESMTP id 68F5C793FC for ; Wed, 5 Sep 2018 21:02:37 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id b129-v6so4011834pga.13 for ; Wed, 05 Sep 2018 14:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2C4OUwCJ/wGfFiiI+GP4tYCdz3nZ9wdPaiaTZVfuA+s=; b=Fbn2JK3Q7lJ700sK6e2OPdtv/5a6MFnLYFk1tQCh72A3JTAtyE5uqEhtglJlARWPJc lnOyKHcgE3rifASh2Pc2WsBo4exS0EhkJAcUgKIKTT645SAKJCTDVDT5/DWrT2U+FB9y gMc9DrEB+k0l7/Ar23JJJFQrNAgmNC/3K5J8vAavvcbH4CaXkra0lRe8V82AKOZfEHx3 sKfBoPC20kl4zTTsluvK75Obh+cafR5jRcqr/YViidMT4GkADVbCubjfN5SyS1dl07bY pR8JLNvW4soLpDwdloHoseevPX/65eZ12g2ykRFwUbsx76g9i1FwXteyMjZDzUw0Mlo4 7M/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2C4OUwCJ/wGfFiiI+GP4tYCdz3nZ9wdPaiaTZVfuA+s=; b=LYKpBEjycx4tQCO4BFdwMY2ZmJh6onEBCZSG+66DkCTxHCIvVT3VSs03BD8nZWWdiH dGHfegS/wrOXA9E64ZcwbOxHNoSJfEANQ/m/F6rwXuK9Mcf3fXS8oXTFnsZ5Y/ye1hJE zjn86QYR9LgVUm5CYRy5rIdo4gPI75rel7g0HzLNH2ddYHma+6S5leTDZdKr7ty6oQ9I zmMDfNGRx5J1SPti6KMyKQu3mCh4PfVWyvrMRseBsuEh/tVt4iFKQIF4heUfdKkZrdHM BlXLJzBuWFs8RIb5ynupvFXdeyRYzmZIDCiTCBhh7vD5K5B7J3wEM5llF2+vSOvRvHBP 14mw== X-Gm-Message-State: APzg51CN4cji9xr1CbdM+SdpE3D0aqaikBfLvU/fjSuHiUJMawqkCiIL AKEnBy7EknmS/2eztft2SPmjbeLP X-Received: by 2002:a63:3741:: with SMTP id g1-v6mr15621531pgn.59.1536181358207; Wed, 05 Sep 2018 14:02:38 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:19 -0700 Message-Id: <20180905210224.21225-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 07/12] libusbmuxd: Add recipe X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../libimobiledevice/libusbmuxd_git.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb new file mode 100644 index 0000000000..7ab4ce1ba5 --- /dev/null +++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." +LICENSE = "GPLv3 & GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \ + file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPLv2.1;md5=6ab17b41640564434dda85c06b7124f7" + +DEPENDS = "udev libusb1 libplist" + +inherit autotools pkgconfig gitpkgv + +PKGV = "${GITPKGVTAG}" + +SRCREV = "78df9be5fc8222ed53846cb553de9b5d24c85c6c" +SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${base_libdir}/udev/rules.d/" From patchwork Wed Sep 5 21:02:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146047 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30335ljw; Wed, 5 Sep 2018 14:03:42 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZMQ1CWt/t/r37n6aAZaWOvBsVmD4cZs0G9G4/R1D/uBj57DLloHFLVjSAalj4giWoStr71 X-Received: by 2002:a17:902:8541:: with SMTP id d1-v6mr41308698plo.81.1536181422790; Wed, 05 Sep 2018 14:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181422; cv=none; d=google.com; s=arc-20160816; b=OF0h7CfmgFh64YXfSpowV34F5iANw2wYL0MffpIxuPGnfo7x7BKXolDiIRn079doWg M0spMMnHpFquUbum8glPtzQJJeE4ERRkwzWOoPKWU5drINIxZuYhuB8Lrsvb+z+y1e1L CJlljsJmU5AsiUHs14KZabTqltSlDTj2HhLnXPXtmombYMrvXxiVGOZW3xvZth4HC721 9cEqRwVA3KvU8xXyKDybXYUbpAsXXeft7ab0gQGBdhVhU7Zl+CXetAspfJahtSNpWLpG wmqoPFS2mYUJlljT/v9eNQ9t0rqEpztldxLcVIlll/LDnhxhCD6/cwn6UtMwE/OiQuer m9Ig== 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:dkim-signature:delivered-to; bh=TF3ZH8o38Vjxcu08yN33ud6wBM/AWA7z8JyRf+M9WYo=; b=dqDWD9ah27l5puyCBMYlTxMITa6tsVR4RVjyIx3U6jZRcnvzvrA8wgQOhsxMS6jn6y ahjWiDn8/vqhfu5+hEA2OhzjCKktXIr7nBKRs32vGs/ZcJ9VkRjpoW8+AXyuifA1JTyU Wp71rrlppUcervskV1+Bvc4YMp4/z8qz/XCzSEZdRl00DaUysmZFQp3EmGAsj1SSgsg6 kFczfktVpHz9WJuVNmP3v02hfV4ynY1SIubZ7FqMtAq3cs8w0upfQ0MP+RzBHb6yPqbw g5JFDOg4kE0wNAiZaSIYxeJ5LlR2V4eqKLoql3N6dlt5pPukd01BPaNwaE10mXxWKTe+ +qbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nOJX47W1; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f10-v6si3190570pgk.367.2018.09.05.14.03.42; Wed, 05 Sep 2018 14:03:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nOJX47W1; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 69797794F7; Wed, 5 Sep 2018 21:03:01 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id 69C34793E6 for ; Wed, 5 Sep 2018 21:02:38 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id e11-v6so3871947plb.3 for ; Wed, 05 Sep 2018 14:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OK7c8ZkrZJEMelPQxnbUoSZnxIfA2sKEJL1o3NxV870=; b=nOJX47W1YYXhirrVleDya/vKOb99QgYDV3l1OZ+7Qcq8LoyaH50jluai7OqYTc35KM CnAyJ4JenTCMaH8o8ku420P2mrW9sdQehXGhbTg8gF5usGhEMSAZrmt5s3HBWHzOyNGY oWG4dV3W6TOuXV5sb6xUYUtiT6dcPvGqRWJU/OLN1uy+nnfdyhxwofY0jpwPQ1buJzQc JckxXfnQuF3fKcUHFvFhIFrr3H1PkXxzWBqokoHMy/cQXgIG0fw9WhItXGwKbw42jsan iE+b8q5teJ6rXBpF3IYBFQNyI8pzkm9pmGAY95BlnyuSwR9Ox92kDYke7HRTuiE/l9AI DhTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OK7c8ZkrZJEMelPQxnbUoSZnxIfA2sKEJL1o3NxV870=; b=LTvygjsQUL0lCJGRaXjuUlvYPi5yrcH+nKWv+EtqUmGnGRCgsmThGCa1hlcU4qk+tt iSAsZODGohKgHSu7+ltBaGivSIF0r5mJ7eQv7wa5OePdbwiZ/kczGtyf4wAnT21uhNFv 7Mb5eTC/z5NGlPeJvFSW4HkVwDocd7dn0Ew4AsOEjiD2zsXkTvIBouitbNQ3AKGLe7/n nHM18GxTYblWxAFmggRkCkUyfS+VgU+uKFLUs86HOFdHPJkP1K8aqKuqIWhSW44lTT+m SCvfyDG8qBcYE9npXF84+1QL9Ovftn9VgK6tLgZP3+HSi34wIfwzxd5B6GMNUxd/3usF wKNg== X-Gm-Message-State: APzg51CEUbuNvdXHrLF3EBpHqOaz0d6P6ArkJQmy+W532iP1Bc8AjEgh dNpE9mx8uTkwyte39m8arAPKD4ka X-Received: by 2002:a17:902:1c5:: with SMTP id b63-v6mr41556557plb.82.1536181359131; Wed, 05 Sep 2018 14:02:39 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:20 -0700 Message-Id: <20180905210224.21225-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 08/12] libimobiledevice: Upgrade to latest X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Needs several packages to be updates Fixes build with openSSL 1.1.x Signed-off-by: Khem Raj --- .../files/inline-without-definition.patch | 31 ----------- ...evice_1.1.4.bb => libimobiledevice_git.bb} | 13 +++-- .../usbmuxd/usbmuxd_git.bb | 16 +++--- .../0001-Fix-warnings-found-with-clang.patch | 51 ------------------- .../files/fix-parallel-make.patch | 21 -------- .../{libplist_1.8.bb => libplist_2.0.0.bb} | 10 ++-- 6 files changed, 17 insertions(+), 125 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch rename meta-oe/recipes-connectivity/libimobiledevice/{libimobiledevice_1.1.4.bb => libimobiledevice_git.bb} (54%) delete mode 100644 meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch delete mode 100644 meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch rename meta-oe/recipes-extended/libimobiledevice/{libplist_1.8.bb => libplist_2.0.0.bb} (67%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch b/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch deleted file mode 100644 index 9a7895fd41..0000000000 --- a/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix link error with gcc 5 toolchains - - afc.c:258: error: undefined reference to 'debug_buffer' - collect2: error: ld returned 1 exit status - -debug.h header was declaring things inline without providing a definition. -Files that included this header then failed to link against the corresponding -external symbol in debug.c, because the linker took the 'inline' keyword -seriously rather than ignoring it. - ---- libimobiledevice-1.1.4/src/debug.h.orig 2015-10-03 16:24:08.758740386 -0700 -+++ libimobiledevice-1.1.4/src/debug.h 2015-10-03 16:24:22.706740355 -0700 -@@ -44,14 +44,14 @@ - #define debug_plist(a) - #endif - --LIBIMOBILEDEVICE_INTERNAL inline void debug_info_real(const char *func, -+LIBIMOBILEDEVICE_INTERNAL void debug_info_real(const char *func, - const char *file, - int line, - const char *format, ...); - --LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer(const char *data, const int length); --LIBIMOBILEDEVICE_INTERNAL inline void debug_buffer_to_file(const char *file, const char *data, const int length); --LIBIMOBILEDEVICE_INTERNAL inline void debug_plist_real(const char *func, -+LIBIMOBILEDEVICE_INTERNAL void debug_buffer(const char *data, const int length); -+LIBIMOBILEDEVICE_INTERNAL void debug_buffer_to_file(const char *file, const char *data, const int length); -+LIBIMOBILEDEVICE_INTERNAL void debug_plist_real(const char *func, - const char *file, - int line, - plist_t plist); diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb similarity index 54% rename from meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb rename to meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb index 32aca96fd0..908b98d8c5 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb @@ -7,17 +7,16 @@ LIC_FILES_CHKSUM = "\ HOMEPAGE ="http://www.libimobiledevice.org/" -DEPENDS = "libplist usbmuxd libtasn1 gnutls libgcrypt" +DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" -SRC_URI = " \ - http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \ +SRCREV = "fb71aeef10488ed7b0e60a1c8a553193301428c0" +PV = "1.2.0+git${SRCPV}" +SRC_URI = "\ + git://github.com/libimobiledevice/libimobiledevice;protocol=https \ file://configure-fix-largefile.patch \ - file://inline-without-definition.patch \ " -SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183" -SRC_URI[sha256sum] = "67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8" - +S = "${WORKDIR}/git" inherit autotools pkgconfig EXTRA_OECONF = " --without-cython " diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb index 4365aa4bc6..a9741bd5b7 100644 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb +++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb @@ -4,21 +4,19 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \ file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LGPLv2.1;md5=6ab17b41640564434dda85c06b7124f7" -DEPENDS = "udev libusb1" +DEPENDS = "udev libusb1 libplist" -inherit cmake pkgconfig gitpkgv +inherit autotools pkgconfig gitpkgv systemd PKGV = "${GITPKGVTAG}" -SRCREV = "919587580c5e77f3936f3432115d2e10c7bac7c5" -SRC_URI = "git://git.sukimashita.com/usbmuxd.git;protocol=http" +SRCREV = "ee85938c21043ef5f7cd4dfbc7677f385814d4d8" +SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https" S = "${WORKDIR}/git" -FILES_${PN} += "${base_libdir}/udev/rules.d/" +EXTRA_OECONF += "--without-preflight" -# fix usbmuxd installing files to /usr/lib64 on 64bit hosts: -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" +FILES_${PN} += "${base_libdir}/udev/rules.d/" -PACKAGECONFIG ??= "" -PACKAGECONFIG[plist] = "-DWANT_PLIST=1,-DWANT_PLIST=0,libplist" +SYSTEMD_SERVICE_${PN} = "usbmuxd.service" diff --git a/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch b/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch deleted file mode 100644 index f8114a0634..0000000000 --- a/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ad1be542b87b3186f8ef7bee2c594daefe5bb4c8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 18 Oct 2016 21:31:40 +0000 -Subject: [PATCH] Fix warnings found with clang - -| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:107:12: error: non-void function 'base64decode' should return a value [-Wreturn-type] -| if (!buf) return; -| ^ -| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:109:16: error: non-void function 'base64decode' should return a value [-Wreturn-type] -| if (len <= 0) return; - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - libcnary/node.c | 2 +- - src/base64.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libcnary/node.c b/libcnary/node.c -index 1f9f669..d6f3f63 100644 ---- a/libcnary/node.c -+++ b/libcnary/node.c -@@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* child) { - - int node_insert(node_t* parent, unsigned int index, node_t* child) - { -- if (!parent || !child) return; -+ if (!parent || !child) return -1; - child->isLeaf = TRUE; - child->isRoot = FALSE; - child->parent = parent; -diff --git a/src/base64.c b/src/base64.c -index 65c6061..531a06a 100644 ---- a/src/base64.c -+++ b/src/base64.c -@@ -104,9 +104,9 @@ static int base64decode_block(unsigned char *target, const char *data, size_t da - - unsigned char *base64decode(const char *buf, size_t *size) - { -- if (!buf) return; -+ if (!buf) return 0; - size_t len = strlen(buf); -- if (len <= 0) return; -+ if (len <= 0) return 0; - unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3); - - unsigned char *line; --- -1.9.1 - diff --git a/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch deleted file mode 100644 index f6ef6f4f8b..0000000000 --- a/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001 -From: Nikias Bassen -Date: Mon, 09 Jul 2012 21:17:15 +0000 -Subject: Fix building with parallel build makeopts - ---- -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bad840..155994e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil ) - ADD_SUBDIRECTORY( include ) - ADD_SUBDIRECTORY( test ) - -+ADD_DEPENDENCIES( plist libcnary ) -+ - IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) - ADD_SUBDIRECTORY( swig ) - ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) --- -cgit v0.9.0.2 diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb similarity index 67% rename from meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb rename to meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb index f78979619f..43c1fd5cab 100644 --- a/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb +++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.0.0.bb @@ -6,15 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ DEPENDS = "libxml2 glib-2.0 swig python" -inherit cmake pkgconfig +inherit autotools pkgconfig pythonnative -SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \ - file://fix-parallel-make.patch \ - file://0001-Fix-warnings-found-with-clang.patch \ +SRCREV = "62ec804736435fa34e37e66e228e17e2aacee1d7" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \ " -SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" -SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec" +S = "${WORKDIR}/git" do_install_append () { if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then From patchwork Wed Sep 5 21:02:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146048 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30486ljw; Wed, 5 Sep 2018 14:03:50 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbs+KPdWuJMOWPiZcWJea1zMh9PxcHfHcio3dn5lNr3YU6xzSQMzIBvP4QJ2JVpZWbP3JAF X-Received: by 2002:a17:902:ab94:: with SMTP id f20-v6mr41337638plr.231.1536181430650; Wed, 05 Sep 2018 14:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181430; cv=none; d=google.com; s=arc-20160816; b=jHDeMbOYnRQWlvSnkpjiyaygno5fNAF+3eZWwlaJGIsCyZ75MJo/sk7MABvLRCULMz RPO+tgrA1Y8R05jcTdEy5d+FF/JD9R52fpacp+3FrvUSkUA/s/R8z/0499EsfLoeM0yb K+HO1WY8Aic8Sc4uBFCPaJj305MGJdgVmezVXVr4/PXxWan1cmiEa6kV7MTkCNFNGdrr S7zTyzdCQ4J+cxRkFptT9EJTB9qZGTKnDuUL8XHxZLxsMBHW4zlZjZ1eTr/TgqHVzqPR 4qh6JCDInl10317EMg1cuaAOEZ+09zNDKtvSJnqkGSIByFgfKBLrRmDExWxTnsVhS/tH zQgA== 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:dkim-signature:delivered-to; bh=mYF6yOwYXEXpb+ANEzU0ZLT4CmIbK4PX/mcSx1VHp4k=; b=RrpzV+00wfJBKC+FddKtp37EOM8tcYPROjly1GzxXNHH/XR/Qy+YW8uTvDZnLqk7B3 RGo6hi7eO4kUn0Mn7zf5GlDqQ1vkVJrDVo7kdRySKYsQQWzv2n2HRLyql46Z1q5uuHjf JATNEwaSi55Op8kNuMd7GB7dCSpt4Q9idlfnXNBCH3kpN1eUMNkQURR4qvis4J4wkCOZ uouJSb6rUyJiX4RukZxAeZWqJmWU1k+oUl05szgWzbVbyEoNXGWDNMEU5cMrJQid/dcE 5X4BmF/EOCa3qQY7iLW558mZNEX9txsRhtSTC2Sz955XldGLhKFJcX+181SdUIw+Ko61 51LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G8ZQZClJ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z5-v6si2858950pgn.348.2018.09.05.14.03.50; Wed, 05 Sep 2018 14:03:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G8ZQZClJ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7D46E794FA; Wed, 5 Sep 2018 21:03:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mail.openembedded.org (Postfix) with ESMTP id 713EC7942B for ; Wed, 5 Sep 2018 21:02:39 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id b30-v6so1584103pla.0 for ; Wed, 05 Sep 2018 14:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e+j3b0sQmcO3Cl9uyrXtBH0Br1H6BfEk/m4i9uIvHx4=; b=G8ZQZClJKk/Rxxpry7OL6DYBEyRSGao8bjj/lCVeRUZVQHT85qfKZYYkfr4jB34o8w 7kqKzDJw64pyCQWWMNe6fmpQgS7rYxkVDryzeUzVjBxU4gCSOkbP/4XUkzWxfml//kI/ 0iCJjPWxnPrIAnCpvE8ynqDrKGUD60tofZz0Y9Mtc6ZL0q6DLGwcGFc5HU4mclYGrzhy KIrWWjyWA1siNm1hCNiTPCa6iZs7YQabbOP6wL5E/TusRg0GSRBIpYBIDG/+rrCuw54C 0xWohQsGygASkEUGDjYpe8ghFlrWz+iLscvdX8GCPFiGnxcyPh98HDt0We5ZPdLaqHjC duNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e+j3b0sQmcO3Cl9uyrXtBH0Br1H6BfEk/m4i9uIvHx4=; b=T485UTn09duWvJPLv170sHPFWSK91YKtMXS0POtepvixFjBQyRfdr55zHB8PtTOz8D 0wsopN83pU6xf9JZm4bzPcvAEt739G+YEwgxMUEsKikhw943crNI5fCcdbTwsYKBQiw2 AzcDX8ESXmJ1+lrRfr/s2pBvmsIm8BBXx82JRA+k8T95HQlywpIPws/wt9VIF+xtHVji GAFeol9/T6P0HIT+r8gTBRv5R7jTBt19r0ieUIfa+9f4CWGE7+RVHpGjVtTGwAPB556Q g+HNgUumB2pf00Vnqi4p4KVGtmA0XfUJd3j8MXZKYsdlMOi6vUhfDzHhuON6yBEr1RAi usOw== X-Gm-Message-State: APzg51Cdt6b+7I3T3/iY4WrtRkkdzI5bncggYI+la2MYknQSeHsX9IIG GaLPONToOw05YtVbynzqtT1N+JNx X-Received: by 2002:a17:902:e109:: with SMTP id cc9-v6mr40647558plb.96.1536181360314; Wed, 05 Sep 2018 14:02:40 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:39 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:21 -0700 Message-Id: <20180905210224.21225-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 09/12] liboauth: Fix build with openSSL 1.1.x X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../liboauth/0001-Support-OpenSSL-1.1.0.patch | 151 ++++++++++++++++++ .../liboauth/liboauth_1.0.3.bb | 4 +- 2 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch new file mode 100644 index 0000000000..8691eae2b5 --- /dev/null +++ b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch @@ -0,0 +1,151 @@ +From c14d9bf71753a38df57cc6538b22ed389d2c2cb1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 4 Sep 2018 17:18:51 -0700 +Subject: [PATCH] Support OpenSSL 1.1.0 + +Taken from https://github.com/x42/liboauth/issues/9 + +Upstream-Status: Submitted[https://github.com/x42/liboauth/issues/9] +Signed-off-by: Khem Raj +--- + src/hash.c | 65 ++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 44 insertions(+), 21 deletions(-) + +diff --git a/src/hash.c b/src/hash.c +index 17ff5c8..e128826 100644 +--- a/src/hash.c ++++ b/src/hash.c +@@ -362,6 +362,11 @@ looser: + #include "oauth.h" // base64 encode fn's. + #include + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#define EVP_MD_CTX_new EVP_MD_CTX_create ++#define EVP_MD_CTX_free EVP_MD_CTX_destroy ++#endif ++ + char *oauth_sign_hmac_sha1 (const char *m, const char *k) { + return(oauth_sign_hmac_sha1_raw (m, strlen(m), k, strlen(k))); + } +@@ -386,7 +391,7 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { + unsigned char *sig = NULL; + unsigned char *passphrase = NULL; + unsigned int len=0; +- EVP_MD_CTX md_ctx; ++ EVP_MD_CTX *md_ctx; + + EVP_PKEY *pkey; + BIO *in; +@@ -399,24 +404,31 @@ char *oauth_sign_rsa_sha1 (const char *m, const char *k) { + return xstrdup("liboauth/OpenSSL: can not read private key"); + } + ++ md_ctx = EVP_MD_CTX_new(); ++ if (md_ctx == NULL) { ++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); ++ } ++ + len = EVP_PKEY_size(pkey); + sig = (unsigned char*)xmalloc((len+1)*sizeof(char)); + +- EVP_SignInit(&md_ctx, EVP_sha1()); +- EVP_SignUpdate(&md_ctx, m, strlen(m)); +- if (EVP_SignFinal (&md_ctx, sig, &len, pkey)) { ++ EVP_SignInit(md_ctx, EVP_sha1()); ++ EVP_SignUpdate(md_ctx, m, strlen(m)); ++ if (EVP_SignFinal (md_ctx, sig, &len, pkey)) { + char *tmp; + sig[len] = '\0'; + tmp = oauth_encode_base64(len,sig); + OPENSSL_free(sig); + EVP_PKEY_free(pkey); ++ EVP_MD_CTX_free(md_ctx); + return tmp; + } ++ EVP_MD_CTX_free(md_ctx); + return xstrdup("liboauth/OpenSSL: rsa-sha1 signing failed"); + } + + int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { +- EVP_MD_CTX md_ctx; ++ EVP_MD_CTX *md_ctx; + EVP_PKEY *pkey; + BIO *in; + X509 *cert = NULL; +@@ -437,13 +449,18 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { + return -2; + } + ++ md_ctx = EVP_MD_CTX_new(); ++ if (md_ctx == NULL) { ++ return -2; ++ } ++ + b64d= (unsigned char*) xmalloc(sizeof(char)*strlen(s)); + slen = oauth_decode_base64(b64d, s); + +- EVP_VerifyInit(&md_ctx, EVP_sha1()); +- EVP_VerifyUpdate(&md_ctx, m, strlen(m)); +- err = EVP_VerifyFinal(&md_ctx, b64d, slen, pkey); +- EVP_MD_CTX_cleanup(&md_ctx); ++ EVP_VerifyInit(md_ctx, EVP_sha1()); ++ EVP_VerifyUpdate(md_ctx, m, strlen(m)); ++ err = EVP_VerifyFinal(md_ctx, b64d, slen, pkey); ++ EVP_MD_CTX_free(md_ctx); + EVP_PKEY_free(pkey); + xfree(b64d); + return (err); +@@ -455,35 +472,41 @@ int oauth_verify_rsa_sha1 (const char *m, const char *c, const char *s) { + */ + char *oauth_body_hash_file(char *filename) { + unsigned char fb[BUFSIZ]; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + size_t len=0; + unsigned char *md; + FILE *F= fopen(filename, "r"); + if (!F) return NULL; + +- EVP_MD_CTX_init(&ctx); +- EVP_DigestInit(&ctx,EVP_sha1()); ++ ctx = EVP_MD_CTX_new(); ++ if (ctx == NULL) { ++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); ++ } ++ EVP_DigestInit(ctx,EVP_sha1()); + while (!feof(F) && (len=fread(fb,sizeof(char),BUFSIZ, F))>0) { +- EVP_DigestUpdate(&ctx, fb, len); ++ EVP_DigestUpdate(ctx, fb, len); + } + fclose(F); + len=0; + md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); +- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); +- EVP_MD_CTX_cleanup(&ctx); ++ EVP_DigestFinal(ctx, md,(unsigned int*) &len); ++ EVP_MD_CTX_free(ctx); + return oauth_body_hash_encode(len, md); + } + + char *oauth_body_hash_data(size_t length, const char *data) { +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + size_t len=0; + unsigned char *md; + md=(unsigned char*) xcalloc(EVP_MD_size(EVP_sha1()),sizeof(unsigned char)); +- EVP_MD_CTX_init(&ctx); +- EVP_DigestInit(&ctx,EVP_sha1()); +- EVP_DigestUpdate(&ctx, data, length); +- EVP_DigestFinal(&ctx, md,(unsigned int*) &len); +- EVP_MD_CTX_cleanup(&ctx); ++ ctx = EVP_MD_CTX_new(); ++ if (ctx == NULL) { ++ return xstrdup("liboauth/OpenSSL: failed to allocate EVP_MD_CTX"); ++ } ++ EVP_DigestInit(ctx,EVP_sha1()); ++ EVP_DigestUpdate(ctx, data, length); ++ EVP_DigestFinal(ctx, md,(unsigned int*) &len); ++ EVP_MD_CTX_free(ctx); + return oauth_body_hash_encode(len, md); + } + diff --git a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb index 3311da5a8f..498764ac83 100644 --- a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb +++ b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=6266718a5241c045c8099d9be48817df \ SECTION = "libs" DEPENDS = "curl openssl" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz \ + file://0001-Support-OpenSSL-1.1.0.patch \ + " SRC_URI[md5sum] = "689b46c2b3ab1a39735ac33f714c4f7f" SRC_URI[sha256sum] = "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f" From patchwork Wed Sep 5 21:02:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146049 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30603ljw; Wed, 5 Sep 2018 14:03:58 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYnQZBQkdDOvrlmsE0xZe9ok63T1l9NyBCQuH7jEqEE3MCaAbY12Je4KOHM5RII5iQzKX0e X-Received: by 2002:a63:4745:: with SMTP id w5-v6mr16055822pgk.140.1536181437907; Wed, 05 Sep 2018 14:03:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181437; cv=none; d=google.com; s=arc-20160816; b=sU43nLltnkTebu0a6qmIvXxETlSp3L2iPNNma6EeHA1466VRJLuS/Fel4KBN0q2AOP zS2GrxrHl6Mctw/Bl00tD+g2iLUv9BAMT+DRbWTGLgp8jH/oUFwxcbSi1tQNcdRHYIHw 80I0Z6ND55ms5XmBBqIpkbLswz5BKIE9nX/hwK0uZK0ulUhP92ze/CIfvfWFcHZY1vj/ RWUM43z4PxK96hR9U0+5kwqhspAXFY4RoEmlO3WDWMozAIMAR2jeE2C7Ovux3Ggcc4eV sjPTKb2nQph2u8BuIUcWlR1Fzay9AH/lo42O87GO+9iAlfhHA76OdB5pi2qC7x8H3z+s aV1w== 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:dkim-signature:delivered-to; bh=s1WCeSpWUK/CGI9GIIDOWfy6/8WfPyYFNk+dcHvuk6s=; b=baJzv06LzQQFe+f7WTiRM7MB1K8B9ojZYV0ioTlom6+x7JQ6wcROohUHOpzLxJHL+V XPFkNVsuZM6V0togtFMBDNaA+ndNREosIZ1Rb/wRb+uJR24qq7ja234jP5Fhj6jNzAPq QZX9yLYFzoQ9TlRSvSPlzEtebbrX0fBDBxTEPxw+u8OEh88c1kodUIRls7z0j2YDq1eb mlY6GbABUEKTZ4nDJaNL2rISK7lWl6fXycAWxvXeoAnq+vC6VBNoRIvG4sJzOYmkpLlZ EH9CgkXm1dDZ9EanKncmsj+ILcnGdqXUOEJyWAA3Y5WxMfLHZTTUTZrUy6FiPvdKPvqK gQYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FjAj72uC; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r34-v6si3105465pgb.656.2018.09.05.14.03.57; Wed, 05 Sep 2018 14:03:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FjAj72uC; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 94DDE7944D; Wed, 5 Sep 2018 21:03:03 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id 55A76793E6 for ; Wed, 5 Sep 2018 21:02:40 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id h3-v6so510337plh.10 for ; Wed, 05 Sep 2018 14:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=doIuFTzTmgAJeB6syKbQnIE6dNf5NKdHqiDT33HfaXI=; b=FjAj72uCYAyUQCTyKaP27zCChMHsilTAjL82jyxh7Jc8SbKXCLV9flm/uQTXQwRGxQ mL/Q8RlwTcXfUm5rTYn71hyEyzuwWUwj8PqW1vEZ49PZ++imbejWIxRT8TBvZSdeIjmS jQtHSISM4e4hKLFeYm2q8z/+W8uv3fAGFjZjQmtEhI6843/Cw9ZFN+Yb3OLeYRp5wvQq /T+4VvwkQnK4X2t416Dj15VyW+6mMfxOQnwXqA4h1YoUPOulxp7VtlbGp2zLqJ1E/niz 7PsVl5ZUxg+M36oxdFTEcutDWf62mBdy/ANFmbEVHOpjc7VDQWFjVgBB+Pya5oFDl4MF x74g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=doIuFTzTmgAJeB6syKbQnIE6dNf5NKdHqiDT33HfaXI=; b=DWJz7e5IOtLxjIUTEnnC59/QzCD0aObrHjY0/w6wQ+2Em8FZN6+WyDMqm57cBBHPwx MdF5BJ56IEpWca8+W08ZY7W3hdTQ4HeV/13VUKXiFuCZbdxU6yq1YcPWEWGiLxVsNlUZ 52krMUamQBPyD8Gga9uY1p8gWmBZs4lxBu9uujy5sqkU6I64/70u9vk/2hgAn24/R/I6 Q3z0j8hzy5gv35VaHUS5lk/m3Pd4UUJwWS3ulnCqTNvgOul/KM7+Ygxo8Xa0JfDUaRNN cT3YrqkN1Qz9SdtNmtuPF6V3cRPpWHmhpJePmRflJp+p34WCdvZmsMA5xYwYZQHca/AI QdVQ== X-Gm-Message-State: APzg51Dd+B3aEkiV9qWxlDYyxSkAD4/i2lQ5pqtsfTSuyamu1dGkLjlF iLt4LiirHAxybUkBC9v6KuaHCJme X-Received: by 2002:a17:902:a413:: with SMTP id p19-v6mr40595649plq.220.1536181361312; Wed, 05 Sep 2018 14:02:41 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:40 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:22 -0700 Message-Id: <20180905210224.21225-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 10/12] sip: Upgrade to 4.19.12 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Inherit pythonnative instead of using python from build host Signed-off-by: Khem Raj --- .../recipes-devtools/sip/{sip_4.19.8.bb => sip_4.19.12.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-devtools/sip/{sip_4.19.8.bb => sip_4.19.12.bb} (90%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/sip/sip_4.19.8.bb b/meta-oe/recipes-devtools/sip/sip_4.19.12.bb similarity index 90% rename from meta-oe/recipes-devtools/sip/sip_4.19.8.bb rename to meta-oe/recipes-devtools/sip/sip_4.19.12.bb index ea944b32ff..be58959989 100644 --- a/meta-oe/recipes-devtools/sip/sip_4.19.8.bb +++ b/meta-oe/recipes-devtools/sip/sip_4.19.12.bb @@ -4,13 +4,13 @@ SECTION = "devel" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" -inherit python-dir +inherit python-dir pythonnative DEPENDS = "python" SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz" -SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727" -SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc" +SRC_URI[md5sum] = "e28b0790dfe4962ce6bbd7c4772f40c9" +SRC_URI[sha256sum] = "24617fc31b983df075500ecac0e99d2fb48bf63ba82d4a17518659e571923822" BBCLASSEXTEND = "native" From patchwork Wed Sep 5 21:02:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146050 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30725ljw; Wed, 5 Sep 2018 14:04:06 -0700 (PDT) X-Google-Smtp-Source: ANB0VdajO7QsxxO4u3HSRbpk7U5Tp4tGJdLzvXz8sZwbgFXFcn+d8Iv2rtnmuBlmUWQ3WnNYGaSK X-Received: by 2002:a62:455b:: with SMTP id s88-v6mr42101765pfa.203.1536181446125; Wed, 05 Sep 2018 14:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181446; cv=none; d=google.com; s=arc-20160816; b=JK9ayfPDJnY5qR2LC9jOlwbEbjs+MdQ1zsRy2MW65YT8IS8rgLBHNnmK/YHlb68oXv F20ilOtWiyWku+w3jZc6xzwNpIRNdltpvgfix8TNvNx69fGIXbXkV5bMfeS08xFtLYnP i/X+jESFqZ/61/wvaL8VtKVzECZehWpzjqK3MbwUzED4ejkOGwiRGG0e1Zdrm/vye69e 2lXje+Gay4OWw/OJmAaTzIFzo0K5EZxhcSnbEwVEaIIxrHl4EeniZUE293a5be4Avswj hJynq8U0NXcr4hk7b0R0WKPXGKa888E9+Y13Q8JLj+lfXcpW20E+8XY7GDjdlCjjiY1u CEWA== 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:dkim-signature:delivered-to; bh=ChbPTMmSriOW69C9nqzMv7KgXOT37oZ8I9PscyhGiIs=; b=rRWkkEQ0Ce9joDbGU2dKBqUrd2KQAEsqJsjf6eYEaQzKiABtpOGAuWOJJk03V/XVk6 uKc7/R+cYav+QWxpMcSw8MWPuP+gCK73l0dS13UXY2niiRLgqVcnhTx6DVXQLvHAI4Zu R7DQXfhhMlPjnLm1FgmlT3c/NvtDCa1z+FM0YozJ6u/AqfYDKot5XjY2HOB3tdCWQT0E XaAqQRQ9f7WHODdPIgmvMBsoORCSo2arlaZ/TgwBAfcejDCFRoQnjHV4J8XrZGL7mVlI /OWSPEyYfvssMovrlL6ygb1BnYrcYh4nxwn+tz1/OLyJosuqNZqSi3ghMiCvOJz9EVMJ 92Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AoILfCzU; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y9-v6si2836770plt.9.2018.09.05.14.04.05; Wed, 05 Sep 2018 14:04:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AoILfCzU; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D55607950F; Wed, 5 Sep 2018 21:03:04 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mail.openembedded.org (Postfix) with ESMTP id 6D39179034 for ; Wed, 5 Sep 2018 21:02:42 +0000 (UTC) Received: by mail-pf1-f169.google.com with SMTP id k19-v6so4105476pfi.1 for ; Wed, 05 Sep 2018 14:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KTeJ6TG92gkE6Js9/tpr/MzUxYeRkZGp8XzW51NCYM4=; b=AoILfCzUiOFuYr2YQs0jq52s01wQPfmWS3He3AM5rx4s4DDMrr0SUfHG8mwxqHS5a2 K1+NV9vKGuQAMHngY8Jqeiv1L6nEs1nyWH+h/2UR0ap+QdyK8e0xVdmN+WU/A75U2o7g PnTBsG1Y/FxXAg4OxWDAFAtqd6GcN+WylGB14HpSw8csFnuzMTDaHWAW8wRZxtYIUydN vFOm1QkiCNcCuGv6aBxSKfiuqI3hgpKUTcDUOu2CEjJ0bwZPNbyI+IS+7kUTp9wlFQD4 bOWH1TDtpfFwDy7KlTDIwCT/4l4ruC9JLBInwE7ETixvDLRQiricydGjSS/3K+XLvshc 5mJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KTeJ6TG92gkE6Js9/tpr/MzUxYeRkZGp8XzW51NCYM4=; b=dvD+S6INw1LaJ6zo6OqdzvZzwhm17UNPaphh18amm1Rae06NTqOeBGcvYsQkA/DEJb ttvDMbfnGXXvroVDi7iV6fgi7p2S0pNbdsZ0NhGKXu0WLVV802DQkyhY253ZZbaNjUuZ sDyo2UgYEipumJFMK7i0uzB7gFdeE8nP3iWT7wSjH92jfGC1ekd7Lsl5twEv1P88noUJ dEWkQn8nPZPB302nAP3CFUmUqu8m5caz/RrA7lH8Wy5Uu20/1xsZBFZDgeZhrYitROB6 91O9/iFrGEFyM2G7TIyq713yC4wYn6iopbB51gswY35JlSzHGaqcVKlioKnRImOj/JI6 B50Q== X-Gm-Message-State: APzg51DsyslYyKb7pieyZvLf2llNi2RZ+MDiiHrUQ9OuuyrOY74RvvaT qcgxIJlceBW+TjJkRgj8rsZ8fFfy X-Received: by 2002:a63:d70e:: with SMTP id d14-v6mr38858585pgg.110.1536181362476; Wed, 05 Sep 2018 14:02:42 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:41 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:23 -0700 Message-Id: <20180905210224.21225-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 11/12] nopoll: Upgrade to 0.4.6.b400 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../nopoll/{nopoll_0.4.2.b297.bb => nopoll_0.4.6.b400.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-networking/recipes-protocols/nopoll/{nopoll_0.4.2.b297.bb => nopoll_0.4.6.b400.bb} (84%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb similarity index 84% rename from meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb rename to meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb index 1d77891d47..8c57d29492 100644 --- a/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb +++ b/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f0504124678c1b3158146e0630229298 \ DEPENDS = "openssl" SRC_URI = "http://www.aspl.es/nopoll/downloads/nopoll-${PV}.tar.gz \ " -SRC_URI[md5sum] = "8c411cd0f3c0479aed28c4cf7b114fbb" -SRC_URI[sha256sum] = "f5fbf8aaa16a77b0f265d8c847eb06cb3e68f2b1a50737466dae81181618654c" +SRC_URI[md5sum] = "8d333f158b5d5a8975a6149e6ef8db63" +SRC_URI[sha256sum] = "7f1b20f1d0525f30cdd2a4fc386d328b4cf98c6d11cef51fe62cd9491ba19ad9" inherit autotools pkgconfig From patchwork Wed Sep 5 21:02:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146051 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp30853ljw; Wed, 5 Sep 2018 14:04:13 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ4bcDSQcpsQkI8iAKptuMubllvSXWRS9nTNqjKtycDQsy/TNcA/8i2rprFfTjp0utGbEzE X-Received: by 2002:a63:5c10:: with SMTP id q16-v6mr38082210pgb.452.1536181453278; Wed, 05 Sep 2018 14:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536181453; cv=none; d=google.com; s=arc-20160816; b=wyNpQrv4uHsPsV8tSN3xXklOWfSKlr8li24SePUh0DgvuV0yl+imlSuqjYtzKqUFh7 xjtgPwga7PhMnWtfeY7xdjIh68F7zAJNhMUIRkauNdGlXT/2OS/8V251tdlSLVKM+kCj N1xIYVYb/dWzxvqWR3djHxqo/sqinFG5A8Wb5ot4LcqCdO+P/b60bBo5XYFMtmthSxeA O8wwnG+AkBiJ9Vet9JzuqwwlAlD+drGFZtC3ooBwUMcD0rkMTaPoEJyQ0LwtcHJQVd8r Ijdsu98jrS/8sQDtr9P6Lkp5ivPtTjtAEvzTYItK4WlO2Ha0Ic4S9Ie3a1EPcFBgnLxq ihqA== 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:dkim-signature:delivered-to; bh=Houeg3yBzQda3vUqDcjt/EZ5RCDn4rH+B+JKEGEe/a8=; b=hdFA//uwg+IT4bXVLu7h6ExnZYDgKxTGrE6Z0MqWLuj0PlLWs55qPwGfRjgc4+xUvZ wwTwyiNYn4yBiA+6NgQ7EWNcCO46AlUa/iEsd9a/gFxF4izokyVmJbpmsciwYiRfRtym En+h2I4xrOQ8i9mJX2E//+euAweG/MTU7YY9+uE97F0lvqDGr+lCrxK4yb3P+YauwtNp InIum9rGH6+66iPx1UyAFpXLjRigkZNT+b6pulriMnYP2hHCS66crLw8rSLwiuQ2rXKT gjhl/cTPXXrUs/MMKYmAb1Iovi1XaXvUyNjUP37MrnIL6X3+DgLXvBgJxA7tv175ka8t u3og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eyf05sU+; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f4-v6si2873727plr.213.2018.09.05.14.04.13; Wed, 05 Sep 2018 14:04:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eyf05sU+; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EABAF79514; Wed, 5 Sep 2018 21:03:05 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mail.openembedded.org (Postfix) with ESMTP id 16B0F79034 for ; Wed, 5 Sep 2018 21:02:42 +0000 (UTC) Received: by mail-pg1-f173.google.com with SMTP id d19-v6so4044989pgv.1 for ; Wed, 05 Sep 2018 14:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a4hzTa2uUSAeUCtHAq2Zi0BYyt4Nbf9kVAH+0mqCivI=; b=eyf05sU+HLwC2Sd8wGXrCAUmimhhKa+bnjH48xP/nizWRW7FnP+wVWG9IxOHgZsx1t Lrw1SvzxJ3VjRR29p5LY0bP/CgGXZC7La4QuVCwndJyHTEWC5VcVJ0S5tUQKF+SitSbC F1eb3XWDO2S+tBdg2JO9a5s6+kb9kAS4NihjTSOTbTiUOFVm8chnneGO9a0NwQCNbyGc pS7VhKvVjZ2Q+NB0tBM41MhTphyxvordXwQyaApgp9to6i2S/Gzow4B3gBHZZWffdR2w 30ku+X4YeVeua0KEplNw5QUvN1O7+Yv0DXJh9sEOsBc/rInQOSXS9Vc/er1snZk18l+N Njww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=a4hzTa2uUSAeUCtHAq2Zi0BYyt4Nbf9kVAH+0mqCivI=; b=nwJBsEccfxc+ol0ExSNOAHkgT3jgmDD0lvd2X9XF57YXY1BX65lSY2oY/ACHwTGxAz Tv12RzTLwiAJ78GBcoUtvk8Hd86w50uaxHnKm8mVN+IRwfa8eYiCwyloH6oSOnIVPY4D NKHNDBDR1yYRaufyca2udqDHy+9yiUWqfluU9G7DrtDakzG9oSQeYpjwvRDx/DfbFIDw etIi4IMek5iK2DccBB37KyTa/UO9/nOghSYwpu5gzVaBXwfHtFVoJbuVxYUETVi++HfJ EahvJSvMUhT8g9J8K728zWK7HTVKIkHorGbq9EvSwNT0/GhW9NApCsrNtjSM+tmKWcRv 73jw== X-Gm-Message-State: APzg51BpK+87ZypUb4v7xwOzd0c28TULy1JZAUkWL7M226Bz6zndFYAj De9/k5TExe8zM5stcsteSL91kFXT X-Received: by 2002:a63:1b07:: with SMTP id b7-v6mr14713942pgb.444.1536181363926; Wed, 05 Sep 2018 14:02:43 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id e26-v6sm3689411pfi.70.2018.09.05.14.02.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:02:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 5 Sep 2018 14:02:24 -0700 Message-Id: <20180905210224.21225-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905210224.21225-1-raj.khem@gmail.com> References: <20180905210224.21225-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 12/12] rtmpdump: Depend on openssl10 and X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../rtmpdump/rtmpdump/fix-racing-build-issue.patch | 10 +++++----- .../recipes-multimedia/rtmpdump/rtmpdump_2.4.bb | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch index bb3d8b0efe..6e11c9752e 100644 --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch @@ -8,11 +8,11 @@ Index: git/librtmp/Makefile =================================================================== --- git.orig/librtmp/Makefile +++ git/librtmp/Makefile -@@ -107,6 +107,7 @@ install_base: librtmp.a librtmp.pc +@@ -115,6 +115,7 @@ install_base: librtmp.a librtmp.pc cp librtmp.3 $(MANDIR)/man3 - install_so: librtmp.$(SO_EXT) + install_so: librtmp$(SO_EXT) + -mkdir -p $(SODIR) - cp librtmp.$(SO_EXT) $(SODIR) - cd $(SODIR); ln -sf librtmp.$(SO_EXT) librtmp.$(SOX) - + cp librtmp$(SO_EXT) $(SODIR) + $(INSTALL_IMPLIB) + cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX) diff --git a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb index c5513b0252..a72b0d651e 100644 --- a/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb +++ b/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb @@ -5,9 +5,9 @@ HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "openssl zlib" +DEPENDS = "openssl10 zlib" -SRCREV = "3121324046e4ca1934e7e28293fc8326475d5053" +SRCREV = "fa8646daeb19dfd12c181f7d19de708d623704c0" SRC_URI = " \ git://git.ffmpeg.org/rtmpdump \ file://fix-racing-build-issue.patch"