From nobody Thu Dec 29 00:41:31 2022 X-Original-To: dev-commits-ports-all@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 4Nj8hq5WFDz2kgpQ; Thu, 29 Dec 2022 00:41:31 +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 4Nj8hq4pLRz3pFM; Thu, 29 Dec 2022 00:41:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672274491; 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=Fo9UNxwP3+jc0bBk/yoorbDB6vU7mM/KCwXllP7yngM=; b=QWa3CyUbwsvh1bz+/5aK/J9FKkTntm4GK+njWh7Ew6ocM5YmBAOvmE5AvMyJENaAvws+48 mqhjsMqtERzabIwWxb4mg0THBn9HCycuUqIa3s1oELS5VFDhl4+aXexT4UnKjZ+FSoZPW2 /ZGEe6iCKg5QXeYJkc5lCDw1ppRpd9QRcAa/LxAF47yyF1i0RNg2XIdl7ddZqmmYWgoyau NIW2E9bB+I80AlGrwevzyTXuuuTUGdJZd5ZSPsDdeETYvigYLuJCU82GkfyXa7r6YqEsE5 74zmRmW4X+iVHE1OPk+2WLz7L6+4u9UjiC6sQOnQN0uI29cp5o2Sz5ZjMRVMZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672274491; 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=Fo9UNxwP3+jc0bBk/yoorbDB6vU7mM/KCwXllP7yngM=; b=fvO2ZAkHZGorlqrgitGpCltAsUhoBflGUKbOlsUs2QjhN4Yq6mXjH5XMna1J17M9wL58xR REq4NFA85D1dpLxkm4/79VGy0z3I4Slf77QZyv1E+Xneem82ivbqwGOe8OqXpfDmq4GW+H 5FaDfV4AdHqgVlyOvDEEUnP/6U6xdiMEp4kwkqN0u9GRvPUDfMPIH/080S72+T/r5e2kjY u5aYAARJh9CFAjoDaXONKe7mr6jCWyzTBJqv+WkP898yMRnDh4q73HcmL4u/KD6f3fLTHB /HWguCbFYBa2XC7nMPbnH2EHkl/ohGsOJu3hQQWYBgn6r9K8OHG2B4B/OM1X1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672274491; a=rsa-sha256; cv=none; b=lmZv65ohlmFhskVNGkHX4wpUDQxjJZQUPIvHqIXBD8Z8OUKW1rzjObWt7eu8O1ky9n9ObX rA8qFQZgrMICmiwqM4et9yWB+wygmPOl+HOlOXUB3gCcRYHz+T4zDrbIOLVGpcaPLh5pV1 fSXhcALhKtW1cYUtEvj8sLl9UEGjz/QevHhxruxnuUey/kUF8BomQjwrtxPu2kMfZTVD6G I5gXPcwYqg83yOkmKVaV7G4FJ4+U1ZoOoXApa27sm+UB8D89+oG9C4oJhzorEhSNImQyyp Y0qgQMTAGUaVqJnYvKEkOEtb3TB/GpfqsDoshg8ih5ZfxfDrsbrHTAJL8pGrhw== 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 4Nj8hq3thLz18Zt; Thu, 29 Dec 2022 00:41:31 +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 2BT0fVhj011826; Thu, 29 Dec 2022 00:41:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BT0fVtU011825; Thu, 29 Dec 2022 00:41:31 GMT (envelope-from git) Date: Thu, 29 Dec 2022 00:41:31 GMT Message-Id: <202212290041.2BT0fVtU011825@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 96fd480838bf - main - sysutils/cpuid: bump to 20221201: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96fd480838bf8d944e59033ff177df5552a6011c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=96fd480838bf8d944e59033ff177df5552a6011c commit 96fd480838bf8d944e59033ff177df5552a6011c Author: Piotr Kubaj AuthorDate: 2022-12-29 00:41:24 +0000 Commit: Piotr Kubaj CommitDate: 2022-12-29 00:41:24 +0000 sysutils/cpuid: bump to 20221201: Differential revision: https://reviews.freebsd.org/D37774 Submitted by: mjg --- sysutils/cpuid/Makefile | 2 +- sysutils/cpuid/distinfo | 6 ++--- sysutils/cpuid/files/patch-cpuid.c | 49 -------------------------------------- 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/sysutils/cpuid/Makefile b/sysutils/cpuid/Makefile index ebc72ac95b7e..566f8c7b3365 100644 --- a/sysutils/cpuid/Makefile +++ b/sysutils/cpuid/Makefile @@ -1,5 +1,5 @@ PORTNAME= cpuid -DISTVERSION= 20211031 +DISTVERSION= 20221201 DISTVERSIONSUFFIX= .src CATEGORIES= sysutils MASTER_SITES= http://www.etallen.com/cpuid/ diff --git a/sysutils/cpuid/distinfo b/sysutils/cpuid/distinfo index 8a4b1a9daac1..d7cd2d693a10 100644 --- a/sysutils/cpuid/distinfo +++ b/sysutils/cpuid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635787419 -SHA256 (cpuid-20211031.src.tar.gz) = 765d3336eb2e6f99765322e5f0f4e38c493c1c3c991e44c18ed73f9295585d8f -SIZE (cpuid-20211031.src.tar.gz) = 124390 +TIMESTAMP = 1672249029 +SHA256 (cpuid-20221201.src.tar.gz) = 08fedc382810667a9d0a417d2975de3ab5d81573452cff57b2deab06d82f8f6e +SIZE (cpuid-20221201.src.tar.gz) = 140185 diff --git a/sysutils/cpuid/files/patch-cpuid.c b/sysutils/cpuid/files/patch-cpuid.c deleted file mode 100644 index 9c048a24c81e..000000000000 --- a/sysutils/cpuid/files/patch-cpuid.c +++ /dev/null @@ -1,49 +0,0 @@ ---- cpuid.c.orig 2021-11-01 17:25:27 UTC -+++ cpuid.c -@@ -73,6 +73,8 @@ - #define USE_CPUID_COUNT - #endif - -+#define CPUID_MAJOR 0 -+ - #if defined(__GNUC__) - #define UNUSED __attribute((unused)) - #else -@@ -9485,12 +9487,17 @@ real_setup(unsigned int cpu, - pthread_t thread = pthread_self(); - int status = processor_bind(P_LWPID, thread, cpu, NULL); - #else -- cpu_set_t cpuset; -+ cpuset_t cpuset; - CPU_ZERO(&cpuset); - CPU_SET(cpu, &cpuset); - 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); -+#else -+ status = sched_setaffinity(0, sizeof(cpuset_t), &cpuset); - #endif -+#endif - if (status == -1) { - if (cpu > 0) { - if (errno == EINVAL) return -1; -@@ -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 = ((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 = lseek(cpuid_fd, offset, SEEK_SET); - if (result == -1) { - if (quiet) { - return FALSE;