From patchwork Sat Aug 29 20:14:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1353759 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=YM5K7Lwe; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bf76B4kWjz9sT6 for ; Sun, 30 Aug 2020 06:16:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=fi10ESKsloXbYHkmdncFHN2EFo6DNH1DYgjUpU5tu8M=; b=YM5K7LweOXARN171gwMQq2RKCm gMLGsdi0SCT66NdmeBZVYTbGLYL/nbFFPKmObRSDNdmqMGBcU+pPSpSeW4+Ej2nO/IULGFVBuH8kI S5MuHpfQKs61OBAeYgSrn+FPfPNLk2CKZz+CsGIEf0UdgvRJnrEEomsfqwBwHsxraRki4dKNpB6P/ xkpb1ejKvYv6sVRyT102e3CnSM2tlucXdTnAXoQoBoz61QohD03RhAu+j6qlOi++AtIjt5GjLhEzj fA3MnLNayUgZ+if2RMRHHp57CjgFzhhHEeZBGoHdCUv8Ppcu5RPzwbkm+i0+5rdE2ZqzIffZFS2tg DThs0tNA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kC7FN-00046l-8E; Sat, 29 Aug 2020 20:14:45 +0000 Received: from mout-p-103.mailbox.org ([2001:67c:2050::465:103]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kC7FJ-00046Q-Vh for openwrt-devel@lists.openwrt.org; Sat, 29 Aug 2020 20:14:43 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Bf73g5dZSzKmdD; Sat, 29 Aug 2020 22:14:39 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id DV3K7X0nXOPZ; Sat, 29 Aug 2020 22:14:36 +0200 (CEST) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Subject: [PATCH] strace: Update to version 5.8 Date: Sat, 29 Aug 2020 22:14:29 +0200 Message-Id: <20200829201429.11582-1-hauke@hauke-m.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -6.67 / 15.00 / 15.00 X-Rspamd-Queue-Id: 971091761 X-Rspamd-UID: 0aefe9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200829_161442_167501_BE82B11F X-CRM114-Status: GOOD ( 19.11 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:67c:2050:0:0:0:465:103 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The added patch fixes a build problem in the x86/64 target. Signed-off-by: Hauke Mehrtens --- package/devel/strace/Makefile | 4 +-- ...10-v4l2-Fix-compile-of-mpers-m32-API.patch | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 package/devel/strace/patches/010-v4l2-Fix-compile-of-mpers-m32-API.patch diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index cdf4067ad2b2..f38501e2bb52 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace -PKG_VERSION:=5.5 +PKG_VERSION:=5.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) -PKG_HASH:=9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff +PKG_HASH:=df4a669f7fff9cc302784085bd4b72fab216a426a3f72c892b28a537b71e7aa9 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=LGPL-2.1-or-later diff --git a/package/devel/strace/patches/010-v4l2-Fix-compile-of-mpers-m32-API.patch b/package/devel/strace/patches/010-v4l2-Fix-compile-of-mpers-m32-API.patch new file mode 100644 index 000000000000..46fd7ee30615 --- /dev/null +++ b/package/devel/strace/patches/010-v4l2-Fix-compile-of-mpers-m32-API.patch @@ -0,0 +1,31 @@ +From 313f7aee507b5f81e310a1b911a2f1da8d8cc283 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sat, 29 Aug 2020 21:35:48 +0200 +Subject: [PATCH] v4l2: Fix compile of mpers-m32 API + +In the mpers-m32 API the value64 member of the struct_v4l2_ext_control +structure is of type int32_t. This causes the following compile error: +v4l2.c: In function 'print_v4l2_ext_control': +v4l2.c:915:11: error: format '%ld' expects argument of type 'long int', but argument 3 has type 'int32_t' {aka 'const int'} [-Werror=format=] + tprintf(", value=%d, value64=%" PRId64, p->value, p->value64); + ^~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~ + +Fix this by adding the explicit cast again which was removed in strace +version 5.6. + +Fixes: 7e7669ec899e ("v4l2: always decode VIDIOC_*_EXT_CTRLS ioctl commands") +--- + v4l2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/v4l2.c ++++ b/v4l2.c +@@ -912,7 +912,7 @@ print_v4l2_ext_control(struct tcb *tcp, + tprints(", string="); + printstrn(tcp, ptr_to_kulong(p->string), p->size); + } else { +- tprintf(", value=%d, value64=%" PRId64, p->value, p->value64); ++ tprintf(", value=%d, value64=%" PRId64, p->value, (int64_t) p->value64); + } + tprints("}"); +