From nobody Fri Dec 23 22:52:59 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nf2Wv2BMrz1LhSX; Fri, 23 Dec 2022 22:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nf2Wv1Yzkz48Sp; Fri, 23 Dec 2022 22:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671835979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjcfNwCHihx+b8/QoV47K/2N0aWEkZeBUqBaQ1xdH+A=; b=OyxzIGPXPbCVJ/HCUdH5hfa8LbSbx0MaBpzCp3SOsBv0YaxbtraCDc5S2O+HzoykubwK0g CToTXpL0VNdMHZEEA+SNERamblUPh5PIy3zqLu0tEHX7NgpYBAOY3ZOcmFSV2zrNSthVBA D/bDAuDCALb4xBJPZQ5bVJHuKNVmhU24RXxeA1vlU8k4R3/Sdy015Y9ZPYPo4goaru33pP LP1xoiYWxONJTaJxiWJRnxfQQYDx/EWR35B4uVoJU6ODggqMNmtqN2quJya+FNncrKKP2s YUOC3Gqpjx9AKI1toLEows1jpZ31+LeSedEzzv5n5pPmi0P1UkkFthbZ1aXlWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671835979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjcfNwCHihx+b8/QoV47K/2N0aWEkZeBUqBaQ1xdH+A=; b=r8JenYgaafmv0jU9KryiU+Xfok0fuVJ2ReY7ykIAmEq6IVJTOb40iyc4AmHmiCDnCPX3GS Kin6agmHmydKkV5Oyo3U4EzLzrcQTg3T1gfrMjM1kCAEqVHaf12pknGM/OqmtK1/Q2agPL m9mCjOgJzwTCDtFDC+5hW405zStQvMj74kBeeDV6YYYaqyIUH3mvs2zqfN+LBlA/6dc9oy hiaDpKB81MnS6CznfLiR2VIS/BQLLAvSSoCQEl2IMPLc6Y3eOK6JzT24s83pW0PonBtUqJ AOOA/xVJxNU34+WxRlvKaVFiYBtP8hcGPLoVtmam2FPNDyVSyp3fncizG85lOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671835979; a=rsa-sha256; cv=none; b=Kn7ILmG8OESQ48ZbxSZCNLcE2tNJmFfB2F1hJuNj5PLAoYBPD2PJzdYC1otm3YNdmGcy2S gEihW5ggKZL3uNViDug1oGtNCwOD/u3WyQgqOJ0fUjq+hnSSZtme0847FHCEMmrAn74XcV SheVGK7NJV9o9L7h8ar7mVJqGSh5Lg/revNz71A81elCQaPYIgpMuFhNwna3Rbxz/HH27m W9Pz7eWq1SKlAYrBaNUE7IpNvpGBZyAaTf+AiFvaUdubWDtH14EQRb+UYnHxahXA+yCI4b TIvBVWgChgrWOHTczZyMcQSLGAgkmdJTACieJKx2KEIuUlbMIs/usBMAEqUrXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nf2Wv0cj2zrWX; Fri, 23 Dec 2022 22:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BNMqxZC053447; Fri, 23 Dec 2022 22:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BNMqxID053446; Fri, 23 Dec 2022 22:52:59 GMT (envelope-from git) Date: Fri, 23 Dec 2022 22:52:59 GMT Message-Id: <202212232252.2BNMqxID053446@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 7aa0e0a09cfa - main - comms/iwmbt-firmware: Update to 20221109 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7aa0e0a09cfad876f9a5a1ff70e31c9614e88fb6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=7aa0e0a09cfad876f9a5a1ff70e31c9614e88fb6 commit 7aa0e0a09cfad876f9a5a1ff70e31c9614e88fb6 Author: Vladimir Kondratyev AuthorDate: 2022-12-23 22:52:03 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-12-23 22:52:03 +0000 comms/iwmbt-firmware: Update to 20221109 And downgrade ibt-hw-37.8.10-fw-22.50.19.14.f.bseq to fw_patch_num 36 as last version working good with our BT stack. See PR/267581. PR: 268022 Approved by: arrowd --- comms/iwmbt-firmware/Makefile | 20 +++++++++++++++----- comms/iwmbt-firmware/distinfo | 8 +++++--- comms/iwmbt-firmware/pkg-plist | 2 ++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/comms/iwmbt-firmware/Makefile b/comms/iwmbt-firmware/Makefile index 64d25fe8e960..05e91cc00ae1 100644 --- a/comms/iwmbt-firmware/Makefile +++ b/comms/iwmbt-firmware/Makefile @@ -1,10 +1,12 @@ PORTNAME= iwmbt-firmware -PORTVERSION= 20210315 -DEB_REVISION= 3 +PORTVERSION= 20221109 +DEB_REVISION= 2 CATEGORIES= comms -MASTER_SITES= DEBIAN/pool/non-free/f/firmware-nonfree/ -DISTNAME= firmware-iwlwifi_${PORTVERSION}-${DEB_REVISION}_all -EXTRACT_SUFX= .deb +MASTER_SITES= DEBIAN/pool/non-free/f/firmware-nonfree/:main \ + https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/intel/:old +DISTFILES= ${MAINFW_FILE}:main \ + ${OLDFW_FILE}${OLDFW_SUFX}:old +EXTRACT_ONLY= ${MAINFW_FILE} MAINTAINER= wulf@FreeBSD.org COMMENT= Intel Wireless 8260 bluetooth adaptor firmwares used by iwmbtfw(8) @@ -18,12 +20,20 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept NO_BUILD= yes NO_ARCH= yes +MAINFW_FILE= firmware-iwlwifi_${PORTVERSION}-${DEB_REVISION}_all.deb +OLDFW_FILE= ibt-hw-37.8.10-fw-22.50.19.14.f.bseq +OLDFW_SUFX= ?id=6be4747ea1d731f661c5320acf3f1273a459d6da + EXTRACT_CMD= ${AR} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= data.tar.xz | ${TAR} -xf - ${EXTRACT_FILES} EXTRACT_FILES= lib/firmware/intel \ usr/share/doc/firmware-iwlwifi/copyright +# PR/267581: Downgrade ibt-hw-37.8.10-fw-22.50.19.14.f.bseq to fw_patch_num 36 +post-extract: + ${CP} ${DISTDIR}/${OLDFW_FILE}${OLDFW_SUFX} ${WRKDIR}/lib/firmware/intel/${OLDFW_FILE} + do-install: cd ${WRKDIR}/lib/firmware/intel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} diff --git a/comms/iwmbt-firmware/distinfo b/comms/iwmbt-firmware/distinfo index a5024c09d165..f4a1130c9e01 100644 --- a/comms/iwmbt-firmware/distinfo +++ b/comms/iwmbt-firmware/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1630838383 -SHA256 (firmware-iwlwifi_20210315-3_all.deb) = b822a5a623037c20e85d865c8d55351b33c809b9157c35a9519aecb95fcdb568 -SIZE (firmware-iwlwifi_20210315-3_all.deb) = 13448168 +TIMESTAMP = 1669462817 +SHA256 (firmware-iwlwifi_20221109-2_all.deb) = 593f01beec59fd4de2f76a907a32798bac4f4658ff5b22624f4eb8528e8c2370 +SIZE (firmware-iwlwifi_20221109-2_all.deb) = 20085936 +SHA256 (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = d1d25082ee30e971454e512e6a07af9c093bb8086f3b56f6afcc22de8e63d59a +SIZE (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = 47463 diff --git a/comms/iwmbt-firmware/pkg-plist b/comms/iwmbt-firmware/pkg-plist index 684ec12e813b..18b7bf471cd4 100644 --- a/comms/iwmbt-firmware/pkg-plist +++ b/comms/iwmbt-firmware/pkg-plist @@ -1,3 +1,5 @@ +%%DATADIR%%/ibt-0040-0041.ddc +%%DATADIR%%/ibt-0040-0041.sfi %%DATADIR%%/ibt-0041-0041.ddc %%DATADIR%%/ibt-0041-0041.sfi %%DATADIR%%/ibt-11-5.ddc