ports/55937: [Maintainer Update] sysutils/x86info 1.11 -> 1.12b
Erik Greenwald
erik at smluc.org
Sun Aug 24 21:30:16 UTC 2003
>Number: 55937
>Category: ports
>Synopsis: [Maintainer Update] sysutils/x86info 1.11 -> 1.12b
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 24 14:30:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Erik Greenwald
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD fenris 5.1-CURRENT FreeBSD 5.1-CURRENT #18: Sun Aug 24 08:39:46 CDT 2003 root at fenris:/usr/src/sys/i386/compile/FENRIS i386
>Description:
Freshmeat blurb:
Identifies several new CPUS. Additional MSR decoding on various
CPUs. A few misidentification bugs have been fixed. Completely
rewritten cachesize determination. Various new cache descriptors
added. Numerous MHz estimation improvements. AMD K7 powernow
register/BIOS decoding. Now decodes extended Intel feature flags,
cpuid brand field, and sSpec on some models. AMD Opteron/Athlon64
support. VIA Powersaver/Longhaul support. A --bugs option to display
CPU errata. No longer retries opening /dev/msr if the first open
fails. Fixes a memory leak in --url.
>How-To-Repeat:
>Fix:
--- sysutils_x86info.patch begins here ---
diff -Nurb sysutils/x86info.orig/Makefile sysutils/x86info/Makefile
--- sysutils/x86info.orig/Makefile Sun Aug 24 10:38:15 2003
+++ sysutils/x86info/Makefile Sun Aug 24 10:47:38 2003
@@ -6,10 +6,9 @@
#
PORTNAME= x86info
-PORTVERSION= 1.11
+PORTVERSION= 1.12b
CATEGORIES= sysutils
-MASTER_SITES= http://www.codemonkey.org.uk/x86info/ \
- ftp://ftp.suse.com/pub/people/davej/x86info/ \
+MASTER_SITES= http://www.codemonkey.org.uk/projects/x86info/ \
${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
diff -Nurb sysutils/x86info.orig/distinfo sysutils/x86info/distinfo
--- sysutils/x86info.orig/distinfo Sun Aug 24 10:38:15 2003
+++ sysutils/x86info/distinfo Sun Aug 24 10:47:41 2003
@@ -1 +1 @@
-MD5 (x86info-1.11.tgz) = c383845a7cbaa9c9e9784b1469e19950
+MD5 (x86info-1.12b.tgz) = 4f0ce10a00db5778b16a09f68f5f6767
diff -Nurb sysutils/x86info.orig/files/patch-Makefile sysutils/x86info/files/patch-Makefile
--- sysutils/x86info.orig/files/patch-Makefile Sun Aug 24 10:38:15 2003
+++ sysutils/x86info/files/patch-Makefile Sun Aug 24 16:15:17 2003
@@ -1,5 +1,5 @@
---- Makefile.orig Thu Nov 14 13:42:46 2002
-+++ Makefile Thu Nov 14 13:42:58 2002
+--- Makefile.orig Sun Aug 24 16:14:00 2003
++++ Makefile Sun Aug 24 16:15:05 2003
@@ -4,7 +4,7 @@
#CFLAGS += -mwin32 -DWIN32_LEAN_AND_MEAN
SHELL = /bin/sh
diff -Nurb sysutils/x86info.orig/files/patch-bench_benchmarks.c sysutils/x86info/files/patch-bench_benchmarks.c
--- sysutils/x86info.orig/files/patch-bench_benchmarks.c Wed Dec 31 18:00:00 1969
+++ sysutils/x86info/files/patch-bench_benchmarks.c Sun Aug 24 11:08:54 2003
@@ -0,0 +1,21 @@
+--- bench/benchmarks.c.orig Sun Aug 24 11:04:51 2003
++++ bench/benchmarks.c Sun Aug 24 11:08:26 2003
+@@ -1,7 +1,8 @@
+ #include <time.h>
+ #include <sys/time.h>
+-#include <asm/unistd.h>
++#include <sys/unistd.h>
+ #include <sys/stat.h>
++#include <sys/syscall.h>
+ #include <stdio.h>
+ #include "../x86info.h"
+ #include "bench.h"
+@@ -13,7 +14,7 @@
+ if (show_bench != 1)
+ return;
+
+- TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (__NR_getppid)), "int 0x80");
++ TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (SYS_getppid)), "int 0x80");
+ TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
+
+ TIME(asm volatile("addl $1,0(%esp)"), "addl");
diff -Nurb sysutils/x86info.orig/files/patch-cpuid_UP.S sysutils/x86info/files/patch-cpuid_UP.S
--- sysutils/x86info.orig/files/patch-cpuid_UP.S Sun Aug 24 10:38:15 2003
+++ sysutils/x86info/files/patch-cpuid_UP.S Sun Aug 24 16:13:23 2003
@@ -1,17 +1,13 @@
---- cpuid_UP.S.orig Tue Dec 11 11:01:41 2001
-+++ cpuid_UP.S Tue Dec 18 13:42:43 2001
-@@ -1,21 +1,14 @@
+--- cpuid_UP.S.orig Tue Nov 26 20:20:07 2002
++++ cpuid_UP.S Sun Aug 24 16:12:12 2003
+@@ -1,25 +1,8 @@
.align 4
.text
-#ifdef linux
-
-+#ifdef __WIN32__
-+.globl _cpuid_UP
-+ .def _cpuid_UP; .scl 2; .type 32; .endef
-+#else /* a sane system */
+-
.globl cpuid_UP
- .type cpuid_UP, at function
+- .type cpuid_UP, at function
cpuid_UP:
-
-#else /* BSD or WIN32 */
@@ -23,6 +19,10 @@
-#else /* BSD */
- .type _cpuid_UP, at function
-#endif /* __WIN32__ */
-
- _cpuid_UP:
- #endif /* linux */
+-
+-_cpuid_UP:
+-#endif /* linux */
+-
+ pushl %ebp
+ movl %esp,%ebp
+ pushl %edi
diff -Nurb sysutils/x86info.orig/files/patch-x86info.h sysutils/x86info/files/patch-x86info.h
--- sysutils/x86info.orig/files/patch-x86info.h Wed Dec 31 18:00:00 1969
+++ sysutils/x86info/files/patch-x86info.h Sun Aug 24 11:01:39 2003
@@ -0,0 +1,22 @@
+--- x86info.h.orig Sun Aug 24 10:59:27 2003
++++ x86info.h Sun Aug 24 11:00:47 2003
+@@ -1,15 +1,10 @@
+ #ifndef _X86INFO_H
+ #define _X86INFO_H
+
+-#ifdef linux
+-#include <linux/types.h>
+-typedef unsigned char u8;
+-typedef unsigned short u16;
+-typedef unsigned int u32;
+-#else
+-#include <machine/types.h>
+-#define __u32 int
+-#endif /* linux */
++#include <sys/types.h>
++typedef u_int8_t u8;
++typedef u_int16_t u16;
++typedef u_int32_t u32;
+
+ #define VENDOR_AMD 1
+ #define VENDOR_CENTAUR 2
--- sysutils_x86info.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list