From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 29 Jun 2022 22:31:34 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o6eLT-001Mod-Hm for lore@lore.pengutronix.de; Wed, 29 Jun 2022 22:31:34 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1o6eLW-0005Uc-6P; Wed, 29 Jun 2022 22:31:34 +0200 Received: from mail-db8eur05on2059.outbound.protection.outlook.com ([40.107.20.59] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o6eKU-00056s-SJ for ptxdist@pengutronix.de; Wed, 29 Jun 2022 22:30:31 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cHP4QeAsNrVPxhjFnh7Rjv1S+iAVG5YY7DQv5V6YsHk1GA6SWpnyWf9wU+/C1W2dTLdw1EJ2aN7Akl9JExZjgemhEmse44LQhEbFq6GsgwbBFtdgT+7cvGceaXpnVxI+Lb2UepKS0gcU2VdMv2K7hBeDXMMYV3+yi7KSEK4OJC+mkw5CaBDn5aS2cRDR2pnKTCeuDyhpnKAZvPDiT0OE0YLiLws9XvpR6r6egRiu8BMvhhpBx+1rr8gsI0LfLmvsVJochWcwg9CzSFhjSoLmuIHy0409G57gTbnlQ0tSLwQ1+YcOYPZFXp323C0EzpN9APvQHM3U3CKIvonowAPRgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bvvg6sjWS6zGCPXkNQ4V+sDNTay3oRhLet4uef4JQBM=; b=KMs8ARZL+N59ga+G8FNOMNvoNomtwwM03FRfa2UJKsHbt38t/QYFHUHu+YeAGRXNGhDjcRLG8OSJU026XP/DCfRDFjpo3zG3k6cAj5s7GI4WbCLc+pS0o0jr1oULmOggsJlm4YckfgD1B/7lWXLVy/cyA2Ca8Y8pfCoBq6sjw6xqAe6XjQJojGbXSz9evV9T3pbEUmGtA8QFSZ4o6kdV36X1W9y81aPn64n6QHmZfHRthNcdh47zOV2ZeaK8DS7hhlcrMbXin/Pl1x34bCrqeDlNO8EBcWakrNTcR6+XpFlahe0RgiQlqQMtcQlJz8f6tH9KNf66L6tJZhOmW+e2hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bvvg6sjWS6zGCPXkNQ4V+sDNTay3oRhLet4uef4JQBM=; b=jNjkswTusnDryiB297EhdjTiGlD9lTcK/kRT7qByZ4rD1m2ZDzTCva1wMOyWXcxvqhlQMU+LDRSWzYVwK6QKwIE99XbNhgKUcTJiJzAEWIRn4lud9fEeEDetG+uWGXK5OXHw1laNktG+JkOWmvcjc/hbtsOUlewWYG81dTAVJuM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by DU0P251MB0756.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:3a4::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Wed, 29 Jun 2022 20:30:26 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d466:3692:3061:4707]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d466:3692:3061:4707%5]) with mapi id 15.20.5395.014; Wed, 29 Jun 2022 20:30:26 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Wed, 29 Jun 2022 22:30:11 +0200 Message-Id: <20220629203012.2126598-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: OS6P279CA0046.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:31::20) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bc4a7d5-9a28-4119-119d-08da5a0e337d X-MS-TrafficTypeDiagnostic: DU0P251MB0756:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NTO4GeWP/J1KSx1z2hKm6T7/CSCo9fg/QojABp8412kNMiWUp5gySSXvwZYk6mrSUjaSZ22iqNtbtbh2mW3F3BfUxLzIMy3SFQIsVAlyIYuGJYcTKCQhHgBXKmUAePEFJZvPcOV4WQ4tom2mMqOQGBdVU7XysZX69Ywn5Yi85OnKqgzelZTbdemFf0pXmAVtn69r142dDgn8z0lD+H9xNHKXqpgI6lBf4qQPrjIEM0KKNQnChkgVLPfQxPtn5VKcYf5S9DdQsnC/BkIhh5xdBKDV7uU48I6djgtbB/GBAAVuwyzQizIrahMK664IjH9d+1JcJMmkrd5wrHpYtdqrBneSx8hQQzRDEJ4FOFmzIPRwpa5HdOSCJDdIluzyoGNl/fkeTE8llrheUitOsBOMWKqM16wkdVsyglrMlpZEA5h8U/bwM2XUCxR+uTmy4knhcsoi0BaDgXe1ZtopT8DTO/dOJSzQFQyIQNorx9p1R9Vu7rXu99f7O8fBmsXf4K6RsbSYQvEzzN2aZ3y5sRxpgD1WSHyYmi5zNehSuNBJ3RkbvpW5e97oikWN2Qw3odF2pAyu0kmvOoIilFaFSOfMZpRxYNfH5glwpHRYXKLcbk7vO6thUesyTSH4shwBZHcFyej4ppuuhnaZAADnM/Yok8vjZavtXDnurtITSQT55BtF3G/T4qsTZ/4SqBJrKD7xfdcN8k6NrsenzZ0XxxgmlSR5Kz59s2adsQYVYLWvO4aOVUNvQcmThxFhmwVecxADyqgGmXqx5bWBn63488riNI0zQY51PLN/OHHt97TIebzIkxg2+FS1TifT2OktnM7i X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230016)(39830400003)(396003)(346002)(376002)(136003)(366004)(52116002)(6666004)(6512007)(8676002)(966005)(36756003)(66476007)(86362001)(38350700002)(26005)(44832011)(83380400001)(6506007)(478600001)(8936002)(6486002)(66556008)(5660300002)(66946007)(6916009)(186003)(316002)(41300700001)(2906002)(1076003)(38100700002)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NhVUYIvTQ+LZFKqgQ53FX9Bgps0GJvcDTMoWIC0FBA3jEp4tPqIJUr5i4BH4?= =?us-ascii?Q?0AQUdgNV2D5qr05Ggxd4F/A6nV4lZwtRl3HdW5nEpUA+3svBa1GKbsJf1FCv?= =?us-ascii?Q?exBkx6LLV1r9SwaY7ts0bin4nLdxtMILOmJaXWJm39jlAU+pTXdXrVnL2u5L?= =?us-ascii?Q?scipM9D+UmeX2qcsiHeUdYy7E5vhliGozIkr3KS7AFzB4QeVtoDCP7otOA00?= =?us-ascii?Q?QgRw5Qgf0hGLyVM1eIXt3yRg1RejIuN3siHKPMBE5JdpO4WjrW863A56mQaD?= =?us-ascii?Q?DS43yD9OZl7uDxZV7P01+xPeQue56kVSiS9DffdtoFJ3ye3gmE8/0hCT9yf7?= =?us-ascii?Q?0D/VeUHq7hSZ8V8fKPwod8S2/+X9uGeuolmKqsuiTB8k1lUxMuHW4S0GWRhs?= =?us-ascii?Q?C0ChoZEJmLg5hzHrHwag2owSNcQA3AtUWjrdurHlaAPsW0uKGsSrZbMAffl1?= =?us-ascii?Q?2baGKqdwKfNH0mfNvNt7EAR9G1hDGRUd3qr1LtG2r68ndRoEYfZC7dLaEoFV?= =?us-ascii?Q?pNxI/ysG0AQNUeHvQfkiMMyoQsnBfmQOOXGWCDolu7JFJZ/crVdB2YYM3jBi?= =?us-ascii?Q?WdjJyA6Tna2c9jyPW6pIf9dAtZH5FJcLX4uKR+ayljH+fZU2wv6V2WJUl9lY?= =?us-ascii?Q?zxV+jPLPsuYrq9pzQin9eDlAWHaKSiStVvks07VY8iXFGap6MOG14vqeSPRM?= =?us-ascii?Q?Qfpm3lQVIauVzG9HKWaO5WwhPoOwZhMQHxsZ9AFuUBqqY1l2dREgWb9ao0tF?= =?us-ascii?Q?Oz1Ii43l5IOVVFcmy3K/rYTR1UiF2xOQZlssJT8RwZrecS3P3s+ZhQAOB3wH?= =?us-ascii?Q?qWX+ee0qVnRFqPKn/vW0O9U5KCe4x++iSWNce9oOUGHy4H55DCKRtj3AvUe5?= =?us-ascii?Q?AWNFQI67NWfpCAoxRxh7YPs0q2sUbqKYXGsxf5enz7JVfO8x4Cs4fyrlAYM5?= =?us-ascii?Q?ppK8C6D2v38h/fOF9FXJOqXDbyPwWdiE6X65J/MkEjPCQ+0OzYkO10MFraq5?= =?us-ascii?Q?4oBgEEhjGSZKaTBiK9r3jcBh/wswW+fPLvT4RNDdeKSu5FL0bWvdPzxQG0hA?= =?us-ascii?Q?xVSI9KDiuI/ISzhkL60i4n0rH5WQsKfchckPkQtuN1QG7nXYW2+7LG12kd6S?= =?us-ascii?Q?Xms+EPXntkOymVIyeZhB5VXU1dgc9Kp447lTUFwAdwWrlUj2iHgSwCqn0aS9?= =?us-ascii?Q?YYEP4hJKdahL7ZVk32TuNnX/DPjjZtrBmAI43gAo2XV80Y7NS4Ua9k0ypvTb?= =?us-ascii?Q?3nFflytw/FGL6SNVx80z0dBgFNq+a0l4/zi/2FjcsaEwbYaimgzAHNn9wl6Z?= =?us-ascii?Q?xXupkjyWgyLI/mAgT9uMW0LJzl+cfdHV8Bmvi410iozkd0Mhmrk+YHfNgAVz?= =?us-ascii?Q?anDKW05Vr2qYVWfgoX86Sj2+0AewOrnonHIGUJ4b8NpRQ82vDFUiO2htaNCY?= =?us-ascii?Q?q/S8hKMS8mvFr1ihfJVH2KyrxEalppmgYIpwRLG5EyzqT/Vv7stUtmPE2Aa8?= =?us-ascii?Q?/0xw4j9Mn6uuEggfdsmu/YU5hegjvLT6T7SOkDjnRH+rMKXe/oZNtCKeuwK4?= =?us-ascii?Q?8Fw6U0XcV5OlwUf3OPo9cuAbdsRKUmooxZY6VIiUDYLf7bSmRl/zGfyygd6P?= =?us-ascii?Q?Xw=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bc4a7d5-9a28-4119-119d-08da5a0e337d X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2022 20:30:26.7798 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j5kB+yXp65xqMB2DhoSn2zwGYCcj6mCFU3nxQCd9xg3tssztSjp6KGB1nio36LA4IUpTPXShFnv/5EjPFT1GgyaIS/fGet5I/YzhCJKiBwI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P251MB0756 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 1/2] qemu: Version bump. 6.2.0 -> 7.0.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false A new major release of qemu. https://wiki.qemu.org/ChangeLog/7.0 Plugs CVEs: CVE-2021-20295, CVE-2022-1050, CVE-2022-26353, CVE-2022-26354 and CVE-2022-0358. * Remove deleted configure options libxml2, xfsctl. * Disable block replication. Wouldn't build, investigation ongoing. * Forward ptxdist patches to this version. * Delete old patch set. Signed-off-by: Christian Melki --- ...low-real-symlinks-for-security_model-mapped-f.patch | 10 +++++----- .../0002-let-ninja-use-the-jobserver.patch | 4 ++-- patches/{qemu-6.2.0 => qemu-7.0.0}/series | 0 rules/qemu.make | 8 +++----- 4 files changed, 10 insertions(+), 12 deletions(-) rename patches/{qemu-6.2.0 => qemu-7.0.0}/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (91%) rename patches/{qemu-6.2.0 => qemu-7.0.0}/0002-let-ninja-use-the-jobserver.patch (88%) rename patches/{qemu-6.2.0 => qemu-7.0.0}/series (100%) diff --git a/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-7.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch similarity index 91% rename from patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch rename to patches/qemu-7.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch index 27fea6364..6299ba1f6 100644 --- a/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch +++ b/patches/qemu-7.0.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c -index 210d9e7705df..92ecfec34b1c 100644 +index d42ce6d8b822..559573008eec 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c -@@ -460,8 +460,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, +@@ -462,8 +462,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, { ssize_t tsize = -1; @@ -24,7 +24,7 @@ index 210d9e7705df..92ecfec34b1c 100644 int fd; fd = local_open_nofollow(fs_ctx, fs_path->data, O_RDONLY, 0); -@@ -473,6 +472,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, +@@ -475,6 +474,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, } while (tsize == -1 && errno == EINTR); close_preserve_errno(fd); } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) || @@ -32,7 +32,7 @@ index 210d9e7705df..92ecfec34b1c 100644 (fs_ctx->export_flags & V9FS_SM_NONE)) { char *dirpath = g_path_get_dirname(fs_path->data); char *name = g_path_get_basename(fs_path->data); -@@ -484,6 +484,17 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, +@@ -486,6 +486,17 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath *fs_path, } tsize = readlinkat(dirfd, name, buf, bufsz); @@ -50,7 +50,7 @@ index 210d9e7705df..92ecfec34b1c 100644 close_preserve_errno(dirfd); out: g_free(name); -@@ -886,20 +897,23 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, +@@ -901,20 +912,23 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath, int fd; ssize_t oldpath_size, write_size; diff --git a/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-7.0.0/0002-let-ninja-use-the-jobserver.patch similarity index 88% rename from patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch rename to patches/qemu-7.0.0/0002-let-ninja-use-the-jobserver.patch index 5df864c39..14559418f 100644 --- a/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch +++ b/patches/qemu-7.0.0/0002-let-ninja-use-the-jobserver.patch @@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 74c5b46d38b5..4b3e390e8947 100644 +index e5fd1ebdf619..23128172d02a 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS)))) @@ -22,4 +22,4 @@ index 74c5b46d38b5..4b3e390e8947 100644 + $(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS)))) \ ninja-cmd-goals = $(or $(MAKECMDGOALS), all) - ninja-cmd-goals += $(foreach t, $(.tests), $(.test.deps.$t)) + ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps)) diff --git a/patches/qemu-6.2.0/series b/patches/qemu-7.0.0/series similarity index 100% rename from patches/qemu-6.2.0/series rename to patches/qemu-7.0.0/series diff --git a/rules/qemu.make b/rules/qemu.make index fad87903f..6e8445124 100644 --- a/rules/qemu.make +++ b/rules/qemu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu # # Paths and names # -QEMU_VERSION := 6.2.0 -QEMU_MD5 := a077669ce58b6ee07ec355e54aad25be +QEMU_VERSION := 7.0.0 +QEMU_MD5 := bfb5b09a0d1f887c8c42a6d5f26971ab QEMU := qemu-$(QEMU_VERSION) QEMU_SUFFIX := tar.xz QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) @@ -101,7 +101,6 @@ QEMU_CONF_OPT := \ --disable-libpmem \ --disable-libudev \ --$(call ptx/endis, PTXCONF_QEMU_SYS)-libusb \ - --disable-libxml2 \ --disable-linux-aio \ --disable-linux-io-uring \ --disable-lzfse \ @@ -169,9 +168,8 @@ QEMU_CONF_OPT := \ --disable-tpm \ --disable-libssh \ --disable-numa \ - --enable-replication \ + --disable-replication \ --disable-opengl \ - --disable-xfsctl \ --disable-qom-cast-debug \ --$(call ptx/endis, PTXCONF_QEMU_TOOLS)-tools \ --disable-bochs \ -- 2.34.1