From patchwork Wed May 22 23:44:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 164922 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1474259ili; Wed, 22 May 2019 16:45:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqwUBItWsZ73WbQz+D/V+f/at1miYgF+sismjhcYtP+RiTMA1nV6429c6dLBB3tr9rHRirzR X-Received: by 2002:a17:902:a505:: with SMTP id s5mr3394609plq.54.1558568704972; Wed, 22 May 2019 16:45:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558568704; cv=none; d=google.com; s=arc-20160816; b=hq7tHhaBvtYwbEx+EHGo8AordK4TChX2cZWp8zPfqr5uNU0JrfHUi2PsmVhmlxiZiN xuPva+YwJnnVOsIPAZPpTPrYtSboD1zn1AQRCjHvQ4ZPGvnlrCuxL8+1yzZkcYzPTK2q euZaemMrIy35VrO9iSODM1iVHTqn8C6QUbXsCYYQIDj4OODbV5BeB/FB/x6ucB2enoYk 0haN2IwtyyYW+0vtJCixabB9q/0xHC5o7ZcZPGW7Wu5mE/LyNK/nKPXq9wsOPYebyKoP F4jvhDZL8XuSaFaAZSVzQg0yckp5+MtSZCKGzs4lP+HsapYS+9ppv3n7Kqrp28YWB6kD rKGw== 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=24IlLq4oSWm7QBF0bg/1cG0ncgnbX3H/qs2inSJfnLY=; b=KfRARt3W25Jyg6TQU4NpYquKH6N5WqDTDa65WDCVOchAD/n3poayfUW6Esa/3lDxkq WXH/5Cov1r/JlOwwhSBNeshi5Ue38GOUl8HlHH3Gtc7FyQy1I6yrLdXxlSZdEVAFO9Ww hbcce3J1gWxXq/4jCcb+b7QK9IW8fAAan9WDWxadwpqv10QPz9VKFjByzPPAqtMHIoch rNSSywxRESthdxox72bzHuvGan5A0dxyt5JbmagcMHvK5WsgZeQpeepVgJjb2o5/EOyn uUJFbcYRxBLoD0eMGPQIRNolo2GeFOcVYeO8QfNydW8FQbhd2bamZQ2QZo+uIC4MDr6H 1yeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VCAnTSvz; 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 33si24242396pla.301.2019.05.22.16.45.04; Wed, 22 May 2019 16:45:04 -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=VCAnTSvz; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DA5BB7E3EF; Wed, 22 May 2019 23:45:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mail.openembedded.org (Postfix) with ESMTP id CC02E7E3D9 for ; Wed, 22 May 2019 23:45:01 +0000 (UTC) Received: by mail-pg1-f170.google.com with SMTP id n2so2080922pgp.11 for ; Wed, 22 May 2019 16:45:03 -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=chxUvBjV+HRoW98DLswgVMqLhrU4GAYhQNq31PR0Ekc=; b=VCAnTSvzqYQ7YjTW1WPnUrAKojV0qMjW0uAE+oETG3W0gWveU5sj0jOTataNhZAUB2 9xiSlYK+eplqZ9OQbmOvNGbbhlwGKKTyMf/0mCF0qVXt/xWSINrRZF4L9ivub0JWcsgN DyTSR8EcbZuphT28NzEn4uwnvQ1CARVWb3NR8MxAoxRET+MyDj8F/rqHpiX/h/d+Uz3l +mOXras+WjAPCOC2hqQubLwTsv06wqc//pDqx4jAgR8SvHOpuXin3tBfCCeZDkMD1+wZ j6tdLptj8qEVADXB5XotokPMCKrdENiey7V+udLG5IZI/FQ7Yq9RSEgaIIt1bG7KenCL DGcw== 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=chxUvBjV+HRoW98DLswgVMqLhrU4GAYhQNq31PR0Ekc=; b=q8l4SdGNzFZYTr98b7562TnT4xCMcCzNzaTrcpEjoT2kL/TOxBzO0MUtAH++DPkO/h OGsEv1O0MZ1hQYHDHKoQGIZTwJREtP6Rgmsu7IN77l2sqJ5QHat1JWZDZX/ssadtzP2f KJnEjrMAdKLnFODauYvRIw6q1sMT0Mnx+dutSfDOT57hScjcNlIwBX1tp3hTvkkw3uIQ JbaosaSPAHEqiTPgwsz4dWlb04N3AXevHaxKDlB4t1fhyA/aJ1SWyMWSavLuCC55K38V gzOqrkzq+RM4cYsyYRbW1dTVvQNKQppw4q/YUyZM+2VkfvjnsyGjlMDXJysvd3tpYDBI FOOA== X-Gm-Message-State: APjAAAUqaF2LdvPl0W6RXWXrztImp7TDge7icCxN8NnNekVO4oafS8u0 5jHfP/nXfzla9UAK0ErCKSLCr+n41eo= X-Received: by 2002:a63:18e:: with SMTP id 136mr63954731pgb.277.1558568702471; Wed, 22 May 2019 16:45:02 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::e252]) by smtp.gmail.com with ESMTPSA id k27sm18567808pfh.147.2019.05.22.16.45.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 16:45:01 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 May 2019 16:44:52 -0700 Message-Id: <20190522234455.13121-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 1/4] python-six: put python2/3 variant together 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 From: Andreas Müller Upcoming 60.2.3 mozjs (meta-oe) requires python(2)-six-native for its configuration. Currently python(2)-six lives in meta-python and it could be moved to mozjs's home meta-oe but that would be just further clutter. Once applied here patch to meta-python will be send. Signed-off-by: Andreas Müller --- meta-oe/recipes-devtools/python/python-six_1.12.0.bb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 meta-oe/recipes-devtools/python/python-six_1.12.0.bb diff --git a/meta-oe/recipes-devtools/python/python-six_1.12.0.bb b/meta-oe/recipes-devtools/python/python-six_1.12.0.bb new file mode 100644 index 0000000000..af26e83d60 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-six_1.12.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require recipes-devtools/python/python-six.inc From patchwork Wed May 22 23:44:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 164923 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1474314ili; Wed, 22 May 2019 16:45:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxA/BRr4qlRtWp+dZuDXGWyYgkt0KxUcG2Lxu0lreLpOgyYyBuUBLouc06jSFz3OVpEgfdu X-Received: by 2002:aa7:980e:: with SMTP id e14mr99569174pfl.142.1558568709555; Wed, 22 May 2019 16:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558568709; cv=none; d=google.com; s=arc-20160816; b=Io96qDS8IsH3Zb9t0Bm89dJaOjSqY2YcS2+7Rh8UgM2+17JJTnl0yTZwOnUR65CSeL 6N2TP8NSEkPvx8uAAMpp0s4D8HOlRmfXXR7SKir2dSTMduUAMhzkk8Np+RR9qzHnp3vU /jpQCupHak2W2Q6vSFsvyIn6o0bvVLz0UukSCrjzq9MnZ9jY7ulXt32ig1nH2CnW735J Awh8q/HFbLd5sZZsZpEDBYkQBoR9jVdp6NWwYjsg9BsaNftfQ5WBI90W+q6SFvMJGQrV dTOY22HEfC51NVG2gBF7AlpwxfGsiysYT0KwLYQ9LFzrNtUsfZU8UHP4KX8xL+cB/D9g wG1w== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=2Q+iMb0J8bntzrB464V5LWBhXE/MvC9KXufgNrwtR+I=; b=WP3scGtHoKXVOEDCEMI6CsZ859MtUiuHW6wZj3nT40hfCEVD+2JCWs3rbGrRTHD4Wm 8bTPg6QSAG2qyW5kf3JEKk2249zddkUwULHmH9r6rkVU42tc+pVGxKulbN3iK/onVCGX /E2+eLKycdzkO1XPiTcN3rRZzrXGj7MmriKekmJL3TdnCsoCZrev4DAjuNYxCLZ5ckcf EsDbdD+O8IJyYxI/e4bI1fCY2NOqVozyqLKlKYCowS6M3Ilai3VQ/OoP77zule25UDC9 9yygvuIIA4veAEO/s+bV8/yLBiNeDKZHz5l0m8bo6myjPWzl/2JguVIKym2fK2YwnVnC cEJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gnGMw2Fm; 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 x21si26478194pll.85.2019.05.22.16.45.09; Wed, 22 May 2019 16:45: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=gnGMw2Fm; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 48DC67E3FF; Wed, 22 May 2019 23:45:04 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mail.openembedded.org (Postfix) with ESMTP id 6C8397E3D9 for ; Wed, 22 May 2019 23:45:02 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id a5so1792608pls.12 for ; Wed, 22 May 2019 16:45:03 -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 :mime-version:content-transfer-encoding; bh=VYoyFvwn43JE05Ktg2GjDSnQ5T2LnCqAHgC1O9MZ95w=; b=gnGMw2FmDA+oudyAeb64fDy1R1coEGJDrVdLb43BzT7kq4kOl4NN94apVq38oh7AmZ nGEG8jafRBshOMeD7w//VPTdYgYl/dpmOtG3P2SbbkemognkFYwFsAZXpeYA/fzT1f4V s4/pk45e0+8LtKBa3OVJPxSrPD9JWHJXJD5HfY07FXZl1G3Q+6Bl17oFleGYaXSC+zZF 2Pi+N+EKJj1irUaJo4KVXYZszXu2N6wWmy6I7qpOJPUB7PRppzJ5hFoNIK31NRUpUapd F382k5rB34lYghdLqdl0Bh1TC5IX+C21W/0kHAm8KMPvDo0ywCeL9ig/+7gIQ6Q9xqAi jCew== 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:mime-version:content-transfer-encoding; bh=VYoyFvwn43JE05Ktg2GjDSnQ5T2LnCqAHgC1O9MZ95w=; b=sGfETjYWOj4zHBtLPTUfQLScEjJiF8JISs3wUOSzgJ3lnPkRok8v1KEyLL1TucHTN4 Zm/nS1plaWQDkZiAgCb66LiPNo1rTQ1AiWoUunqP8zTOgw2rGoCLQdaPcUscmMXFgATw pHFzvOZKhkIqJWSY4dD+ycm0k+Z2es3MAoobEDxnNaCrtB5VQ0h7D0MfVQwwd6ZMlzQl EowY2kN+mwVs+1IF36LrbtpCb7LruMTiay9pKCjywoVfwPEsGj2TfNUZ6XI3dNgeDBRt kiZ+31nrxSP1nAQEbM3Eba/eNA9JJY3ytRvliFGcpaSsR7BRIc6JQJ9L9AQFLjnoSzmW iAYw== X-Gm-Message-State: APjAAAWpDC8SZNAmjfeaxCjMh+gHy/J1IliX7sCiWGUWu6Fw8cuAKeDG ckVUoNLCcy4abGkNuXais4DqXvHm9ts= X-Received: by 2002:a17:902:9691:: with SMTP id n17mr31287020plp.283.1558568703132; Wed, 22 May 2019 16:45:03 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::e252]) by smtp.gmail.com with ESMTPSA id k27sm18567808pfh.147.2019.05.22.16.45.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 16:45:02 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 May 2019 16:44:53 -0700 Message-Id: <20190522234455.13121-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522234455.13121-1-raj.khem@gmail.com> References: <20190522234455.13121-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/4] python-jsmin, python-pytoml, python-which: Add recipes 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 These packages are needed for mozjs 60.x to build Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-jsmin_2.2.2.bb | 11 +++++++++++ meta-oe/recipes-devtools/python/python-pytoml.inc | 12 ++++++++++++ .../recipes-devtools/python/python-pytoml_0.1.20.bb | 2 ++ .../recipes-devtools/python/python-which_1.1.0.bb | 13 +++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 meta-oe/recipes-devtools/python/python-jsmin_2.2.2.bb create mode 100644 meta-oe/recipes-devtools/python/python-pytoml.inc create mode 100644 meta-oe/recipes-devtools/python/python-pytoml_0.1.20.bb create mode 100644 meta-oe/recipes-devtools/python/python-which_1.1.0.bb -- 2.21.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/python/python-jsmin_2.2.2.bb b/meta-oe/recipes-devtools/python/python-jsmin_2.2.2.bb new file mode 100644 index 0000000000..d00d1e2a08 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-jsmin_2.2.2.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "JavaScript minifier." +HOMEPAGE = "https://github.com/tikitu/jsmin/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3a3301ce2ad647e172f4a1016c67324d" + +inherit setuptools pypi +SRC_URI[md5sum] = "00e7a3179a4591aab2ee707b3214e2fd" +SRC_URI[sha256sum] = "b6df99b2cd1c75d9d342e4335b535789b8da9107ec748212706ef7bbe5c2553b" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/python/python-pytoml.inc b/meta-oe/recipes-devtools/python/python-pytoml.inc new file mode 100644 index 0000000000..1019c09d03 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-pytoml.inc @@ -0,0 +1,12 @@ +SUMMARY = "A TOML-0.4.0 parser/writer for Python" +HOMEPAGE = "https://pypi.python.org/pypi/pytoml/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cfff423699bdaef24331933ac4f56078" + +SRC_URI[md5sum] = "a11d8a4859b53f6ebe2f782314428911" +SRC_URI[sha256sum] = "ca2d0cb127c938b8b76a9a0d0f855cf930c1d50cc3a0af6d3595b566519a1013" + +inherit pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/python/python-pytoml_0.1.20.bb b/meta-oe/recipes-devtools/python/python-pytoml_0.1.20.bb new file mode 100644 index 0000000000..88fa95317f --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-pytoml_0.1.20.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pytoml.inc diff --git a/meta-oe/recipes-devtools/python/python-which_1.1.0.bb b/meta-oe/recipes-devtools/python/python-which_1.1.0.bb new file mode 100644 index 0000000000..41ffba0d2e --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-which_1.1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "which.py -- a portable GNU which replacement" +HOMEPAGE = "http://code.google.com/p/which/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=030b09798681482b9ad12ac47be496ea" + +inherit setuptools pypi + +SRCREV = "425bdeeb2d87c36e2313dc4b8d69ff2bb5a02ee9" +SRC_URI = "git://github.com/trentm/which" +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native nativesdk" From patchwork Wed May 22 23:44:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 164924 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1474403ili; Wed, 22 May 2019 16:45:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxrU63sVkUg1Do2fExEHt3uFrXnAhL3PcWqT0xj2csDZ/P2CTf8hhyJRP1kuIwiuHdM/n44 X-Received: by 2002:a63:9548:: with SMTP id t8mr1311523pgn.256.1558568715906; Wed, 22 May 2019 16:45:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558568715; cv=none; d=google.com; s=arc-20160816; b=fWT5EiHJ6m2zJ57hrUPOkXsjFVFmw2rwG37gtNI1PqrOVEIA7FZEa5KUknhp8FaGDS fWSUOtRZKgIgl4K/L9M9fQJ8+AVf/2aCj/GwXRIYRr0mZlLgQUa7LUAbd235GDlPPsEv pA80sSafituByJpBVRCBNEXZnZrEoddOlnDnDpdVvDh5COhsJoXHY+/mDwt7n/YotLhJ wkru5Ew544S5X7zuVs90XjkT4c3WLhfK7VVmgQM0qPGnrwNmhuviY2afmTw48fz3AiEF VAZqdKO61KMRUpmdoSj9Mv1hwheSi/B9+gka1YH7hWA+28StRBd7m6Zii+QktJUkL/42 R+3Q== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=UZ815g2V5pAKcDfwHTaJz34UE0vrmjSb44lUKTJMlSc=; b=GbLHR5WMBbTUcdJNn8iGmiMTO8SPLnVaHWc2f7uYre9+D0ozHXeQCF5nosAKoRugjS lSRgxYQwE51rbAqAjO1oVNJCP3gEDO+eAgTK1twzd2r3Z/w7xE76EcxoqI97Npa1H+rU YIo/6jIEe0FAsTbmHM2KcvJZ/PlscN83YmwVgNJ4tg69W0jmsLmKwjNYksEntHhLoxwq 1ZnlC82LrmnupcNPenegDldXxre+cJw5VUGE1lWk/U+vV7nJFisBfZok7U3zOHNjmDeB GKt+hunKYKiIRaxfwD8/8Ucr8/wiINWa8eN8+I29+UaieycGTo6a6paorn4BrZxu1K8W lGvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rYkCSgby; 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 i38si28364801plb.132.2019.05.22.16.45.15; Wed, 22 May 2019 16:45:15 -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=rYkCSgby; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 836A77E405; Wed, 22 May 2019 23:45:06 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by mail.openembedded.org (Postfix) with ESMTP id BCC1A7E402 for ; Wed, 22 May 2019 23:45:03 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id p1so1818950plo.2 for ; Wed, 22 May 2019 16:45:05 -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 :mime-version:content-transfer-encoding; bh=tTSu44sOyhObONvektYE7MI1OCnHeyBb+3NuuYfXMWs=; b=rYkCSgbyjcwJDmvO/wqPsZKhHnnEFoqRkQR6m89fNfuwKqV//M3FGrD25lWRvtQkPg 7xL8CYqQMxpen0SqZdbsM3VXbMYc4iy0uhNQ7NqrLiG8Q2hTRrIpm5bmeHZJvjvpbmPw jmMvKomYmMvQpU3n5mlrD2HbGugLQqe5DveNb+HTHxyA/A5gqCI3b808XORhXY/yaSEA HwhaswNOdt9u8acXijypeI1TF+951D0rDccnhiOlLO9WBz8q2zX06ehA8LoNVpjzRCdW yt35kpvp34oszHNc7xjm+SzglV/SG0LwoKDWKwOAZIwj1tZuck34W7Vn4Ys73siWhRgY /6sA== 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:mime-version:content-transfer-encoding; bh=tTSu44sOyhObONvektYE7MI1OCnHeyBb+3NuuYfXMWs=; b=qTBabFReBdIWLmflXHnB+TGky3ki2piGVASlMenNK/yqB4QmNv3Cspu9XTX6IQmFKh 5t5pUTjuqiSiLCtDtIbQ4qp/uJa4m6fSqi2aSzYQM3UtXeBU2kqiwYiJDzeerF/jChFZ ZUR3ACw3MpU9wkGrtoMD8zFAWuSKOwnFyqYxipVYBW5acIUG8UQYrFVNUTp5ES2NP9jY psPsVXame4UE8jAokoil4fVrKf+tnT6YAweo/ldhjOAtxzZU/s/sD0LsAloIhGMdfUy5 QMzggBHPu1LL+cgX4m9lA1MdCeXNxJ338rTdNNyX9BWfJqfq7bccw3UhUKU3w1lNA/Hs gwxA== X-Gm-Message-State: APjAAAX9dM8gIYYXBqPbL6cuWhHveTRh8Au1zRRcaGCPy8PQomU8zhUs n5PU4Z98BAD4WHWpT5hc3Q0wUw06ufg= X-Received: by 2002:a17:902:8a8f:: with SMTP id p15mr452551plo.157.1558568704434; Wed, 22 May 2019 16:45:04 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::e252]) by smtp.gmail.com with ESMTPSA id k27sm18567808pfh.147.2019.05.22.16.45.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 16:45:03 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 May 2019 16:44:54 -0700 Message-Id: <20190522234455.13121-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522234455.13121-1-raj.khem@gmail.com> References: <20190522234455.13121-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/4] mozjs: Upgrade to version 60.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: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-To-fix-build-error-on-arm32BE.patch | 8 +- ...001-do-not-create-python-environment.patch | 28 +--- ...-compiling-failure-on-mips64-n32-bsp.patch | 19 +-- ...include-RequiredDefines.h-for-depend.patch | 8 +- .../0005-fix-do_compile-failed-on-mips.patch | 11 +- .../mozjs/mozjs/0006-support-musl.patch | 124 +++++------------- ...ix-cross-compilation-on-i586-targets.patch | 9 +- .../mozjs/mozjs/JS_PUBLIC_API.patch | 48 ++++--- .../mozjs/mozjs/add-riscv-support.patch | 38 ++---- ...isable-mozglue-in-stand-alone-builds.patch | 74 ----------- .../mozjs/mozjs/format-overflow.patch | 12 +- .../{mozjs_52.9.1.bb => mozjs_60.5.2.bb} | 19 +-- 12 files changed, 113 insertions(+), 285 deletions(-) delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch rename meta-oe/recipes-extended/mozjs/{mozjs_52.9.1.bb => mozjs_60.5.2.bb} (89%) diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-To-fix-build-error-on-arm32BE.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-To-fix-build-error-on-arm32BE.patch index 3bbd10a173..056f74a529 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0001-To-fix-build-error-on-arm32BE.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-To-fix-build-error-on-arm32BE.patch @@ -7,13 +7,13 @@ error: #error Target architecture was not detected as supported by Double-Conver Signed-off-by: Lei Maohui --- - mfbt/double-conversion/utils.h | 2 +- + mfbt/double-conversion/double-conversion/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +diff --git a/mfbt/double-conversion/double-conversion/utils.h b/mfbt/double-conversion/double-conversion/utils.h index 4f37218..93575cb 100644 ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h +--- a/mfbt/double-conversion/double-conversion/utils.h ++++ b/mfbt/double-conversion/double-conversion/utils.h @@ -53,7 +53,7 @@ // disabled.) // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch index ba317bc0c5..a3c1b69e29 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-do-not-create-python-environment.patch @@ -14,11 +14,9 @@ Signed-off-by: Hongxu Jia js/src/old-configure | 4 ++-- 3 files changed, 11 insertions(+), 21 deletions(-) -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 2123beb..6fe6591 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -179,24 +179,6 @@ def virtualenv_python(env_python, build_env, mozconfig, help): +@@ -250,24 +250,6 @@ def virtualenv_python(env_python, build_ else: python = sys.executable @@ -42,9 +40,7 @@ index 2123beb..6fe6591 100644 - return python - set_config('PYTHON', virtualenv_python) -diff --git a/configure.py b/configure.py -index f7392d0..45323a5 100644 + --- a/configure.py +++ b/configure.py @@ -12,7 +12,15 @@ import textwrap @@ -62,22 +58,11 @@ index f7392d0..45323a5 100644 + sys.path.insert(0, os.path.join(sub_dir, module_dir)) + from mozbuild.configure import ConfigureSandbox - from mozbuild.util import ( - indented_repr, -diff --git a/js/src/old-configure b/js/src/old-configure -index ee4527b..75b00e1 100644 + from mozbuild.makeutil import Makefile + from mozbuild.pythonutil import iter_modules_in_path --- a/js/src/old-configure +++ b/js/src/old-configure -@@ -10512,7 +10512,7 @@ if test "$MOZ_BUILD_APP" != js -o -n "$JS_STANDALONE"; then - ;; - esac - -- eval $dumpenv $PYTHON $_topsrcdir/build/subconfigure.py --prepare "$srcdir" "$moz_config_dir" "$_CONFIG_SHELL" $ac_configure_args -+ eval $dumpenv PYTHONPATH=$_topsrcdir/python/mozbuild/ $PYTHON $_topsrcdir/build/subconfigure.py --prepare "$srcdir" "$moz_config_dir" "$_CONFIG_SHELL" $ac_configure_args - - done - -@@ -10931,7 +10931,7 @@ if test "$JS_STANDALONE"; then +@@ -9974,7 +9974,7 @@ if test "$JS_STANDALONE"; then if test "$no_recursion" != yes; then trap '' EXIT @@ -86,6 +71,3 @@ index ee4527b..75b00e1 100644 exit 1 fi fi --- -2.7.4 - diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch index bc1af3c702..a36478bfba 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-fix-compiling-failure-on-mips64-n32-bsp.patch @@ -22,11 +22,9 @@ Signed-off-by: Hongxu Jia python/mozbuild/mozbuild/configure/constants.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 6fe6591..a77b46c 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -357,7 +357,10 @@ def split_triplet(triplet): +@@ -650,7 +650,10 @@ def split_triplet(triplet, allow_unknown canonical_cpu = 'mips32' endianness = 'little' if 'el' in cpu else 'big' elif cpu in ('mips64', 'mips64el'): @@ -38,11 +36,9 @@ index 6fe6591..a77b46c 100644 endianness = 'little' if 'el' in cpu else 'big' elif cpu.startswith('aarch64'): canonical_cpu = 'aarch64' -diff --git a/js/src/jit/mips-shared/Architecture-mips-shared.h b/js/src/jit/mips-shared/Architecture-mips-shared.h -index 7afe305..c6e29dc 100644 --- a/js/src/jit/mips-shared/Architecture-mips-shared.h +++ b/js/src/jit/mips-shared/Architecture-mips-shared.h -@@ -24,6 +24,8 @@ +@@ -26,6 +26,8 @@ #define USES_O32_ABI #elif (defined(_MIPS_SIM) && (_MIPS_SIM == _ABI64)) || defined(JS_SIMULATOR_MIPS64) #define USES_N64_ABI @@ -51,7 +47,7 @@ index 7afe305..c6e29dc 100644 #else #error "Unsupported ABI" #endif -@@ -91,7 +93,7 @@ class Registers +@@ -93,7 +95,7 @@ class Registers ta1 = t5, ta2 = t6, ta3 = t7, @@ -60,20 +56,15 @@ index 7afe305..c6e29dc 100644 a4 = r8, a5 = r9, a6 = r10, -diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py -index dfc7cf8..27f83ab 100644 --- a/python/mozbuild/mozbuild/configure/constants.py +++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -83,8 +83,8 @@ CPU_preprocessor_checks = OrderedDict(( +@@ -90,8 +90,8 @@ CPU_preprocessor_checks = OrderedDict(( ('hppa', '__hppa__'), ('sparc64', '__sparc__ && __arch64__'), ('sparc', '__sparc__'), - ('mips64', '__mips64'), ('mips32', '__mips__'), + ('mips64', '__mips64'), + ('sh4', '__sh__'), )) - assert sorted(CPU_preprocessor_checks.keys()) == sorted(CPU.POSSIBLE_VALUES) --- -2.7.4 - diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch index c111ea5eae..e3f1883a99 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch @@ -15,13 +15,13 @@ Signed-off-by: Andreas Müller Rebase to 52.8.1 Signed-off-by: Hongxu Jia --- - js/src/js.pc.in | 2 +- + js/src/build/js.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/js/src/js.pc.in b/js/src/js.pc.in +diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in index 2eae393..c2dea62 100644 ---- a/js/src/js.pc.in -+++ b/js/src/js.pc.in +--- a/js/src/build/js.pc.in ++++ b/js/src/build/js.pc.in @@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript Version: @MOZILLA_VERSION@ @PKGCONF_REQUIRES_PRIVATE@ diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch b/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch index 38e4698f29..d1da109720 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-do_compile-failed-on-mips.patch @@ -20,19 +20,14 @@ Signed-off-by: Hongxu Jia config/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/config/config.mk b/config/config.mk -index 4e3fd1a..d847ffa 100644 --- a/config/config.mk +++ b/config/config.mk -@@ -523,7 +523,7 @@ EXPAND_MKSHLIB_ARGS = --uselist +@@ -423,7 +423,7 @@ EXPAND_MKSHLIB_ARGS = --uselist ifdef SYMBOL_ORDER EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) endif -EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) +EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) $(OS_LDFLAGS) - # $(call CHECK_SYMBOLS,lib,PREFIX,dep_name,test) - # Checks that the given `lib` doesn't contain dependency on symbols with a --- -2.7.4 - + # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including + # this file diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0006-support-musl.patch b/meta-oe/recipes-extended/mozjs/mozjs/0006-support-musl.patch index 32a977ce2b..770d5e0aaa 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0006-support-musl.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0006-support-musl.patch @@ -7,8 +7,6 @@ Upstream-Status: Pending Signed-off-by: Hongxu Jia --- - memory/jemalloc/src/src/pages.c | 1 - - memory/mozjemalloc/jemalloc.c | 7 +++---- mozglue/misc/TimeStamp_darwin.cpp | 1 - mozglue/misc/TimeStamp_posix.cpp | 1 - nsprpub/pr/src/misc/prsystem.c | 1 - @@ -18,62 +16,9 @@ Signed-off-by: Hongxu Jia python/psutil/psutil/arch/osx/process_info.c | 1 - 9 files changed, 3 insertions(+), 12 deletions(-) -diff --git a/memory/jemalloc/src/src/pages.c b/memory/jemalloc/src/src/pages.c -index 647952a..7b964c8 100644 ---- a/memory/jemalloc/src/src/pages.c -+++ b/memory/jemalloc/src/src/pages.c -@@ -2,7 +2,6 @@ - #include "jemalloc/internal/jemalloc_internal.h" - - #ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT --#include - #endif - - /******************************************************************************/ -diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c -index 5d4d83a..c618de9 100644 ---- a/memory/mozjemalloc/jemalloc.c -+++ b/memory/mozjemalloc/jemalloc.c -@@ -332,7 +332,6 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib/malloc.c 180599 2008-07-18 19:35:44Z ja - #include - #include - #if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) --#include - #endif - #include - #ifndef MOZ_MEMORY -@@ -674,7 +673,7 @@ static bool malloc_initialized = false; - #elif defined(MOZ_MEMORY_DARWIN) - static malloc_mutex_t init_lock = {OS_SPINLOCK_INIT}; - #elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) --static malloc_mutex_t init_lock = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; -+static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; - #elif defined(MOZ_MEMORY) - static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; - #else -@@ -1644,7 +1643,7 @@ malloc_mutex_init(malloc_mutex_t *mutex) - pthread_mutexattr_t attr; - if (pthread_mutexattr_init(&attr) != 0) - return (true); -- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); -+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); - if (pthread_mutex_init(mutex, &attr) != 0) { - pthread_mutexattr_destroy(&attr); - return (true); -@@ -1709,7 +1708,7 @@ malloc_spin_init(malloc_spinlock_t *lock) - pthread_mutexattr_t attr; - if (pthread_mutexattr_init(&attr) != 0) - return (true); -- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); -+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); - if (pthread_mutex_init(lock, &attr) != 0) { - pthread_mutexattr_destroy(&attr); - return (true); -diff --git a/mozglue/misc/TimeStamp_darwin.cpp b/mozglue/misc/TimeStamp_darwin.cpp -index f30bc98..3998c9c 100644 --- a/mozglue/misc/TimeStamp_darwin.cpp +++ b/mozglue/misc/TimeStamp_darwin.cpp -@@ -18,7 +18,6 @@ +@@ -19,7 +19,6 @@ #include #include @@ -81,20 +26,16 @@ index f30bc98..3998c9c 100644 #include #include -diff --git a/mozglue/misc/TimeStamp_posix.cpp b/mozglue/misc/TimeStamp_posix.cpp -index 05dedde..d9e30f2 100644 --- a/mozglue/misc/TimeStamp_posix.cpp +++ b/mozglue/misc/TimeStamp_posix.cpp @@ -21,7 +21,6 @@ - #if defined(__DragonFly__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) + #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) #include -#include #endif #if defined(__DragonFly__) || defined(__FreeBSD__) -diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c -index eba85fb..54b57bb 100644 --- a/nsprpub/pr/src/misc/prsystem.c +++ b/nsprpub/pr/src/misc/prsystem.c @@ -27,7 +27,6 @@ @@ -105,22 +46,18 @@ index eba85fb..54b57bb 100644 #endif #if defined(DARWIN) -diff --git a/python/psutil/psutil/_psutil_bsd.c b/python/psutil/psutil/_psutil_bsd.c -index 7b6e561..0a91262 100644 ---- a/python/psutil/psutil/_psutil_bsd.c -+++ b/python/psutil/psutil/_psutil_bsd.c -@@ -16,7 +16,6 @@ - #include +--- a/third_party/python/psutil/psutil/_psutil_bsd.c ++++ b/third_party/python/psutil/psutil/_psutil_bsd.c +@@ -29,7 +29,6 @@ #include #include --#include #include +-#include #include #include -diff --git a/python/psutil/psutil/_psutil_osx.c b/python/psutil/psutil/_psutil_osx.c -index 3ebf8ff..b3910ba 100644 ---- a/python/psutil/psutil/_psutil_osx.c -+++ b/python/psutil/psutil/_psutil_osx.c + #include +--- a/third_party/python/psutil/psutil/_psutil_osx.c ++++ b/third_party/python/psutil/psutil/_psutil_osx.c @@ -13,7 +13,6 @@ #include #include @@ -129,22 +66,8 @@ index 3ebf8ff..b3910ba 100644 #include #include #include -diff --git a/python/psutil/psutil/arch/bsd/process_info.c b/python/psutil/psutil/arch/bsd/process_info.c -index 4d73924..46f288d 100644 ---- a/python/psutil/psutil/arch/bsd/process_info.c -+++ b/python/psutil/psutil/arch/bsd/process_info.c -@@ -15,7 +15,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/python/psutil/psutil/arch/osx/process_info.c b/python/psutil/psutil/arch/osx/process_info.c -index b6dd5bb..62a838f 100644 ---- a/python/psutil/psutil/arch/osx/process_info.c -+++ b/python/psutil/psutil/arch/osx/process_info.c +--- a/third_party/python/psutil/psutil/arch/osx/process_info.c ++++ b/third_party/python/psutil/psutil/arch/osx/process_info.c @@ -16,7 +16,6 @@ #include #include @@ -153,6 +76,23 @@ index b6dd5bb..62a838f 100644 #include #include "process_info.h" --- -2.7.4 - +--- a/memory/build/Mutex.h ++++ b/memory/build/Mutex.h +@@ -42,7 +42,7 @@ struct Mutex { + if (pthread_mutexattr_init(&attr) != 0) { + return false; + } +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_STALLED); + if (pthread_mutex_init(&mMutex, &attr) != 0) { + pthread_mutexattr_destroy(&attr); + return false; +@@ -102,7 +102,7 @@ typedef Mutex StaticMutex; + + #if defined(XP_DARWIN) + #define STATIC_MUTEX_INIT OS_SPINLOCK_INIT +-#elif defined(XP_LINUX) && !defined(ANDROID) ++#elif defined(XP_LINUX) && !defined(ANDROID) && defined(__GLIBC__) + #define STATIC_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP + #else + #define STATIC_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch b/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch index 9194e346a3..3ac25f6aed 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch @@ -17,12 +17,10 @@ Signed-off-by: Hongxu Jia js/src/old-configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/js/src/old-configure b/js/src/old-configure -index 8a8ef52..d7afcff 100644 --- a/js/src/old-configure +++ b/js/src/old-configure -@@ -3964,7 +3964,7 @@ IMPORT_LIB_SUFFIX= - DIRENT_INO=d_ino +@@ -3833,7 +3833,7 @@ AS='$(CC)' + AS_DASH_C_FLAG='-c' MOZ_USER_DIR=".mozilla" -MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib" @@ -30,6 +28,3 @@ index 8a8ef52..d7afcff 100644 --- -2.7.4 - diff --git a/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch b/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch index 6c87ff2a4c..56b18ba8c6 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch @@ -1,28 +1,40 @@ -Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1426865 +patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1426865 -Signed-off-by: Khem Raj Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1426865] +Signed-off-by: Khem Raj --- a/js/public/TypeDecls.h +++ b/js/public/TypeDecls.h -@@ -21,22 +21,23 @@ +@@ -21,31 +21,32 @@ #include #include "js-config.h" +#include "jstypes.h" - struct JSContext; + typedef uint8_t jsbytecode; + +-class JSAtom; +-struct JSCompartment; +-struct JSContext; -class JSFunction; -+class JS_PUBLIC_API(JSFunction); - class JSObject; +-class JSObject; +-struct JSRuntime; -class JSScript; -class JSString; -class JSAddonId; -+class JS_PUBLIC_API(JSScript); -+class JS_PUBLIC_API(JSString); -+class JS_PUBLIC_API(JSAddonId); +-struct JSFreeOp; ++class JS_PUBLIC_API JSAtom; ++struct JS_PUBLIC_API JSCompartment; ++struct JS_PUBLIC_API JSContext; ++class JS_PUBLIC_API JSFunction; ++class JS_PUBLIC_API JSObject; ++struct JS_PUBLIC_API JSRuntime; ++class JS_PUBLIC_API JSScript; ++class JS_PUBLIC_API JSString; ++class JS_PUBLIC_API JSAddonId; ++struct JS_PUBLIC_API JSFreeOp; -struct jsid; -+struct JS_PUBLIC_API(jsid); ++struct JS_PUBLIC_API jsid; namespace JS { @@ -30,8 +42,14 @@ Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1426865 -class Symbol; -class Value; -+class JS_PUBLIC_API(Symbol); -+class JS_PUBLIC_API(Value); - template class Handle; - template class MutableHandle; - template class Rooted; +-class Realm; +-struct Runtime; +-struct Zone; ++class JS_PUBLIC_API Symbol; ++class JS_PUBLIC_API Value; ++class JS_PUBLIC_API Realm; ++struct JS_PUBLIC_API Runtime; ++struct JS_PUBLIC_API Zone; + + template + class Handle; diff --git a/meta-oe/recipes-extended/mozjs/mozjs/add-riscv-support.patch b/meta-oe/recipes-extended/mozjs/mozjs/add-riscv-support.patch index 4354a9dee6..0a41485610 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/add-riscv-support.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/add-riscv-support.patch @@ -4,8 +4,6 @@ Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1318905 Signed-off-by: Ricardo Salveti -diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess -index d5d667d..1277a86 100755 --- a/build/autoconf/config.guess +++ b/build/autoconf/config.guess @@ -1029,6 +1029,9 @@ EOF @@ -18,39 +16,21 @@ index d5d667d..1277a86 100755 s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 6fe6591..56e6730 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -362,6 +362,9 @@ def split_triplet(triplet): - elif cpu.startswith('aarch64'): - canonical_cpu = 'aarch64' +@@ -658,6 +658,9 @@ def split_triplet(triplet, allow_unknown + elif cpu == 'sh4': + canonical_cpu = 'sh4' endianness = 'little' + elif cpu in ('riscv32', 'riscv64'): + canonical_cpu = cpu + endianness = 'little' - else: - die('Unknown CPU type: %s' % cpu) - -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h -index 15dd4bf..4f37218 100644 ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h -@@ -60,7 +60,8 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || defined(__aarch64__) -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ -+ defined(__riscv) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) -diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py -index dfc7cf8..4f8d666 100644 + elif allow_unknown: + canonical_cpu = cpu + endianness = 'unknown' --- a/python/mozbuild/mozbuild/configure/constants.py +++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -48,6 +48,8 @@ CPU_bitness = { +@@ -50,6 +50,8 @@ CPU_bitness = { 'mips64': 64, 'ppc': 32, 'ppc64': 64, @@ -58,8 +38,8 @@ index dfc7cf8..4f8d666 100644 + 'riscv64': 64, 's390': 32, 's390x': 64, - 'sparc': 32, -@@ -79,6 +81,8 @@ CPU_preprocessor_checks = OrderedDict(( + 'sh4': 32, +@@ -82,6 +84,8 @@ CPU_preprocessor_checks = OrderedDict(( ('s390', '__s390__'), ('ppc64', '__powerpc64__'), ('ppc', '__powerpc__'), diff --git a/meta-oe/recipes-extended/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch b/meta-oe/recipes-extended/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch deleted file mode 100644 index 5487cdbe64..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs/disable-mozglue-in-stand-alone-builds.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 2fb531ac753500314336ccd508cb2d53f5e768e5 Mon Sep 17 00:00:00 2001 -From: Till Schneidereit -Date: Thu, 1 Oct 2015 12:59:09 +0200 -Subject: Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all platforms - -Otherwise, build fails not being able to find HashBytes. - -Patch ported forward to mozjs52 by Philip Chimento -. - -https://bugzilla.mozilla.org/show_bug.cgi?id=1176787 - -Upstream-Status: Backport - -Signed-off-by: Ricardo Salveti ---- - js/src/old-configure | 20 ++++++++++++-------- - mozglue/build/moz.build | 2 +- - 2 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/js/src/old-configure b/js/src/old-configure -index d7afcff..8a6f142 100644 ---- a/js/src/old-configure -+++ b/js/src/old-configure -@@ -8546,21 +8546,25 @@ if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then - fi - - --case "${OS_TARGET}" in --Android|WINNT|Darwin) -+if test "$JS_STANDALONE"; then - MOZ_GLUE_IN_PROGRAM= -- ;; --*) -- MOZ_GLUE_IN_PROGRAM=1 -- cat >> confdefs.pytmp <<\EOF -+else -+ case "${OS_TARGET}" in -+ Android|WINNT|Darwin) -+ MOZ_GLUE_IN_PROGRAM= -+ ;; -+ *) -+ MOZ_GLUE_IN_PROGRAM=1 -+ cat >> confdefs.pytmp <<\EOF - (''' MOZ_GLUE_IN_PROGRAM ''', ' 1 ') - EOF - cat >> confdefs.h <<\EOF - #define MOZ_GLUE_IN_PROGRAM 1 - EOF - -- ;; --esac -+ ;; -+ esac -+fi - - if test "$MOZ_MEMORY"; then - if test "x$MOZ_DEBUG" = "x1"; then -diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build -index d289747..e3be5a2 100644 ---- a/mozglue/build/moz.build -+++ b/mozglue/build/moz.build -@@ -6,7 +6,7 @@ - - # Build mozglue as a shared lib on Windows, OSX and Android. - # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in --if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): -+if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']: - SharedLibrary('mozglue') - else: - Library('mozglue') --- -2.7.4 - diff --git a/meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch b/meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch index 29c6a7b69c..e257fc6f62 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs/format-overflow.patch @@ -11,11 +11,11 @@ Signed-off-by: Khem Raj --- a/js/src/moz.build +++ b/js/src/moz.build @@ -785,7 +785,7 @@ if CONFIG['JS_HAS_CTYPES']: - DEFINES['FFI_BUILDING'] = True - - if CONFIG['GNU_CXX']: -- CXXFLAGS += ['-Wno-shadow', '-Werror=format'] -+ CXXFLAGS += ['-Wno-shadow'] + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + # Also disable strict-aliasing for GCC compiler, that is enabled by default + # starting with version 7.1, see Bug 1363009 +- CXXFLAGS += ['-Wno-shadow', '-Werror=format', '-fno-strict-aliasing'] ++ CXXFLAGS += ['-Wno-shadow', '-fno-strict-aliasing'] # Suppress warnings in third-party code. - if CONFIG['CLANG_CXX']: + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): diff --git a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb similarity index 89% rename from meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb rename to meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb index 5e67eeea71..3cccf40ddf 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb @@ -1,9 +1,9 @@ SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" -SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.orig.tar.xz \ +SRC_URI = "https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 \ file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ file://0010-fix-cross-compilation-on-i586-targets.patch \ file://0001-do-not-create-python-environment.patch \ @@ -11,12 +11,11 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.o file://0003-workaround-autoconf-2.13-detection-failed.patch \ file://0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch \ file://0005-fix-do_compile-failed-on-mips.patch \ - file://disable-mozglue-in-stand-alone-builds.patch \ file://add-riscv-support.patch \ file://0001-mozjs-fix-coredump-caused-by-getenv.patch \ file://format-overflow.patch \ - file://JS_PUBLIC_API.patch \ file://0001-To-fix-build-error-on-arm32BE.patch \ + file://JS_PUBLIC_API.patch \ " SRC_URI_append_libc-musl = " \ file://0006-support-musl.patch \ @@ -24,16 +23,17 @@ SRC_URI_append_libc-musl = " \ SRC_URI_append_mipsarchn32 = " \ file://0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ " - -SRC_URI[md5sum] = "c9473c625ee0a9edaaac8b742ff24c5f" -SRC_URI[sha256sum] = "f9324a6724233ab15f10381fe13e635e89d725ef1e78025a0a7d36c58a84a0f9" +SRC_URI[md5sum] = "023ed014e9e93d01620d121bc06a3589" +SRC_URI[sha256sum] = "f51039c997415fd0f13f8e01966b4a8ff80cbf90deb8b14c18827104a369cc0d" inherit autotools pkgconfig perlnative pythonnative inherit distro_features_check CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" -DEPENDS += "nspr zlib" +DEPENDS += "nspr zlib python-six-native python-pytoml-native \ + python-jsmin-native python-futures-native \ + python-which-native" # Disable null pointer optimization in gcc >= 6 # https://bugzilla.redhat.com/show_bug.cgi?id=1328045 @@ -47,6 +47,7 @@ EXTRA_OECONF = " \ --prefix=${prefix} \ --libdir=${libdir} \ --disable-tests --disable-strip --disable-optimize \ + --disable-jemalloc \ --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ " @@ -105,7 +106,7 @@ do_install_prepend() { PACKAGES =+ "lib${BPN}" FILES_lib${BPN} += "${libdir}/lib*.so" -FILES_${PN}-dev += "${bindir}/js52-config" +FILES_${PN}-dev += "${bindir}/js60-config" # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: From patchwork Wed May 22 23:44:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 164925 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1474513ili; Wed, 22 May 2019 16:45:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxj+HUTjLnuI1GshbiTL6v89ZWHLAkLW3kBSSosdW7KmD6UstAdohXKB68XckdGzV2ctKkz X-Received: by 2002:a17:902:3fa5:: with SMTP id a34mr65363850pld.297.1558568723705; Wed, 22 May 2019 16:45:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558568723; cv=none; d=google.com; s=arc-20160816; b=P0ZxZ8mSV8AJhw3LTMF1J6GV4ySWMVtdE/azmtuPCV4iGPXskkkQVC/C8Vq51fxGZh jinvy+VJ/QpgFYnfSlBuP2eNu1Lpboz3JEj8XXtPWyOvVzJxxCc2qVOPdboJKuzqA+41 X6GvEjJgPUKCUYghixXyNKXlU/CThHmNOKtyN5EM35exqtgSI6/0y+Jhztgl6V4sofMl y3nY+v2dp9yRwVfw5bkwVQQfZKx0SEq1rsVwdviL5wxBBKT3zZxt9WV6bI6CpyuEyAOV cH88bnnbYXS6JJ/4XRQc0R3UDK3kPUPB3Dey26aw1J1yOpEy+BZMnVjITQtblS0AOJX3 hZoA== 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 :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=uLSkKQbGoNQL07re+pYtL+272OE94d8zjeBB9vzakxo=; b=N3tpFpk8dOWa8gCGREsRxICTAub4NnQM944bvudQNMjJDeB9gPZ0bLNA/JOmZ98pwP +0MwUkoOZEW14cvp5WmLPLa+a2uddeUbfUHlQmvqVQS//F1nqZkSD4Tmn4nU1T1NyZbS VD3V7vFtxVBx7eUfACIDnHPTJcG4kroo5eQkheE6X/wJTKzAcrQL0/nsITIeEZCNXamB 1uOgFBNhXL3DmFtXvGXA3Vh/AVYVa44N7XTRFmWnyak/c0eZbbywkU6r9Y37NCEsTf9l olSB3jsw/g4x2ytkiR/AlKihzvuKnyN3ftCx7SP/8/QfrKZ89mJroCjFcL3jEq2vujwh TTqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="si/SPwua"; 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 cp14si28441343plb.183.2019.05.22.16.45.23; Wed, 22 May 2019 16:45:23 -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="si/SPwua"; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A8A777E410; Wed, 22 May 2019 23:45:07 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mail.openembedded.org (Postfix) with ESMTP id D699F7E403 for ; Wed, 22 May 2019 23:45:04 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id c6so2141356pfa.10 for ; Wed, 22 May 2019 16:45:06 -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 :mime-version:content-transfer-encoding; bh=imXLS2nGv/QCAbuP7thFgvh/B4pq5gvGrRuOI3wGDZI=; b=si/SPwuahI3SwsalzMS3oaTWBucT7xGfvDny75E32fULZ+V7uHAUq2HAT3r2v3HLz4 IhojLMSOAKM5hTdYPeW2fNh+eWUyWUqCuljWyn784OwoqO7+acjVVJSsubIVssTWYxe9 1NvjQwAIfsauwNJOMGYJQ3StAxpmOqDETucEw/cWgIr3McHDFVXWPSjSJDtxwPu0K/tt /h/qunbKmRg3nWTsRKmtgm9NZCW0/RoNxNuYkgqq5WZpiuRUna+l44VDj0lU6yE1fVgd /L4w20AWUsiQzFjUxZhfAu8hmxCdqGoUL5dKf0NeL52/X1uVHJO3UXOjUTTzeFnAhaya msWw== 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:mime-version:content-transfer-encoding; bh=imXLS2nGv/QCAbuP7thFgvh/B4pq5gvGrRuOI3wGDZI=; b=UT8R9YWgs5Zxu+xl0FZEI3CW9OC4fLK0CThh9v/AMVHYYSpIIDCaNWZMwp6ifx3rrV UM2ttEiISPoeZJAX0x+M4Ni8/TLraD+p+9s3QNbDYIl3lUaGDDQ+sxb3fpSDhMX1pOcY SZ9gLZPj2uoIeZjsQGuVSppr3N+/f0l5nxXuMVJ13OHEsy2ywC5oPsAjWn/oo7VU7wsX tzHcZQHlhlNnqqMF2AvnXCuTGRXWdvTbxcJaLXdbzG5WPTQAlIZX8/CfQgvFLNRVagQI yI3sN76XqxTeAUQzKlzAdoL56fHSIFgnvTSJDHcM6Edh1Gyj3l9ZMiQWPyG+ixrovNd+ PCZg== X-Gm-Message-State: APjAAAVQ/Ra9YNFMGEYZZeL/GWJ+0X2FTvwpE+15xT4KuuphBbi/MPv0 gJREEv4+fNWmpWW64r9a/VoJ195z93Y= X-Received: by 2002:a63:5964:: with SMTP id j36mr92458517pgm.384.1558568705384; Wed, 22 May 2019 16:45:05 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::e252]) by smtp.gmail.com with ESMTPSA id k27sm18567808pfh.147.2019.05.22.16.45.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 16:45:04 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 22 May 2019 16:44:55 -0700 Message-Id: <20190522234455.13121-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522234455.13121-1-raj.khem@gmail.com> References: <20190522234455.13121-1-raj.khem@gmail.com> MIME-Version: 1.0 Cc: Jann Horn Subject: [oe] [meta-oe][PATCH 4/4] polkit: Upgrade to 0.116 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 Make netgroup support optional so it can be disabled on musl Drop backported patch 0001-backend-Compare-PolkitUnixProcess-uids-for-temporary.patch Signed-off-by: Khem Raj --- ...PolkitUnixProcess-uids-for-temporary.patch | 186 -------------- ...1-make-netgroup-support-configurable.patch | 93 ------- .../0003-make-netgroup-support-optional.patch | 232 ++++++++++++++++++ .../{polkit_0.115.bb => polkit_0.116.bb} | 7 +- 4 files changed, 235 insertions(+), 283 deletions(-) delete mode 100644 meta-oe/recipes-extended/polkit/polkit/0001-backend-Compare-PolkitUnixProcess-uids-for-temporary.patch delete mode 100644 meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch create mode 100644 meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch rename meta-oe/recipes-extended/polkit/{polkit_0.115.bb => polkit_0.116.bb} (88%) -- 2.21.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/polkit/polkit/0001-backend-Compare-PolkitUnixProcess-uids-for-temporary.patch b/meta-oe/recipes-extended/polkit/polkit/0001-backend-Compare-PolkitUnixProcess-uids-for-temporary.patch deleted file mode 100644 index ae314e3c17..0000000000 --- a/meta-oe/recipes-extended/polkit/polkit/0001-backend-Compare-PolkitUnixProcess-uids-for-temporary.patch +++ /dev/null @@ -1,186 +0,0 @@ -From eb1f1336e8e49b4db6243b543e0a71f7c0c9b5b1 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Fri, 4 Jan 2019 14:24:48 -0500 -Subject: [PATCH] backend: Compare PolkitUnixProcess uids for temporary - authorizations - -It turns out that the combination of `(pid, start time)` is not -enough to be unique. For temporary authorizations, we can avoid -separate users racing on pid reuse by simply comparing the uid. - -https://bugs.chromium.org/p/project-zero/issues/detail?id=1692 - -And the above original email report is included in full in a new comment. - -Reported-by: Jann Horn - -Closes: https://gitlab.freedesktop.org/polkit/polkit/issues/75 - -Upstream-Status: Backport -CVE: CVE-2019-6133 -Signed-off-by: Chen Qi ---- - src/polkit/polkitsubject.c | 2 + - src/polkit/polkitunixprocess.c | 71 +++++++++++++++++++++- - .../polkitbackendinteractiveauthority.c | 39 +++++++++++- - 3 files changed, 110 insertions(+), 2 deletions(-) - -diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c -index d4c1182..ccabd0a 100644 ---- a/src/polkit/polkitsubject.c -+++ b/src/polkit/polkitsubject.c -@@ -99,6 +99,8 @@ polkit_subject_hash (PolkitSubject *subject) - * @b: A #PolkitSubject. - * - * Checks if @a and @b are equal, ie. represent the same subject. -+ * However, avoid calling polkit_subject_equal() to compare two processes; -+ * for more information see the `PolkitUnixProcess` documentation. - * - * This function can be used in e.g. g_hash_table_new(). - * -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index 972b777..7a6d48b 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -51,7 +51,10 @@ - * @title: PolkitUnixProcess - * @short_description: Unix processs - * -- * An object for representing a UNIX process. -+ * An object for representing a UNIX process. NOTE: This object as -+ * designed is now known broken; a mechanism to exploit a delay in -+ * start time in the Linux kernel was identified. Avoid -+ * calling polkit_subject_equal() to compare two processes. - * - * To uniquely identify processes, both the process id and the start - * time of the process (a monotonic increasing value representing the -@@ -66,6 +69,72 @@ - * polkit_unix_process_new_for_owner() with trusted data. - */ - -+/* See https://gitlab.freedesktop.org/polkit/polkit/issues/75 -+ -+ But quoting the original email in full here to ensure it's preserved: -+ -+ From: Jann Horn -+ Subject: [SECURITY] polkit: temporary auth hijacking via PID reuse and non-atomic fork -+ Date: Wednesday, October 10, 2018 5:34 PM -+ -+When a (non-root) user attempts to e.g. control systemd units in the system -+instance from an active session over DBus, the access is gated by a polkit -+policy that requires "auth_admin_keep" auth. This results in an auth prompt -+being shown to the user, asking the user to confirm the action by entering the -+password of an administrator account. -+ -+After the action has been confirmed, the auth decision for "auth_admin_keep" is -+cached for up to five minutes. Subject to some restrictions, similar actions can -+then be performed in this timespan without requiring re-auth: -+ -+ - The PID of the DBus client requesting the new action must match the PID of -+ the DBus client requesting the old action (based on SO_PEERCRED information -+ forwarded by the DBus daemon). -+ - The "start time" of the client's PID (as seen in /proc/$pid/stat, field 22) -+ must not have changed. The granularity of this timestamp is in the -+ millisecond range. -+ - polkit polls every two seconds whether a process with the expected start time -+ still exists. If not, the temporary auth entry is purged. -+ -+Without the start time check, this would obviously be buggy because an attacker -+could simply wait for the legitimate client to disappear, then create a new -+client with the same PID. -+ -+Unfortunately, the start time check is bypassable because fork() is not atomic. -+Looking at the source code of copy_process() in the kernel: -+ -+ p->start_time = ktime_get_ns(); -+ p->real_start_time = ktime_get_boot_ns(); -+ [...] -+ retval = copy_thread_tls(clone_flags, stack_start, stack_size, p, tls); -+ if (retval) -+ goto bad_fork_cleanup_io; -+ -+ if (pid != &init_struct_pid) { -+ pid = alloc_pid(p->nsproxy->pid_ns_for_children); -+ if (IS_ERR(pid)) { -+ retval = PTR_ERR(pid); -+ goto bad_fork_cleanup_thread; -+ } -+ } -+ -+The ktime_get_boot_ns() call is where the "start time" of the process is -+recorded. The alloc_pid() call is where a free PID is allocated. In between -+these, some time passes; and because the copy_thread_tls() call between them can -+access userspace memory when sys_clone() is invoked through the 32-bit syscall -+entry point, an attacker can even stall the kernel arbitrarily long at this -+point (by supplying a pointer into userspace memory that is associated with a -+userfaultfd or is backed by a custom FUSE filesystem). -+ -+This means that an attacker can immediately call sys_clone() when the victim -+process is created, often resulting in a process that has the exact same start -+time reported in procfs; and then the attacker can delay the alloc_pid() call -+until after the victim process has died and the PID assignment has cycled -+around. This results in an attacker process that polkit can't distinguish from -+the victim process. -+*/ -+ -+ - /** - * PolkitUnixProcess: - * -diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index de3f752..098d343 100644 ---- a/src/polkitbackend/polkitbackendinteractiveauthority.c -+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -3035,6 +3035,43 @@ temporary_authorization_store_free (TemporaryAuthorizationStore *store) - g_free (store); - } - -+/* See the comment at the top of polkitunixprocess.c */ -+static gboolean -+subject_equal_for_authz (PolkitSubject *a, -+ PolkitSubject *b) -+{ -+ if (!polkit_subject_equal (a, b)) -+ return FALSE; -+ -+ /* Now special case unix processes, as we want to protect against -+ * pid reuse by including the UID. -+ */ -+ if (POLKIT_IS_UNIX_PROCESS (a) && POLKIT_IS_UNIX_PROCESS (b)) { -+ PolkitUnixProcess *ap = (PolkitUnixProcess*)a; -+ int uid_a = polkit_unix_process_get_uid ((PolkitUnixProcess*)a); -+ PolkitUnixProcess *bp = (PolkitUnixProcess*)b; -+ int uid_b = polkit_unix_process_get_uid ((PolkitUnixProcess*)b); -+ -+ if (uid_a != -1 && uid_b != -1) -+ { -+ if (uid_a == uid_b) -+ { -+ return TRUE; -+ } -+ else -+ { -+ g_printerr ("denying slowfork; pid %d uid %d != %d!\n", -+ polkit_unix_process_get_pid (ap), -+ uid_a, uid_b); -+ return FALSE; -+ } -+ } -+ /* Fall through; one of the uids is unset so we can't reliably compare */ -+ } -+ -+ return TRUE; -+} -+ - static gboolean - temporary_authorization_store_has_authorization (TemporaryAuthorizationStore *store, - PolkitSubject *subject, -@@ -3077,7 +3114,7 @@ temporary_authorization_store_has_authorization (TemporaryAuthorizationStore *st - TemporaryAuthorization *authorization = l->data; - - if (strcmp (action_id, authorization->action_id) == 0 && -- polkit_subject_equal (subject_to_use, authorization->subject)) -+ subject_equal_for_authz (subject_to_use, authorization->subject)) - { - ret = TRUE; - if (out_tmp_authz_id != NULL) diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch b/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch deleted file mode 100644 index 3b0ef5e5a3..0000000000 --- a/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 7d5e205aa58a10e7b1ccc2fa75b443508a5c3e18 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 20 Jan 2016 04:31:59 +0000 -Subject: [PATCH] make netgroup support configurable - -Disable using innetgr and *netigrent function if not available - -These functions are not available on all libc implementations e.g. musl -doesnt have them. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - -Rebase to 0.115 -Signed-off-by: Hongxu Jia ---- - configure.ac | 2 +- - src/polkitbackend/polkitbackendinteractiveauthority.c | 6 +++++- - src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8b3e1b1..1c392df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], - [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) - AC_SUBST(EXPAT_LIBS) - --AC_CHECK_FUNCS(clearenv fdatasync) -+AC_CHECK_FUNCS(clearenv fdatasync getnetgrent innetgr) - - if test "x$GCC" = "xyes"; then - LDFLAGS="-Wl,--as-needed $LDFLAGS" -diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index cb6fdab..de3f752 100644 ---- a/src/polkitbackend/polkitbackendinteractiveauthority.c -+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2224,7 +2224,7 @@ get_users_in_group (PolkitIdentity *group, - out: - return ret; - } -- -+#if defined HAVE_GETNETGRENT - static GList * - get_users_in_net_group (PolkitIdentity *group, - gboolean include_root) -@@ -2285,6 +2285,8 @@ get_users_in_net_group (PolkitIdentity *group, - return ret; - } - -+#endif -+ - /* ---------------------------------------------------------------------------------------------------- */ - - static void -@@ -2369,10 +2371,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, - { - user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE)); - } -+#if defined HAVE_GETNETGRENT - else if (POLKIT_IS_UNIX_NETGROUP (identity)) - { - user_identities = g_list_concat (user_identities, get_users_in_net_group (identity, FALSE)); - } -+#endif - else - { - g_warning ("Unsupported identity"); -diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp -index 517f3c6..6042dd2 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.cpp -+++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - user = JS_EncodeString (cx, args[0].toString()); - netgroup = JS_EncodeString (cx, args[1].toString()); - -+#if defined HAVE_INNETGR - if (innetgr (netgroup, - NULL, /* host */ - user, -@@ -1509,6 +1510,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - { - is_in_netgroup = true; - } -+#endif - - JS_free (cx, netgroup); - JS_free (cx, user); --- -2.7.4 - diff --git a/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch b/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch new file mode 100644 index 0000000000..fd7251369e --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit/0003-make-netgroup-support-optional.patch @@ -0,0 +1,232 @@ +From 21aa2747e8f0048759aab184b07dd6389666d5e6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 May 2019 13:18:55 -0700 +Subject: [PATCH] make netgroup support optional + +On at least Linux/musl and Linux/uclibc, netgroup +support is not available. PolKit fails to compile on these systems +for that reason. + +This change makes netgroup support conditional on the presence of the +setnetgrent(3) function which is required for the support to work. If +that function is not available on the system, an error will be returned +to the administrator if unix-netgroup: is specified in configuration. + +Fixes bug 50145. + +Closes polkit/polkit#14. +Signed-off-by: A. Wilcox +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + src/polkit/polkitidentity.c | 16 ++++++++++++++++ + src/polkit/polkitunixnetgroup.c | 3 +++ + .../polkitbackendinteractiveauthority.c | 14 ++++++++------ + src/polkitbackend/polkitbackendjsauthority.cpp | 2 ++ + test/polkit/polkitidentitytest.c | 9 ++++++++- + test/polkit/polkitunixnetgrouptest.c | 3 +++ + .../test-polkitbackendjsauthority.c | 2 ++ + 8 files changed, 43 insertions(+), 8 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP + [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) + AC_SUBST(EXPAT_LIBS) + +-AC_CHECK_FUNCS(clearenv fdatasync) ++AC_CHECK_FUNCS(clearenv fdatasync setnetgrent) + + if test "x$GCC" = "xyes"; then + LDFLAGS="-Wl,--as-needed $LDFLAGS" +--- a/src/polkit/polkitidentity.c ++++ b/src/polkit/polkitidentity.c +@@ -182,7 +182,15 @@ polkit_identity_from_string (const gcha + } + else if (g_str_has_prefix (str, "unix-netgroup:")) + { ++#ifndef HAVE_SETNETGRENT ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Netgroups are not available on this machine ('%s')", ++ str); ++#else + identity = polkit_unix_netgroup_new (str + sizeof "unix-netgroup:" - 1); ++#endif + } + + if (identity == NULL && (error != NULL && *error == NULL)) +@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVaria + GVariant *v; + const char *name; + ++#ifndef HAVE_SETNETGRENT ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Netgroups are not available on this machine"); ++ goto out; ++#else + v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); + if (v == NULL) + { +@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVaria + name = g_variant_get_string (v, NULL); + ret = polkit_unix_netgroup_new (name); + g_variant_unref (v); ++#endif + } + else + { +--- a/src/polkit/polkitunixnetgroup.c ++++ b/src/polkit/polkitunixnetgroup.c +@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUni + PolkitIdentity * + polkit_unix_netgroup_new (const gchar *name) + { ++#ifndef HAVE_SETNETGRENT ++ g_assert_not_reached(); ++#endif + g_return_val_if_fail (name != NULL, NULL); + return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, + "name", name, +--- a/src/polkitbackend/polkitbackendinteractiveauthority.c ++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c +@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity + GList *ret; + + ret = NULL; ++#ifdef HAVE_SETNETGRENT + name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); + +-#ifdef HAVE_SETNETGRENT_RETURN ++# ifdef HAVE_SETNETGRENT_RETURN + if (setnetgrent (name) == 0) + { + g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno)); + goto out; + } +-#else ++# else + setnetgrent (name); +-#endif ++# endif /* HAVE_SETNETGRENT_RETURN */ + + for (;;) + { +-#if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) ++# if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) + const char *hostname, *username, *domainname; +-#else ++# else + char *hostname, *username, *domainname; +-#endif ++# endif /* defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) */ + PolkitIdentity *user; + GError *error = NULL; + +@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity + + out: + endnetgrent (); ++#endif /* HAVE_SETNETGRENT */ + return ret; + } + +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext + + JS::CallArgs args = JS::CallArgsFromVp (argc, vp); + ++#ifdef HAVE_SETNETGRENT + JS::RootedString usrstr (authority->priv->cx); + usrstr = args[0].toString(); + user = JS_EncodeStringToUTF8 (cx, usrstr); +@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext + + JS_free (cx, netgroup); + JS_free (cx, user); ++#endif + + ret = true; + +--- a/test/polkit/polkitidentitytest.c ++++ b/test/polkit/polkitidentitytest.c +@@ -19,6 +19,7 @@ + * Author: Nikki VonHollen + */ + ++#include "config.h" + #include "glib.h" + #include + #include +@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_tes + {"unix-group:root", "unix-group:jane", FALSE}, + {"unix-group:jane", "unix-group:jane", TRUE}, + ++#ifdef HAVE_SETNETGRENT + {"unix-netgroup:foo", "unix-netgroup:foo", TRUE}, + {"unix-netgroup:foo", "unix-netgroup:bar", FALSE}, ++#endif + + {"unix-user:root", "unix-group:root", FALSE}, ++#ifdef HAVE_SETNETGRENT + {"unix-user:jane", "unix-netgroup:foo", FALSE}, ++#endif + + {NULL}, + }; +@@ -181,11 +186,13 @@ main (int argc, char *argv[]) + g_test_add_data_func ("/PolkitIdentity/group_string_2", "unix-group:jane", test_string); + g_test_add_data_func ("/PolkitIdentity/group_string_3", "unix-group:users", test_string); + ++#ifdef HAVE_SETNETGRENT + g_test_add_data_func ("/PolkitIdentity/netgroup_string", "unix-netgroup:foo", test_string); ++ g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); ++#endif + + g_test_add_data_func ("/PolkitIdentity/user_gvariant", "unix-user:root", test_gvariant); + g_test_add_data_func ("/PolkitIdentity/group_gvariant", "unix-group:root", test_gvariant); +- g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); + + add_comparison_tests (); + +--- a/test/polkit/polkitunixnetgrouptest.c ++++ b/test/polkit/polkitunixnetgrouptest.c +@@ -19,6 +19,7 @@ + * Author: Nikki VonHollen + */ + ++#include "config.h" + #include "glib.h" + #include + #include +@@ -69,7 +70,9 @@ int + main (int argc, char *argv[]) + { + g_test_init (&argc, &argv, NULL); ++#ifdef HAVE_SETNETGRENT + g_test_add_func ("/PolkitUnixNetgroup/new", test_new); + g_test_add_func ("/PolkitUnixNetgroup/set_name", test_set_name); ++#endif + return g_test_run (); + } +--- a/test/polkitbackend/test-polkitbackendjsauthority.c ++++ b/test/polkitbackend/test-polkitbackendjsauthority.c +@@ -137,12 +137,14 @@ test_get_admin_identities (void) + "unix-group:users" + } + }, ++#ifdef HAVE_SETNETGRENT + { + "net.company.action3", + { + "unix-netgroup:foo" + } + }, ++#endif + }; + guint n; + diff --git a/meta-oe/recipes-extended/polkit/polkit_0.115.bb b/meta-oe/recipes-extended/polkit/polkit_0.116.bb similarity index 88% rename from meta-oe/recipes-extended/polkit/polkit_0.115.bb rename to meta-oe/recipes-extended/polkit/polkit_0.116.bb index 562a754b21..8754383efa 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.115.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.116.bb @@ -23,12 +23,11 @@ PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ - file://0001-make-netgroup-support-configurable.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://0001-backend-Compare-PolkitUnixProcess-uids-for-temporary.patch \ + file://0003-make-netgroup-support-optional.patch \ " -SRC_URI[md5sum] = "f03b055d6ae5fc8eac76838c7d83d082" -SRC_URI[sha256sum] = "2f87ecdabfbd415c6306673ceadc59846f059b18ef2fce42bac63fe283f12131" +SRC_URI[md5sum] = "4b37258583393e83069a0e2e89c0162a" +SRC_URI[sha256sum] = "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1" EXTRA_OECONF = "--with-os-type=moblin \ --disable-man-pages \