From d58fb8579a43faa4a5ac3e338c68e59df3ab8298 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 16 Jun 2013 16:18:03 +0200 Subject: [PATCH] - updated to 20130610 - removed obsolete format-security patch --- cpuid-format-security.patch | 110 ------------------------------------ cpuid.spec | 6 +- 2 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 cpuid-format-security.patch diff --git a/cpuid-format-security.patch b/cpuid-format-security.patch deleted file mode 100644 index fa29e0b..0000000 --- a/cpuid-format-security.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- cpuid-20120601/cpuid.c.formatsec 2013-02-15 17:52:31.279524266 +0100 -+++ cpuid-20120601/cpuid.c 2013-02-15 17:55:58.111737095 +0100 -@@ -1760,7 +1760,7 @@ print_synth_intel(const char* n - unsigned int val, /* val_1_eax */ - const code_stash_t* stash) - { -- printf(name); -+ fputs(name, stdout); - START; - FM ( 0, 4, 0, 0, "Intel i80486DX-25/33"); - FM ( 0, 4, 0, 1, "Intel i80486DX-50"); -@@ -2263,7 +2263,7 @@ print_synth_amd(const char* nam - unsigned int val, - const code_stash_t* stash) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0, 4, 0, 3, "AMD 80486DX2"); - FM (0, 4, 0, 7, "AMD 80486DX2WB"); -@@ -2824,7 +2824,7 @@ static void - print_synth_cyrix(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0,4, 0,4, "Cyrix Media GX / GXm"); - FM (0,4, 0,9, "Cyrix 5x86"); -@@ -2845,7 +2845,7 @@ static void - print_synth_via(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0, 5, 0, 4, "VIA WinChip (C6)"); - FM (0, 5, 0, 8, "VIA WinChip 2 (C6-2)"); -@@ -2882,7 +2882,7 @@ static void - print_synth_umc(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0,4, 0,1, "UMC U5D (486DX)"); - FMS(0,4, 0,2, 3, "UMC U5S (486SX)"); -@@ -2895,7 +2895,7 @@ static void - print_synth_nexgen(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FMS(0,5, 0,0, 4, "NexGen P100"); - FMS(0,5, 0,0, 6, "NexGen P120 (E2/C0)"); -@@ -2907,7 +2907,7 @@ static void - print_synth_rise(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0,5, 0,0, "Rise mP6 iDragon, .25u"); - FM (0,5, 0,2, "Rise mP6 iDragon, .18u"); -@@ -2924,7 +2924,7 @@ print_synth_transmeta(const char* - { - /* TODO: Add code-based detail for Transmeta Crusoe TM5700/TM5900 */ - /* TODO: Add code-based detail for Transmeta Efficeon */ -- printf(name); -+ fputs(name, stdout); - START; - FMSQ(0, 5, 0,4, 2, t2, "Transmeta Crusoe TM3200"); - FMS (0, 5, 0,4, 2, "Transmeta Crusoe TM3x00 (unknown model)"); -@@ -2946,7 +2946,7 @@ static void - print_synth_sis(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0,5, 0,0, "SiS 55x"); - DEFAULT ("unknown"); -@@ -2957,7 +2957,7 @@ static void - print_synth_nsc(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0,5, 0,4, "NSC Geode GX1/GXLV/GXm"); - FM (0,5, 0,5, "NSC Geode GX2"); -@@ -2970,7 +2970,7 @@ static void - print_synth_vortex(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0,5, 0,2, "Vortex86DX"); - FM (0,5, 0,8, "Vortex86MX"); -@@ -2982,7 +2982,7 @@ static void - print_synth_rdc(const char* name, - unsigned int val) - { -- printf(name); -+ fputs(name, stdout); - START; - FM (0,5, 0,8, "RDC IAD 100"); - DEFAULT ("unknown"); diff --git a/cpuid.spec b/cpuid.spec index bb1229e..cf2bb3f 100644 --- a/cpuid.spec +++ b/cpuid.spec @@ -1,13 +1,12 @@ Summary: x86 CPUID information display program Summary(pl.UTF-8): Program wyświetlający informacje CPUID dla procesorów x86 Name: cpuid -Version: 20120601 +Version: 20130610 Release: 1 License: GPL v2+ Group: Applications/System Source0: http://www.etallen.com/cpuid/%{name}-%{version}.src.tar.gz -# Source0-md5: 4012dd0dba5e214b59de54db22e5e79b -Patch0: %{name}-format-security.patch +# Source0-md5: 110494fc8db9d34e9a6de9b5a8cdf3cd URL: http://www.etallen.com/cpuid.html ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -22,7 +21,6 @@ procesora (lub procesorów) x86 zebrane przy użyciu instrukcji CPUID. %prep %setup -q -%patch0 -p1 %build %{__make} \ -- 2.44.0