From 8ac1ac900160ad1343a52df9c5fdcf58ef05daa3 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Mon, 2 Mar 2015 18:09:09 -0700 Subject: [PATCH] Refresh patches and test results Signed-off-by: Al Stone --- acpica-tools.spec | 8 +++++++- badcode.asl.result | 2 +- grammar.asl.result | 2 +- int-format.patch | 24 ++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 int-format.patch diff --git a/acpica-tools.spec b/acpica-tools.spec index a9a954d..a1b6dad 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,5 +1,5 @@ Name: acpica-tools -Version: 20141107 +Version: 20150204 Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables @@ -31,6 +31,7 @@ Patch4: asllookup-miscompare.patch Patch5: aapits-makefile.patch Patch6: re-enable-big-endian.patch Patch7: OPT_LDFLAGS.patch +Patch8: int-format.patch BuildRequires: bison patchutils flex @@ -89,6 +90,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch5 -p1 -b .aapits-makefile %patch6 -p1 -b .re-enable-big-endian %patch7 -p1 -b .OPT_LDFLAGS +%patch8 -p1 -b .int-format cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -193,6 +195,10 @@ fi %changelog +* Mon Mar 2 2015 Al Stone - 20150204-1 +- Update to latest upstream. Closes BZ#1190383 +- Refresh patches + * Mon Nov 17 2014 Al Stone - 20141107-1 - Update to latest upstream. Closes BZ#1147131. - Refresh patches diff --git a/badcode.asl.result b/badcode.asl.result index 2be0f19..2c77ad9 100644 --- a/badcode.asl.result +++ b/badcode.asl.result @@ -238,7 +238,7 @@ Remark 2089 - Object is not referenced ^ (Name is with Intel ACPI Component Architecture ASL+ Optimizing Compiler version VVVVVVVV-YYYY [XXXXXXXXXXX] -Copyright (c) 2000 - 2014 Intel Corporation +Copyright (c) 2000 - 2015 Intel Corporation Ignoring all errors, forcing AML file generation diff --git a/grammar.asl.result b/grammar.asl.result index 7dfbf05..3d5a0c1 100644 --- a/grammar.asl.result +++ b/grammar.asl.result @@ -286,7 +286,7 @@ Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR i Intel ACPI Component Architecture ASL+ Optimizing Compiler version VVVVVVVV-YYYY [XXXXXXXXXXX] -Copyright (c) 2000 - 2014 Intel Corporation +Copyright (c) 2000 - 2015 Intel Corporation Ignoring all errors, forcing AML file generation diff --git a/int-format.patch b/int-format.patch new file mode 100644 index 0000000..817134c --- /dev/null +++ b/int-format.patch @@ -0,0 +1,24 @@ +diff -Naur acpica-unix2-20150204.orig/source/compiler/aslcompile.c acpica-unix2-20150204/source/compiler/aslcompile.c +--- acpica-unix2-20150204.orig/source/compiler/aslcompile.c 2015-03-02 17:11:22.300989116 -0700 ++++ acpica-unix2-20150204/source/compiler/aslcompile.c 2015-03-02 17:11:36.883174716 -0700 +@@ -680,7 +680,7 @@ + + if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) + { +- printf ("\nMaximum error count (%u) exceeded\n", ++ printf ("\nMaximum error count (%d) exceeded\n", + ASL_MAX_ERROR_COUNT); + } + +diff -Naur acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c acpica-unix2-20150204/source/tools/acpiexec/aemain.c +--- acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c 2015-03-02 17:11:22.313989281 -0700 ++++ acpica-unix2-20150204/source/tools/acpiexec/aemain.c 2015-03-02 17:12:42.467009457 -0700 +@@ -197,7 +197,7 @@ + + if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) + { +- printf ("**** The length of command line (%u) exceeded maximum (%u)\n", ++ printf ("**** The length of command line (%u) exceeded maximum (%d)\n", + (UINT32) strlen (AcpiGbl_Optarg), (AE_BUFFER_SIZE -1)); + return (-1); + }