git: 7f1127ec8e28 - main - sysutils/cpuid: update to 20211031

The branch main has been updated by pkubaj:

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

commit 7f1127ec8e2813093152ba64f36b01dd4f011950
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-11-01 17:43:22 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-11-01 17:43:22 +0000

    sysutils/cpuid: update to 20211031
---
 sysutils/cpuid/Makefile            |  2 +-
 sysutils/cpuid/distinfo            |  6 ++--
 sysutils/cpuid/files/patch-cpuid.c | 67 +++++++-------------------------------
 3 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/sysutils/cpuid/Makefile b/sysutils/cpuid/Makefile
index edb5680786da..c5de64406478 100644
--- a/sysutils/cpuid/Makefile
+++ b/sysutils/cpuid/Makefile
@@ -1,7 +1,7 @@
 # Created by: uffe@uffe.org
 
 PORTNAME=	cpuid
-DISTVERSION=	20201006
+DISTVERSION=	20211031
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.etallen.com/cpuid/
diff --git a/sysutils/cpuid/distinfo b/sysutils/cpuid/distinfo
index 2d9e507925d1..8a4b1a9daac1 100644
--- a/sysutils/cpuid/distinfo
+++ b/sysutils/cpuid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621374124
-SHA256 (cpuid-20201006.src.tar.gz) = 13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6
-SIZE (cpuid-20201006.src.tar.gz) = 118994
+TIMESTAMP = 1635787419
+SHA256 (cpuid-20211031.src.tar.gz) = 765d3336eb2e6f99765322e5f0f4e38c493c1c3c991e44c18ed73f9295585d8f
+SIZE (cpuid-20211031.src.tar.gz) = 124390
diff --git a/sysutils/cpuid/files/patch-cpuid.c b/sysutils/cpuid/files/patch-cpuid.c
index 5898fafa1ca9..9c048a24c81e 100644
--- a/sysutils/cpuid/files/patch-cpuid.c
+++ b/sysutils/cpuid/files/patch-cpuid.c
@@ -1,39 +1,15 @@
---- cpuid.c.orig	2020-01-22 16:55:23 UTC
+--- cpuid.c.orig	2021-11-01 17:25:27 UTC
 +++ cpuid.c
-@@ -33,12 +33,15 @@
- #ifdef __linux__
- #define USE_CPUID_MODULE
- #define USE_KERNEL_SCHED_SETAFFINITY
-+#include <sys/sysmacros.h>
- #endif
- 
- #if __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40300
+@@ -73,6 +73,8 @@
  #define USE_CPUID_COUNT
  #endif
  
-+#define CPUID_MAJOR 0
++#define CPUID_MAJOR 0
 +
  #if defined(__GNUC__)
  #define UNUSED __attribute((unused))
  #else
-@@ -49,7 +52,6 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -57,6 +59,8 @@
- #include <string.h>
- #include <regex.h>
- #include <getopt.h>
-+#include <pthread.h>
-+#include <pthread_np.h>
- 
- #if defined(__sun)
- #include <sys/processor.h>
-@@ -8123,12 +8127,17 @@ real_setup(unsigned int  cpu,
+@@ -9485,12 +9487,17 @@ real_setup(unsigned int  cpu,
           pthread_t thread = pthread_self();
           int status = processor_bind(P_LWPID, thread, cpu, NULL);
  #else
@@ -44,8 +20,8 @@
           int  status;
 -         status = sched_setaffinity(0, sizeof(cpu_set_t), &cpuset);
 +#if defined(__FreeBSD__)
-+	  status = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
-+	    -1, sizeof(cpuset_t), &cpuset);
++         status = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
++           -1, sizeof(cpuset_t), &cpuset);
 +#else
 +         status = sched_setaffinity(0, sizeof(cpuset_t), &cpuset);
  #endif
@@ -53,40 +29,21 @@
           if (status == -1) {
              if (cpu > 0) {
                 if (errno == EINVAL) return -1;
-@@ -8250,11 +8259,14 @@ static int real_get (int           cpuid_fd,
+@@ -9613,11 +9620,14 @@ static int real_get (int           cpuid_fd,
              "c" (ecx));
  #endif
     } else {
 -      off64_t  result;
 -      off64_t  offset = ((off64_t)ecx << 32) + reg;
-+      //off64_t  result;
-+      //off64_t  offset = ((uint64_t)ecx << 32) + reg;
-+      uint64_t  result;
-+      uint64_t  offset = ((uint64_t)ecx << 32) + reg;
++//    off64_t  result;
++//    off64_t  offset = ((off64_t)ecx << 32) + reg;
++      int32_t  result;
++      int32_t  offset = (int32_t)ecx + reg;
        int      status;
  
 -      result = lseek64(cpuid_fd, offset, SEEK_SET);
-+      //result = lseek64(cpuid_fd, offset, SEEK_SET);
++//    result = lseek64(cpuid_fd, offset, SEEK_SET);
 +      result = lseek(cpuid_fd, offset, SEEK_SET);
        if (result == -1) {
           if (quiet) {
              return FALSE;
-@@ -8819,7 +8831,7 @@ main(int     argc,
-    };
- 
-    boolean        opt_one_cpu     = FALSE;
--   boolean        opt_inst        = FALSE;
-+   boolean        opt_inst        = TRUE;
-    boolean        opt_kernel      = FALSE;
-    boolean        opt_raw         = FALSE;
-    boolean        opt_debug       = FALSE;
-@@ -8950,7 +8962,8 @@ main(int     argc,
-    }
- 
-    // Default to -i.  So use inst unless -k is specified.
--   boolean  inst = !opt_kernel;
-+   //boolean  inst = !opt_kernel;
-+   boolean  inst = TRUE;
- 
-    if (opt_version) {
-       printf("cpuid version %s\n", XSTR(VERSION));