From patchwork Tue Aug 6 10:30:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 170657 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5505908ile; Tue, 6 Aug 2019 03:31:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwIqEIXgMFDnKgltbAmFWa0vJ4NGzh/F1EVYr3eXbOx16/9eARrDG1SXtKjHPgZs9DvMBZx X-Received: by 2002:a17:90a:1b4c:: with SMTP id q70mr2404773pjq.69.1565087462269; Tue, 06 Aug 2019 03:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565087462; cv=none; d=google.com; s=arc-20160816; b=BKQvrlv2dY3KuAtdLLxYDbEOjgZX1tFVy7U3cv+PpWQpSUnve2oLdByOvze0BTuHZ9 mRMfwbjr60r2BIOnL5a36Lepa0suocEg0+HLARYeRcQxUoF+4KqTRVf+r7C0h8q+8xWt cC4U0U5nsa5WeeJ0RnXbntkxrptOThbO0VduBeGYB64CFBjMiqv9ZVnz6RlI5PM9c2Sw aFhEKG9ybLvCVFpg8ek+z1vKkmO+Fj/+e1SeMo41p2xpHpR5ZYe0qAAl3G4j0NTGu3zt bbxHwBrqaieKj6zMET3+eonGuNJ7cvr9oKsFbrFO3dt5yAxJI7m9wNX3lMArHFMzSn2k 9vAw== 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=vRUR40GOBpjHOHYCjOtsLllIq8saYQvPeGQEFKayEXk=; b=NASUrErjuLcCckI3kqjZulPHLfIRMyarBZ+EjadT17BT6/SBk1pK2glg4fm5vkwjH/ wHj1SCS7IQYYIYGeodvRiANaKXsPPTF5roGZakNYLlFiV9fibRa9Hi6XGJ3795A51emg 0a9RM2TVLGh2O4sU0+RJWBOyS0fx2Tr2ozHeFzKiQNLQNq/1cbdE/FkF7n5Jch9ubgjl yWnNuTWM35Y0R2u4iIqyrAEVBcJNUOHLZHCjS3CHK9L9r3olDIXrVqel52lujP1IeQ/D hlKTtY9u9bEmGFZAItFda6okeUk6fxE6+QuNMVC7gfhXh+P6tT3RRoypx5gg4zEzLR9O KIog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="0In/xP83"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v9si8990583plg.222.2019.08.06.03.31.01; Tue, 06 Aug 2019 03:31:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="0In/xP83"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.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 BEACA6C23A; Tue, 6 Aug 2019 10:30:57 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mail.openembedded.org (Postfix) with ESMTP id 67CAB6BF37 for ; Tue, 6 Aug 2019 10:30:56 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id r1so87319160wrl.7 for ; Tue, 06 Aug 2019 03:30:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/OQkVMY5CiRYwogWa18sW56siHGJeDQVqKwAPDTi3io=; b=0In/xP83SyR4SDOTo3AWezqSvpDOrXo2uGdtGn0t0anTnwrrDDmq4M13MWORQv3u2C jgcOAbX6RrqlrhVHTPrzU0zRVivFvgbxBGJ7LkP5ZxGk7e5B/dd8yhHxR9v1qhIq00BY rvYP5eYlcUayAit8gTDnmBgRNDZS3S7Rfqfj6Mdk0xuzmdKcG7BssB0eB+jwkKD1sNO1 C5jFU1aurQG5zzZ26X8S3C9oqswiqt1Xo5OZFJSkvycyMLDp0VMiIAeaD2BUd8Oygu2M tU/E9TLHD72RSGsfkpF885CYyS2y+WivWDdzCMPFGa3+IUv3R5MvrMgtJwEokQxiimGD hzow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/OQkVMY5CiRYwogWa18sW56siHGJeDQVqKwAPDTi3io=; b=Y/89gWEkusVRMZFiUJ925AF/j4RJW3NgwaAw8jigCeIN3e3PqK3XEfRVVwdPbNjTK3 l9Y00QlDDQcnQGGe6YKsw+Z+FpyLcJzp3nhrUMIGzAW9DpDSBbWN3wFkv9K7H4+GqEMi aPYRI/DOg76wC1gsCab7yKGHKOtjkhOQwJUmtBMrYaeq+OYFK18eDb+WmTWZUXwbcx6M oNb9XiIV4nUPyqkiNuREcuxKLuoaZPLCnyqZupeJ6Acs00BM/gUaCtAQQdF6KLT/c/4Y j4tSzzc/WlELcLw1m+HdhhablTT+tlCrd4XWgRmBl/ZqoN0wNHHypvnNZPXiGE4Ps2Mn MMpQ== X-Gm-Message-State: APjAAAWGLnQDMEqURtqWvRLpqK2cCm1+FmQ+ykVdqcazaSb/+E6aqCjD huIg2UFz4ZOwrecr193KNHB8oDMKb0M= X-Received: by 2002:adf:f005:: with SMTP id j5mr3750913wro.251.1565087456787; Tue, 06 Aug 2019 03:30:56 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id w23sm94845444wmi.45.2019.08.06.03.30.55 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 03:30:55 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 6 Aug 2019 11:30:51 +0100 Message-Id: <20190806103051.3333-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH] xserver-xorg: refresh build path removal patch X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The patch has iterated, so update to the latest revision. Signed-off-by: Ross Burton --- .../xserver-xorg/sdksyms-no-build-path.patch | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch index 54d128cb39e..be198ece49c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch @@ -1,18 +1,34 @@ -sdksyms.sh: don't embed the build path +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253] +Signed-off-by: Ross Burton + +From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Thu, 1 Aug 2019 15:24:51 +0100 +Subject: [PATCH] sdksyms.sh: don't embed the build path This script generates a header that has a comment containing the build path for no real reason. As this source can end up deployed on targets in debug packages this means there is both potentially sensitive information leakage about the build environment, and a source of change for reproducible builds. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253] -Signed-off-by: Ross Burton +--- + hw/xfree86/sdksyms.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh -index 39e33711d..cdb3794b9 100755 +index 39e33711d..bdf47a71a 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh -@@ -308,7 +308,6 @@ BEGIN { +@@ -302,13 +302,16 @@ LC_ALL=C + export LC_ALL + ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $? + ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir ' ++function basename(file) { ++ sub(".*/", "", file) ++ return file ++} + BEGIN { + sdk = 0; + print("/*"); print(" * These symbols are referenced to ensure they"); print(" * will be available in the X Server binary."); print(" */"); @@ -20,3 +36,15 @@ index 39e33711d..cdb3794b9 100755 print("_X_HIDDEN void *xorg_symbols[] = {"); printf("sdksyms.c:") > "sdksyms.dep"; +@@ -337,7 +340,7 @@ BEGIN { + # remove quotes + gsub(/"/, "", $3); + line = $2; +- header = $3; ++ header = basename($3); + if (! headers[$3]) { + printf(" \\\n %s", $3) >> "sdksyms.dep"; + headers[$3] = 1; +-- +2.20.1 +