From nobody Sun Apr 28 22:55:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=comstyle.com ARC-Seal: i=1; a=rsa-sha256; t=1641349781; cv=none; d=zohomail.com; s=zohoarc; b=L4O0e0+EUNxlLdKHOCq4phL2h6ZyTT1E9lCHXWrEN1ikvY8p5K85rrrmuLywpm2/Atlez6rK6l9NDy/LHGxdgYNXXuC002HA2Xm3U5c22hobO8Pf1mWPIerqCt20j7u3TgKzeAE7DlXFZZWEZW5GSk3SBWnvPbHlpyJv7ESq3vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641349781; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=t9lxEJlXgZVt4ICsb5aA42dwKpCwG6OMrfZsJOVHBGw=; b=Jlrdx6UJAEKhhTUmTklBI5bfOrSc8M5O79/uTYStSfx+Un9GjiBfkuvqyY8c5qurt4SvjlL/i9hUD06IxyeEAFPPRl3cSjjasMNi5uhXY/kripJysSOOKCp4d9KW4LPOS+y5mfT4kvBpDJk/HzsZ+IpBo2QuR8xwzlxN5nEk/vs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16413497809561012.166648494479; Tue, 4 Jan 2022 18:29:40 -0800 (PST) Received: from localhost ([::1]:49866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4w3Y-0000ja-1E for importer@patchew.org; Tue, 04 Jan 2022 21:29:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4w2P-0008Sd-NQ for qemu-devel@nongnu.org; Tue, 04 Jan 2022 21:28:30 -0500 Received: from [2607:f938:3000:8::2] (port=14261 helo=mail.comstyle.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1n4w2N-0006Bh-AG for qemu-devel@nongnu.org; Tue, 04 Jan 2022 21:28:29 -0500 Received: from mail.comstyle.com (localhost [127.0.0.1]) by mail.comstyle.com (Postfix) with ESMTP id 4JTD1F6Mj1z8PbN; Tue, 4 Jan 2022 21:28:17 -0500 (EST) Received: from humpty.home.comstyle.com (bras-base-toroon2719w-grc-53-142-114-5-252.dsl.bell.ca [142.114.5.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: brad) by mail.comstyle.com (Postfix) with ESMTPSA id 4JTD1F5XG2z8PbK; Tue, 4 Jan 2022 21:28:17 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=comstyle.com; h=date:from :to:subject:message-id:mime-version:content-type; s=default; bh= E/dFGlcBK4Vjz9RGJZckVo2lZJA=; b=dJK/gQMnfcPcDMX2SI54EuoRFhvt8Us3 dUvavhkzv7Jv3JhmxAp81xXkTRHnnxg4zuboWrteO8lYvFvq0c+wZ3U7jyqo5qyU SwS5e5LqS9UeR8peMY7Kd3ShmL5XtqesQc9bAgEdoC3PqAhRZxAOrVJAg3LNBIU4 GLCZiWTdWUE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=comstyle.com; h=date:from:to :subject:message-id:mime-version:content-type; q=dns; s=default; b= OAxSlnPvvqycieqPs9gbC0iI6kOfEtY9oIALpRIGKAtaMbxaJ2zbORIb5+oWeCTy eWdG+8X/RalYLcr932MpNh1MvR6uUJjR8vW8Gp+xSXeMT2imyrkX1IPpjuGlUvU9 Q0r5dZhYyMEJjg7VlGQwEGkDgBzOky4PrQ9ckH8NEd8= Date: Tue, 4 Jan 2022 21:28:16 -0500 From: Brad Smith To: qemu-devel@nongnu.org, Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Alex Benn_e , Philippe Mathieu-Daud_ Subject: [PATCH v2] FreeBSD: Upgrade to 12.3 release Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f938:3000:8::2 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f938:3000:8::2; envelope-from=brad@comstyle.com; helo=mail.comstyle.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @comstyle.com) X-ZM-MESSAGEID: 1641349784182100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" FreeBSD: Upgrade to 12.3 release Note, since libtasn1 was fixed in 12.3 [*], this commit re-enables GnuTLS. [*] https://gitlab.com/gnutls/libtasn1/-/merge_requests/71 Signed-off-by: Brad Smith Tested-by: Thomas Huth Reviewed-by: Warner Losh Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/cirrus.yml | 5 +---- tests/vm/freebsd | 8 +++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index d273a9e713..18ded37c77 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -52,14 +52,11 @@ x64-freebsd-12-build: NAME: freebsd-12 CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + CIRRUS_VM_IMAGE_NAME: freebsd-12-3 CIRRUS_VM_CPUS: 8 CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update INSTALL_COMMAND: pkg install -y - # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed - # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71 - CONFIGURE_ARGS: --disable-gnutls TEST_TARGETS: check =20 x64-freebsd-13-build: diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 6e20e84322..805db759d6 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM): name =3D "freebsd" arch =3D "x86_64" =20 - link =3D "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.2/Fr= eeBSD-12.2-RELEASE-amd64-disc1.iso.xz" - csum =3D "a4530246cafbf1dd42a9bd3ea441ca9a78a6a0cd070278cbdf63f3a6f803= ecae" + link =3D "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.3/Fr= eeBSD-12.3-RELEASE-amd64-disc1.iso.xz" + csum =3D "36dd0de50f1fe5f0a88e181e94657656de26fb64254412f74e80e128e8b9= 38b4" size =3D "20G" pkgs =3D [ # build tools @@ -65,8 +65,6 @@ class FreeBSDVM(basevm.BaseVM): "zstd", ] =20 - # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed - # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71 BUILD_SCRIPT =3D """ set -e; rm -rf /home/qemu/qemu-test.* @@ -74,7 +72,7 @@ class FreeBSDVM(basevm.BaseVM): mkdir src build; cd src; tar -xf /dev/vtbd1; cd ../build - ../src/configure --python=3Dpython3.7 --disable-gnutls {configure_= opts}; + ../src/configure --python=3Dpython3.7 {configure_opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ =20 --=20 2.34.1