git: a5d39f235dac - main - sysutils/cpupdate: minor update

From: Eugene Grosbein <eugen_at_FreeBSD.org>
Date: Mon, 14 Aug 2023 22:11:18 UTC
The branch main has been updated by eugen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a5d39f235dacf9abf694e3359417400fdc0e3cbd

commit a5d39f235dacf9abf694e3359417400fdc0e3cbd
Author:     Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-08-14 22:09:25 +0000
Commit:     Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2023-08-14 22:11:12 +0000

    sysutils/cpupdate: minor update
    
    Update for platomav/CPUMicrocodes r274.
    Update for Intel pack microcode-20230808.
    Fix microcode download, again. (*)
    
    Bump PORTREVISION.
    
    PR:     273035 (*)
---
 sysutils/cpupdate/Makefile             | 17 ++++++++---------
 sysutils/cpupdate/distinfo             | 10 +++++-----
 sysutils/cpupdate/files/cpupdate.in    |  4 ++--
 sysutils/cpupdate/files/pkg-message.in |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/sysutils/cpupdate/Makefile b/sysutils/cpupdate/Makefile
index 8a93ce68e515..d58df90216c1 100644
--- a/sysutils/cpupdate/Makefile
+++ b/sysutils/cpupdate/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cpupdate
 DISTVERSION=	g20180513
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	eugen@FreeBSD.org
@@ -30,27 +30,25 @@ SUB_LIST=	CPM_DIR="${CPM_DIR}" INTEL_DIR="${INTEL_DIR}" \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kernschmelze
-GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	48e42d5
 
 PLIST_FILES=	sbin/${PORTNAME} man/man8/${PORTNAME}.8.gz
 
-# MCE DB r268
+# MCE DB r274
 CPM_ACCOUNT=	platomav
 CPM_PROJECT=	CPUMicrocodes
-CPM_TAGNAME=	246a49d
+CPM_TAGNAME=	0a6abcd
 
 OPTIONS_DEFINE=		CPM INTEL
 CPM_DESC=		Download platomav/CPUMicrocodes collection
 CPM_GH_ACCOUNT=		${CPM_ACCOUNT}:cpm
 CPM_GH_PROJECT=		${CPM_PROJECT}:cpm
 CPM_GH_TAGNAME=		${CPM_TAGNAME}:cpm
-CPM_PACK=		${CPM_ACCOUNT}-${CPM_PROJECT}-${CPM_TAGNAME}_GH0
-CPM_MASTER_SITES=	https://codeload.github.com/platomav/${CPM_PROJECT}/tar.gz/${CPM_TAGNAME}?dummy=/${CPM_PACK}.tar.gz
+CPM_PACK?=		${CPM_ACCOUNT}-${CPM_PROJECT}-${CPM_TAGNAME}_GH0.tar.gz
 CPM_DIR=		${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME}
 CPM_DATADIR=		${DATADIR}/CPUMicrocodes/secondary/Intel
 
-INTEL_PACK=		microcode-20230613
+INTEL_PACK=		microcode-20230808
 INTEL_DESC=		Download Intel microcode pack ${INTEL_PACK}
 INTEL_PROJECT=		Intel-Linux-Processor-Microcode-Data-Files
 INTEL_MASTER_SITES=	https://codeload.github.com/intel/${INTEL_PROJECT}/tar.gz/:intel
@@ -58,8 +56,9 @@ INTEL_DISTFILES=	${INTEL_PACK}:intel
 INTEL_DIR=		${WRKDIR}/${INTEL_PROJECT}-${INTEL_PACK}/intel-ucode
 INTEL_DATADIR=		${DATADIR}/CPUMicrocodes/primary/Intel
 
-CPUPDATE_SITES?=	${CPM_MASTER_SITES}:cpm ${INTEL_MASTER_SITES}
-CPUPDATE_DISTFILES?=	${CPM_PACK}:cpm ${INTEL_PACK}:intel
+CPUPDATE_SITES?=	${INTEL_MASTER_SITES} \
+			https://codeload.github.com/platomav/${CPM_PROJECT}/tar.gz/${CPM_TAGNAME}?dummy=/:cpm
+CPUPDATE_DISTFILES?=	${INTEL_PACK}:intel ${CPM_PACK}:cpm
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/local/share/cpupdate,${DATADIR},g" ${WRKSRC}/cpupdate.h
diff --git a/sysutils/cpupdate/distinfo b/sysutils/cpupdate/distinfo
index 29fae8c8d2f9..1e2bacc0b143 100644
--- a/sysutils/cpupdate/distinfo
+++ b/sysutils/cpupdate/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1687165633
-SHA256 (microcode-20230613) = 894d822d2347222a2595d4fc47d358e01d35a54780123100c317dfc31b1b0cc9
-SIZE (microcode-20230613) = 12338446
+TIMESTAMP = 1691636867
+SHA256 (microcode-20230808) = fe49bb719441f20335ed6004090ab38cdc374134d36d4f5d30be7ed93b820313
+SIZE (microcode-20230808) = 13011561
 SHA256 (kernschmelze-cpupdate-g20180513-48e42d5_GH0.tar.gz) = d28582fe7edfb57da99fb2466417033ee619c32de9c6b5f1a5fae7d9be8253da
 SIZE (kernschmelze-cpupdate-g20180513-48e42d5_GH0.tar.gz) = 4566722
-SHA256 (platomav-CPUMicrocodes-246a49d_GH0.tar.gz) = 2f5d49aa504b5579395ce75cca6051877766fdf7843defb6441337ffa571b67a
-SIZE (platomav-CPUMicrocodes-246a49d_GH0.tar.gz) = 21633497
+SHA256 (platomav-CPUMicrocodes-0a6abcd_GH0.tar.gz) = 362dc160df2c3363d81224195bdb22c812c37771349fe4e6f77e2dca7736e459
+SIZE (platomav-CPUMicrocodes-0a6abcd_GH0.tar.gz) = 22285749
diff --git a/sysutils/cpupdate/files/cpupdate.in b/sysutils/cpupdate/files/cpupdate.in
index d9ce46c686f7..4a36f27f8e74 100644
--- a/sysutils/cpupdate/files/cpupdate.in
+++ b/sysutils/cpupdate/files/cpupdate.in
@@ -64,8 +64,8 @@ cpupdate_download() {
     *:cpm|*:intel)
       cpupdate_distfile _file ${_url##*:}
       _url=${_url%:*}${_file}
-      echo Downloading $_url
-      $cpupdate_fetch -o - $_url | tar -C $_tmpdir -xf - || exit
+      echo Downloading "$_url"
+      $cpupdate_fetch -o - "$_url" | tar -C $_tmpdir -xf - || exit
       ;;
     esac
   done
diff --git a/sysutils/cpupdate/files/pkg-message.in b/sysutils/cpupdate/files/pkg-message.in
index 5162d309f874..3bdf3c2aac12 100644
--- a/sysutils/cpupdate/files/pkg-message.in
+++ b/sysutils/cpupdate/files/pkg-message.in
@@ -11,7 +11,7 @@ if you have just built the port with corresponding CPM/INTEL option(s) enabled.
 In this case you can run "make install-microcodes" to install them to
 %%DATADIR%%
 
-If you installed the package then you may download microcodes with following command:
+If you installed the package then you can download microcodes with following command:
 service cpupdate download
 EOM
 }