svn commit: r470707 - in head/sysutils/cpuid: . files

[Fernando Apesteguía]

Author: fernape
Date: Wed May 23 16:10:05 2018
New Revision: 470707
URL: https://svnweb.freebsd.org/changeset/ports/470707

Log:
  Update sysutils/cpuid to 20180419
  
  PR:	227811
  Submitted by:	pkubaj at anongoth.pl (maintainer)
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D15515

Modified:
  head/sysutils/cpuid/Makefile
  head/sysutils/cpuid/distinfo
  head/sysutils/cpuid/files/patch-cpuid.c

Modified: head/sysutils/cpuid/Makefile
==============================================================================
--- head/sysutils/cpuid/Makefile	Wed May 23 15:39:56 2018	(r470706)
+++ head/sysutils/cpuid/Makefile	Wed May 23 16:10:05 2018	(r470707)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	cpuid
-PORTVERSION=	20170122
+DISTVERSION=	20180519
+DISTVERSIONSUFFIX=	.src
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.etallen.com/cpuid/
 PKGNAMESUFFIX=	${CPUID_SUFFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	pkubaj at anongoth.pl
 COMMENT=	Tool to dump x86 CPUID information about the CPU(s)
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS_REASON=	only works with x86 CPUs
 USES=		gmake perl5
 USE_PERL5=	build
 ALL_TARGET=	default
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 # Renamed to avoid conflict with misc/cpuid
 CPUID_SUFFIX=	-etallen

Modified: head/sysutils/cpuid/distinfo
==============================================================================
--- head/sysutils/cpuid/distinfo	Wed May 23 15:39:56 2018	(r470706)
+++ head/sysutils/cpuid/distinfo	Wed May 23 16:10:05 2018	(r470707)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500174826
-SHA256 (cpuid-20170122.src.tar.gz) = 667612aae6704341dd10844e97c84c5c5c8700817a5937a3c293b55013bc4865
-SIZE (cpuid-20170122.src.tar.gz) = 80046
+TIMESTAMP = 1526817399
+SHA256 (cpuid-20180519.src.tar.gz) = 967823be36f23cbc972eb0aa882d069c1d155a5978990ac3bcf425e6a2e7ff9a
+SIZE (cpuid-20180519.src.tar.gz) = 84784

Modified: head/sysutils/cpuid/files/patch-cpuid.c
==============================================================================
--- head/sysutils/cpuid/files/patch-cpuid.c	Wed May 23 15:39:56 2018	(r470706)
+++ head/sysutils/cpuid/files/patch-cpuid.c	Wed May 23 16:10:05 2018	(r470707)
@@ -1,15 +1,27 @@
---- cpuid.c.orig	2016-11-30 14:34:23 UTC
+--- cpuid.c.orig	2018-04-19 14:15:07 UTC
 +++ cpuid.c
-@@ -23,6 +23,8 @@
+@@ -21,17 +21,19 @@
+ #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
+ #define USE_CPUID_COUNT
+ #endif
+ 
 +#define CPUID_MAJOR 0
 +
  #define _GNU_SOURCE
  #include <stdio.h>
  #include <sys/types.h>
-@@ -34,6 +36,8 @@
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+@@ -39,6 +41,8 @@
  #include <string.h>
  #include <regex.h>
  #include <getopt.h>
@@ -18,7 +30,7 @@
  
  #ifdef USE_CPUID_MODULE
  #include <linux/major.h>
-@@ -58,6 +62,7 @@ typedef const char* const  ccstring;
+@@ -67,6 +71,7 @@ typedef const char* const  ccstring;
  #define XSTR(x)  STR(x)
  
  
@@ -26,7 +38,7 @@
  #define MAX(l,r)            ((l) > (r) ? (l) : (r))
  
  #define LENGTH(array, type) (sizeof(array) / sizeof(type))
-@@ -6471,11 +6476,16 @@ real_setup(unsigned int  cpu,
+@@ -6622,11 +6627,16 @@ real_setup(unsigned int  cpu,
           int  status;
           status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
  #else
@@ -45,9 +57,9 @@
  #endif
           if (status == -1) {
              if (cpu > 0) {
-@@ -6590,11 +6600,14 @@ static int real_get (int           cpuid
-           : "a" (reg), 
+@@ -6749,11 +6759,14 @@ static int real_get (int           cpuid
              "c" (ecx));
+ #endif
     } else {
 -      off64_t  result;
 -      off64_t  offset = ((off64_t)ecx << 32) + reg;
@@ -63,7 +75,7 @@
        if (result == -1) {
           if (quiet) {
              return FALSE;
-@@ -7138,7 +7151,7 @@ main(int     argc,
+@@ -7307,7 +7320,7 @@ main(int     argc,
     };
  
     boolean        opt_one_cpu     = FALSE;
@@ -72,7 +84,7 @@
     boolean        opt_kernel      = FALSE;
     boolean        opt_raw         = FALSE;
     boolean        opt_debug       = FALSE;
-@@ -7268,7 +7281,8 @@ main(int     argc,
+@@ -7437,7 +7450,8 @@ main(int     argc,
     }
  
     // Default to -i.  So use inst unless -k is specified.