rpms/acpica-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Refresh all of the patches, remove one unneeded one (acpinames).

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2016-01-06 17:44:04 -07:00
parent e3126b70b5
commit f0defaed2f
11 changed files with 325 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acpica-tools.spec
View File

@ -33,7 +33,6 @@ Patch6: int-format.patch
Patch7: f23-harden.patch
Patch8: asllookup-ppc64.patch
Patch9: template.patch
Patch10: acpinames.patch
BuildRequires: bison patchutils flex
@ -93,7 +92,6 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch7 -p1 -b .f23-harden
%patch8 -p1 -b .asllookup-ppc64
%patch9 -p1 -b .template
%patch10 -p1 -b .acpinames
cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1
@ -190,6 +188,7 @@ fi
%changelog
* Wed Jan 6 2016 Al Stone <ahs3@redhat.com> - 20151218-1
- Update to latest upstream. Closes BZ#1292987.
- Refresh patches, and remove one no longer needed (acpinames).
* Tue Dec 15 2015 Al Stone <ahs3@redhat.com> - 20151124-1
- Update to latest upstream. Closes BZ#1267772.

140
acpinames.patch
View File

@ -1,140 +0,0 @@
diff -Naur acpica-unix2-20151124/source/tools/acpinames/acpinames.h acpica-unix2-20151124.patched/source/tools/acpinames/acpinames.h
--- acpica-unix2-20151124/source/tools/acpinames/acpinames.h 1969-12-31 17:00:00.000000000 -0700
+++ acpica-unix2-20151124.patched/source/tools/acpinames/acpinames.h 2015-12-15 15:41:57.418737677 -0700
@@ -0,0 +1,66 @@
+/******************************************************************************
+ *
+ * Module Name: acpinames.h - Common include for AcpiNames utility
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2015, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _ACPINAMES_H
+#define _ACPINAMES_H
+
+#include "acpi.h"
+#include "accommon.h"
+#include "acapps.h"
+#include "acutils.h"
+#include "acnamesp.h"
+#include "actables.h"
+#include "acinterp.h"
+
+#include <stdio.h>
+
+#define ACPI_MAX_INIT_TABLES (32)
+
+extern BOOLEAN AcpiGbl_NsLoadOnly;
+
+
+ACPI_STATUS
+AnBuildLocalTables (
+ ACPI_NEW_TABLE_DESC *TableList);
+
+#endif
diff -Naur acpica-unix2-20151124/source/tools/acpinames/AcpiNames.h acpica-unix2-20151124.patched/source/tools/acpinames/AcpiNames.h
--- acpica-unix2-20151124/source/tools/acpinames/AcpiNames.h 2015-11-24 08:11:31.000000000 -0700
+++ acpica-unix2-20151124.patched/source/tools/acpinames/AcpiNames.h 1969-12-31 17:00:00.000000000 -0700
@@ -1,66 +0,0 @@
-/******************************************************************************
- *
- * Module Name: acpinames.h - Common include for AcpiNames utility
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2015, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- * substantially similar to the "NO WARRANTY" disclaimer below
- * ("Disclaimer") and any redistribution must be conditioned upon
- * including a substantially similar Disclaimer requirement for further
- * binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- * of any contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#ifndef _ACPINAMES_H
-#define _ACPINAMES_H
-
-#include "acpi.h"
-#include "accommon.h"
-#include "acapps.h"
-#include "acutils.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acinterp.h"
-
-#include <stdio.h>
-
-#define ACPI_MAX_INIT_TABLES (32)
-
-extern BOOLEAN AcpiGbl_NsLoadOnly;
-
-
-ACPI_STATUS
-AnBuildLocalTables (
- ACPI_NEW_TABLE_DESC *TableList);
-
-#endif

17
asllookup-miscompare.patch
View File

@ -1,7 +1,16 @@
Index: acpica-unix2-20151124/source/compiler/asllookup.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/asllookup.c
+++ acpica-unix2-20151124/source/compiler/asllookup.c
Make AslLookup endian independent
From: Al Stone <ahs3@redhat.com>
---
source/compiler/asllookup.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/source/compiler/asllookup.c b/source/compiler/asllookup.c
index 49b4901..9a1d489 100644
--- a/source/compiler/asllookup.c
+++ b/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ LkIsObjectUsed (
{
ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);

17
asllookup-ppc64.patch
View File

@ -1,7 +1,16 @@
Index: acpica-unix2-20151124/source/compiler/asllookup.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/asllookup.c
+++ acpica-unix2-20151124/source/compiler/asllookup.c
Make sure AslLookup operates correctly on ppc64, too
From: Al Stone <ahs3@redhat.com>
---
source/compiler/asllookup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/source/compiler/asllookup.c b/source/compiler/asllookup.c
index 9a1d489..a226f7d 100644
--- a/source/compiler/asllookup.c
+++ b/source/compiler/asllookup.c
@@ -176,7 +176,8 @@ LkIsObjectUsed (
* We ignore the predefined methods since often, not
* all arguments are needed or used.

116
debian-big_endian.patch
View File

@ -1,7 +1,27 @@
Index: acpica-unix2-20151124/source/compiler/aslcodegen.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20151124/source/compiler/aslcodegen.c
Re-use a patch originally created for Debian to enable big-endian
From: Al Stone <ahs3@redhat.com>
support
---
source/compiler/aslcodegen.c | 109 ++++++++++++++++++------------
source/compiler/aslopcodes.c | 4 +
source/compiler/aslrestype1.c | 68 +++++++++++++------
source/compiler/aslrestype1i.c | 38 +++++++---
source/compiler/aslrestype2.c | 25 ++++---
source/compiler/aslrestype2d.c | 134 +++++++++++++++++++++----------------
source/compiler/aslrestype2e.c | 39 +++++++----
source/compiler/aslrestype2q.c | 117 +++++++++++++++++++++-----------
source/compiler/aslrestype2s.c | 86 +++++++++++++++++-------
source/compiler/aslrestype2w.c | 127 +++++++++++++++++++++--------------
source/include/acmacros.h | 15 +++-
source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-)
diff --git a/source/compiler/aslcodegen.c b/source/compiler/aslcodegen.c
index cb3a4a5..f63a320 100644
--- a/source/compiler/aslcodegen.c
+++ b/source/compiler/aslcodegen.c
@@ -249,16 +249,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op)
{
@ -243,10 +263,10 @@ Index: acpica-unix2-20151124/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER:
Index: acpica-unix2-20151124/source/compiler/aslopcodes.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20151124/source/compiler/aslopcodes.c
diff --git a/source/compiler/aslopcodes.c b/source/compiler/aslopcodes.c
index e0b73ec..84bdfd6 100644
--- a/source/compiler/aslopcodes.c
+++ b/source/compiler/aslopcodes.c
@@ -534,6 +534,7 @@ OpcDoUnicode (
UINT32 i;
UINT8 *AsciiString;
@ -265,10 +285,10 @@ Index: acpica-unix2-20151124/source/compiler/aslopcodes.c
}
/*
Index: acpica-unix2-20151124/source/compiler/aslrestype1.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20151124/source/compiler/aslrestype1.c
diff --git a/source/compiler/aslrestype1.c b/source/compiler/aslrestype1.c
index 3f967ca..c9f52f4 100644
--- a/source/compiler/aslrestype1.c
+++ b/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -465,10 +485,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break;
Index: acpica-unix2-20151124/source/compiler/aslrestype1i.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20151124/source/compiler/aslrestype1i.c
diff --git a/source/compiler/aslrestype1i.c b/source/compiler/aslrestype1i.c
index 07fc146..28f396e 100644
--- a/source/compiler/aslrestype1i.c
+++ b/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -605,10 +625,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode);
}
Index: acpica-unix2-20151124/source/compiler/aslrestype2.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20151124/source/compiler/aslrestype2.c
diff --git a/source/compiler/aslrestype2.c b/source/compiler/aslrestype2.c
index 4a01795..dd6853c 100644
--- a/source/compiler/aslrestype2.c
+++ b/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -705,10 +725,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20151124/source/compiler/aslrestype2d.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20151124/source/compiler/aslrestype2d.c
diff --git a/source/compiler/aslrestype2d.c b/source/compiler/aslrestype2d.c
index caca601..f1c737b 100644
--- a/source/compiler/aslrestype2d.c
+++ b/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1064,10 +1084,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20151124/source/compiler/aslrestype2e.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20151124/source/compiler/aslrestype2e.c
diff --git a/source/compiler/aslrestype2e.c b/source/compiler/aslrestype2e.c
index eec1247..989ba5f 100644
--- a/source/compiler/aslrestype2e.c
+++ b/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1173,10 +1193,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength;
return (Rnode);
Index: acpica-unix2-20151124/source/compiler/aslrestype2q.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20151124/source/compiler/aslrestype2q.c
diff --git a/source/compiler/aslrestype2q.c b/source/compiler/aslrestype2q.c
index 229daae..a0ce2ae 100644
--- a/source/compiler/aslrestype2q.c
+++ b/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields;
@ -1515,10 +1535,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20151124/source/compiler/aslrestype2s.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20151124/source/compiler/aslrestype2s.c
diff --git a/source/compiler/aslrestype2s.c b/source/compiler/aslrestype2s.c
index c7d5455..ec0cb88 100644
--- a/source/compiler/aslrestype2s.c
+++ b/source/compiler/aslrestype2s.c
@@ -290,6 +290,9 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
@ -1832,10 +1852,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
Index: acpica-unix2-20151124/source/compiler/aslrestype2w.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20151124/source/compiler/aslrestype2w.c
diff --git a/source/compiler/aslrestype2w.c b/source/compiler/aslrestype2w.c
index 98257ad..83c4688 100644
--- a/source/compiler/aslrestype2w.c
+++ b/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields;
UINT16 StringLength = 0;
@ -2179,10 +2199,10 @@ Index: acpica-unix2-20151124/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20151124/source/include/acmacros.h
===================================================================
--- acpica-unix2-20151124.orig/source/include/acmacros.h
+++ acpica-unix2-20151124/source/include/acmacros.h
diff --git a/source/include/acmacros.h b/source/include/acmacros.h
index 2dc5c20..967ee78 100644
--- a/source/include/acmacros.h
+++ b/source/include/acmacros.h
@@ -100,7 +100,8 @@
/* 32-bit source, 16/32/64 destination */
@ -2220,10 +2240,10 @@ Index: acpica-unix2-20151124/source/include/acmacros.h
#define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
#define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
Index: acpica-unix2-20151124/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20151124.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20151124/source/include/platform/aclinux.h
diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h
index 473055f..b37d9f0 100644
--- a/source/include/platform/aclinux.h
+++ b/source/include/platform/aclinux.h
@@ -170,6 +170,7 @@
#include <stdlib.h>
#include <ctype.h>

43
debian-unaligned.patch
View File

@ -1,4 +1,7 @@
Patch carried over from the prior iasl package and updated. This allows
From: Al Stone <ahs3@redhat.com>
for builds on systems requiring aligned memory access. Please see
http://lists.acpica.org/pipermail/devel/2010-July/000159.html. Resolves
BZ#865013 and BZ#856856.
@ -10,16 +13,16 @@ Also fix callsites where wrong assumptions where made in terms of aligment.
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
source/compiler/asltree.c | 15 ++++++++++-----
source/components/executer/exoparg2.c | 12 +++++++++---
source/include/actypes.h | 26 +++++++++++++-------------
3 file modificati, 32 inserzioni(+), 21 rimozioni(-)
source/compiler/asltree.c | 15 ++++++++++-----
source/components/executer/exoparg2.c | 12 +++++++++---
source/include/actypes.h | 26 +++++++++++++-------------
3 files changed, 32 insertions(+), 21 deletions(-)
Index: acpica-unix2-20151124/source/compiler/asltree.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/asltree.c
+++ acpica-unix2-20151124/source/compiler/asltree.c
@@ -870,28 +870,31 @@ TrCreateValuedLeafNode (
diff --git a/source/compiler/asltree.c b/source/compiler/asltree.c
index 5067640..68f139d 100644
--- a/source/compiler/asltree.c
+++ b/source/compiler/asltree.c
@@ -890,28 +890,31 @@ TrCreateValuedLeafNode (
"Op %s Value %8.8X%8.8X ",
Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode),
ACPI_FORMAT_UINT64 (Value));
@ -56,7 +59,7 @@ Index: acpica-unix2-20151124/source/compiler/asltree.c
break;
case PARSEOP_METHOD:
@@ -901,12 +904,14 @@ TrCreateValuedLeafNode (
@@ -921,12 +924,14 @@ TrCreateValuedLeafNode (
case PARSEOP_INTEGER:
@ -71,10 +74,10 @@ Index: acpica-unix2-20151124/source/compiler/asltree.c
break;
}
Index: acpica-unix2-20151124/source/components/executer/exoparg2.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/executer/exoparg2.c
+++ acpica-unix2-20151124/source/components/executer/exoparg2.c
diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c
index 25b4be3..0997868 100644
--- a/source/components/executer/exoparg2.c
+++ b/source/components/executer/exoparg2.c
@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL;
@ -115,11 +118,11 @@ Index: acpica-unix2-20151124/source/components/executer/exoparg2.c
break;
case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */
Index: acpica-unix2-20151124/source/include/actypes.h
===================================================================
--- acpica-unix2-20151124.orig/source/include/actypes.h
+++ acpica-unix2-20151124/source/include/actypes.h
@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
diff --git a/source/include/actypes.h b/source/include/actypes.h
index 7eb6376..5cc118f 100644
--- a/source/include/actypes.h
+++ b/source/include/actypes.h
@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 INT64;
*/
#define ACPI_THREAD_ID UINT64
@ -139,7 +142,7 @@ Index: acpica-unix2-20151124/source/include/actypes.h
/*******************************************************************************
*
@@ -169,19 +182,6 @@ typedef UINT64
@@ -169,19 +182,6 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS;
#define ACPI_SIZE_MAX ACPI_UINT64_MAX
#define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */

28
f23-harden.patch
View File

@ -1,7 +1,17 @@
Index: acpica-unix2-20151124/generate/unix/Makefile.config
===================================================================
--- acpica-unix2-20151124.orig/generate/unix/Makefile.config
+++ acpica-unix2-20151124/generate/unix/Makefile.config
Introduce build hardening flags for f23
From: Al Stone <ahs3@redhat.com>
---
generate/unix/Makefile.config | 2 ++
generate/unix/iasl/Makefile | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
index 2c67be4..e8a419e 100644
--- a/generate/unix/Makefile.config
+++ b/generate/unix/Makefile.config
@@ -167,6 +167,8 @@ ifneq ($(NOFORTIFY),TRUE)
OPT_CFLAGS += -D_FORTIFY_SOURCE=2
endif
@ -11,11 +21,11 @@ Index: acpica-unix2-20151124/generate/unix/Makefile.config
CFLAGS += \
-D$(HOST)\
-D_GNU_SOURCE\
Index: acpica-unix2-20151124/generate/unix/iasl/Makefile
===================================================================
--- acpica-unix2-20151124.orig/generate/unix/iasl/Makefile
+++ acpica-unix2-20151124/generate/unix/iasl/Makefile
@@ -309,20 +309,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile
index 8b71edd..b403037 100644
--- a/generate/unix/iasl/Makefile
+++ b/generate/unix/iasl/Makefile
@@ -309,20 +309,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse
# Cannot use the common compile warning flags since the C files are created
# by the utilities above and they are not necessarily ANSI C, etc.
#

282
int-format.patch
View File

@ -1,7 +1,33 @@
Index: acpica-unix2-20151124/source/compiler/aslcompile.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20151124/source/compiler/aslcompile.c
Use proper integer formatting
From: Al Stone <ahs3@redhat.com>
---
source/compiler/aslcompile.c | 2 +-
source/compiler/aslerror.c | 4 ++--
source/compiler/aslopt.c | 2 +-
source/compiler/aslpredef.c | 2 +-
source/compiler/aslprepkg.c | 2 +-
source/components/debugger/dbexec.c | 2 +-
source/components/dispatcher/dsmthdat.c | 4 ++--
source/components/dispatcher/dsutils.c | 2 +-
source/components/dispatcher/dswscope.c | 4 ++--
source/components/events/evgpe.c | 4 ++--
source/components/executer/exdump.c | 2 +-
source/components/executer/exfldio.c | 4 ++--
source/components/executer/exnames.c | 4 ++--
source/components/hardware/hwregs.c | 2 +-
source/components/tables/tbfadt.c | 6 +++---
source/components/tables/tbxfroot.c | 6 +++---
source/components/utilities/utownerid.c | 2 +-
source/tools/acpiexec/aemain.c | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/source/compiler/aslcompile.c b/source/compiler/aslcompile.c
index a564f86..9dbabfb 100644
--- a/source/compiler/aslcompile.c
+++ b/source/compiler/aslcompile.c
@@ -702,7 +702,7 @@ CmCleanupAndExit (
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@ -11,23 +37,10 @@ Index: acpica-unix2-20151124/source/compiler/aslcompile.c
ASL_MAX_ERROR_COUNT);
}
Index: acpica-unix2-20151124/source/tools/acpiexec/aemain.c
===================================================================
--- acpica-unix2-20151124.orig/source/tools/acpiexec/aemain.c
+++ acpica-unix2-20151124/source/tools/acpiexec/aemain.c
@@ -203,7 +203,7 @@ AeDoOptions (
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);
}
Index: acpica-unix2-20151124/source/compiler/aslerror.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslerror.c
+++ acpica-unix2-20151124/source/compiler/aslerror.c
diff --git a/source/compiler/aslerror.c b/source/compiler/aslerror.c
index 2c0516a..bf230ff 100644
--- a/source/compiler/aslerror.c
+++ b/source/compiler/aslerror.c
@@ -687,7 +687,7 @@ AslCommonError (
Gbl_ExceptionCount[Level]++;
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@ -46,23 +59,10 @@ Index: acpica-unix2-20151124/source/compiler/aslerror.c
ASL_MAX_DISABLED_MESSAGES);
return (AE_LIMIT);
}
Index: acpica-unix2-20151124/source/components/debugger/dbexec.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/debugger/dbexec.c
+++ acpica-unix2-20151124/source/components/debugger/dbexec.c
@@ -214,7 +214,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO,
"Possible overflow of internal debugger "
"buffer (size 0x%X needed 0x%X)",
- ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
+ (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
}
}
Index: acpica-unix2-20151124/source/compiler/aslopt.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslopt.c
+++ acpica-unix2-20151124/source/compiler/aslopt.c
diff --git a/source/compiler/aslopt.c b/source/compiler/aslopt.c
index 05af0be..95b0c10 100644
--- a/source/compiler/aslopt.c
+++ b/source/compiler/aslopt.c
@@ -576,7 +576,7 @@ OptOptimizeNamePath (
}
@ -72,10 +72,49 @@ Index: acpica-unix2-20151124/source/compiler/aslopt.c
Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Index: acpica-unix2-20151124/source/components/dispatcher/dsmthdat.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix2-20151124/source/components/dispatcher/dsmthdat.c
diff --git a/source/compiler/aslpredef.c b/source/compiler/aslpredef.c
index 7dd10b5..16df04a 100644
--- a/source/compiler/aslpredef.c
+++ b/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0)
{
- sprintf (MsgBuffer, "%s requires %u", Op->Asl.ExternalName, 0);
+ sprintf (MsgBuffer, "%s requires %d", Op->Asl.ExternalName, 0);
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer);
diff --git a/source/compiler/aslprepkg.c b/source/compiler/aslprepkg.c
index ff80b57..e70b401 100644
--- a/source/compiler/aslprepkg.c
+++ b/source/compiler/aslprepkg.c
@@ -299,7 +299,7 @@ ApCheckPackage (
if (Count & 1)
{
- sprintf (MsgBuffer, "%4.4s: Package length, %d, must be even.",
+ sprintf (MsgBuffer, "%4.4s: Package length, %u, must be even.",
Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c
index b2836eb..d9fa628 100644
--- a/source/components/debugger/dbexec.c
+++ b/source/components/debugger/dbexec.c
@@ -214,7 +214,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO,
"Possible overflow of internal debugger "
"buffer (size 0x%X needed 0x%X)",
- ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
+ (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
}
}
diff --git a/source/components/dispatcher/dsmthdat.c b/source/components/dispatcher/dsmthdat.c
index 2040a33..5af6184 100644
--- a/source/components/dispatcher/dsmthdat.c
+++ b/source/components/dispatcher/dsmthdat.c
@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL)
{
@ -94,36 +133,10 @@ Index: acpica-unix2-20151124/source/components/dispatcher/dsmthdat.c
Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX);
}
Index: acpica-unix2-20151124/source/compiler/aslpredef.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20151124/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0)
{
- sprintf (MsgBuffer, "%s requires %u", Op->Asl.ExternalName, 0);
+ sprintf (MsgBuffer, "%s requires %d", Op->Asl.ExternalName, 0);
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer);
Index: acpica-unix2-20151124/source/compiler/aslprepkg.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslprepkg.c
+++ acpica-unix2-20151124/source/compiler/aslprepkg.c
@@ -299,7 +299,7 @@ ApCheckPackage (
if (Count & 1)
{
- sprintf (MsgBuffer, "%4.4s: Package length, %d, must be even.",
+ sprintf (MsgBuffer, "%4.4s: Package length, %u, must be even.",
Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Index: acpica-unix2-20151124/source/components/dispatcher/dsutils.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix2-20151124/source/components/dispatcher/dsutils.c
diff --git a/source/components/dispatcher/dsutils.c b/source/components/dispatcher/dsutils.c
index a32b3d4..586204e 100644
--- a/source/components/dispatcher/dsutils.c
+++ b/source/components/dispatcher/dsutils.c
@@ -791,7 +791,7 @@ AcpiDsCreateOperands (
}
@ -133,10 +146,10 @@ Index: acpica-unix2-20151124/source/components/dispatcher/dsutils.c
WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */
Index: acpica-unix2-20151124/source/components/dispatcher/dswscope.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix2-20151124/source/components/dispatcher/dswscope.c
diff --git a/source/components/dispatcher/dswscope.c b/source/components/dispatcher/dswscope.c
index f67f2c4..4227ddb 100644
--- a/source/components/dispatcher/dswscope.c
+++ b/source/components/dispatcher/dswscope.c
@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++;
@ -155,10 +168,10 @@ Index: acpica-unix2-20151124/source/components/dispatcher/dswscope.c
(UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Index: acpica-unix2-20151124/source/components/events/evgpe.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/events/evgpe.c
+++ acpica-unix2-20151124/source/components/events/evgpe.c
diff --git a/source/components/events/evgpe.c b/source/components/events/evgpe.c
index 04a1f1e..b9c6566 100644
--- a/source/components/events/evgpe.c
+++ b/source/components/events/evgpe.c
@@ -430,7 +430,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n",
@ -177,11 +190,11 @@ Index: acpica-unix2-20151124/source/components/events/evgpe.c
StatusReg, EnableReg,
GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake));
Index: acpica-unix2-20151124/source/components/executer/exdump.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/executer/exdump.c
+++ acpica-unix2-20151124/source/components/executer/exdump.c
@@ -669,7 +669,7 @@ AcpiExDumpOperand (
diff --git a/source/components/executer/exdump.c b/source/components/executer/exdump.c
index a09d779..e46eb3b 100644
--- a/source/components/executer/exdump.c
+++ b/source/components/executer/exdump.c
@@ -671,7 +671,7 @@ AcpiExDumpOperand (
if (Depth > 0)
{
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ",
@ -190,10 +203,25 @@ Index: acpica-unix2-20151124/source/components/executer/exdump.c
}
else
{
Index: acpica-unix2-20151124/source/components/executer/exnames.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/executer/exnames.c
+++ acpica-unix2-20151124/source/components/executer/exnames.c
diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c
index c5d9399..53c7cea 100644
--- a/source/components/executer/exfldio.c
+++ b/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO,
"Unknown UpdateRule value: 0x%X",
- (ObjDesc->CommonField.FieldFlags &
- AML_FIELD_UPDATE_RULE_MASK)));
+ (unsigned int) (ObjDesc->CommonField.FieldFlags &
+ AML_FIELD_UPDATE_RULE_MASK)));
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
}
}
diff --git a/source/components/executer/exnames.c b/source/components/executer/exnames.c
index f679de6..8874f4b 100644
--- a/source/components/executer/exnames.c
+++ b/source/components/executer/exnames.c
@@ -240,7 +240,7 @@ AcpiExNameSegment (
*/
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@ -212,25 +240,23 @@ Index: acpica-unix2-20151124/source/components/executer/exnames.c
}
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Index: acpica-unix2-20151124/source/components/executer/exfldio.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/executer/exfldio.c
+++ acpica-unix2-20151124/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
diff --git a/source/components/hardware/hwregs.c b/source/components/hardware/hwregs.c
index d7ef3ca..1d3de44 100644
--- a/source/components/hardware/hwregs.c
+++ b/source/components/hardware/hwregs.c
@@ -300,7 +300,7 @@ AcpiHwClearAcpiStatus (
ACPI_ERROR ((AE_INFO,
"Unknown UpdateRule value: 0x%X",
- (ObjDesc->CommonField.FieldFlags &
- AML_FIELD_UPDATE_RULE_MASK)));
+ (unsigned int) (ObjDesc->CommonField.FieldFlags &
+ AML_FIELD_UPDATE_RULE_MASK)));
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
}
}
Index: acpica-unix2-20151124/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20151124/source/components/tables/tbfadt.c
ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
- ACPI_BITMASK_ALL_FIXED_STATUS,
+ (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
diff --git a/source/components/tables/tbfadt.c b/source/components/tables/tbfadt.c
index bfb80e5..0e6e793 100644
--- a/source/components/tables/tbfadt.c
+++ b/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER))
{
@ -258,23 +284,10 @@ Index: acpica-unix2-20151124/source/components/tables/tbfadt.c
Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Index: acpica-unix2-20151124/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20151124/source/components/hardware/hwregs.c
@@ -300,7 +300,7 @@ AcpiHwClearAcpiStatus (
ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
- ACPI_BITMASK_ALL_FIXED_STATUS,
+ (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Index: acpica-unix2-20151124/source/components/tables/tbxfroot.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/tables/tbxfroot.c
+++ acpica-unix2-20151124/source/components/tables/tbxfroot.c
diff --git a/source/components/tables/tbxfroot.c b/source/components/tables/tbxfroot.c
index 455f133..0a287bc 100644
--- a/source/components/tables/tbxfroot.c
+++ b/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer (
{
ACPI_ERROR ((AE_INFO,
@ -302,10 +315,10 @@ Index: acpica-unix2-20151124/source/components/tables/tbxfroot.c
return_ACPI_STATUS (AE_NO_MEMORY);
}
Index: acpica-unix2-20151124/source/components/utilities/utownerid.c
===================================================================
--- acpica-unix2-20151124.orig/source/components/utilities/utownerid.c
+++ acpica-unix2-20151124/source/components/utilities/utownerid.c
diff --git a/source/components/utilities/utownerid.c b/source/components/utilities/utownerid.c
index dc3922a..ed0aa63 100644
--- a/source/components/utilities/utownerid.c
+++ b/source/components/utilities/utownerid.c
@@ -231,7 +231,7 @@ AcpiUtReleaseOwnerId (
else
{
@ -315,3 +328,16 @@ Index: acpica-unix2-20151124/source/components/utilities/utownerid.c
}
(void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index a5f168c..f680b41 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -205,7 +205,7 @@ AeDoOptions (
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);
}

14
name-miscompare.patch
View File

@ -1,13 +1,19 @@
On big-endian machines, a test case looking for the methods _L1D and _E1D
From: Al Stone <ahs3@redhat.com>
in the same scope would fail (see tests/misc/badcode.asl:184). The names
to be compared were being treated as 32-bit ints, and not strings. Hence,
the characters were re-ordered incorrectly, mismatching the assumptions
made in the remainder of the function.
---
source/compiler/aslanalyze.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: acpica-unix2-20151124/source/compiler/aslanalyze.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20151124/source/compiler/aslanalyze.c
diff --git a/source/compiler/aslanalyze.c b/source/compiler/aslanalyze.c
index fd71763..37bfc15 100644
--- a/source/compiler/aslanalyze.c
+++ b/source/compiler/aslanalyze.c
@@ -446,7 +446,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */

17
re-enable-big-endian.patch
View File

@ -1,12 +1,17 @@
Re-enable use of these tools on big-endian machines.
Al Stone <ahs3@redhat.com>
From: Al Stone <ahs3@redhat.com>
Index: acpica-unix2-20151124/source/compiler/aslmain.c
===================================================================
--- acpica-unix2-20151124.orig/source/compiler/aslmain.c
+++ acpica-unix2-20151124/source/compiler/aslmain.c
@@ -340,18 +340,6 @@ main (
Al Stone <ahs3@redhat.com>
---
source/compiler/aslmain.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/source/compiler/aslmain.c b/source/compiler/aslmain.c
index 795a047..63420db 100644
--- a/source/compiler/aslmain.c
+++ b/source/compiler/aslmain.c
@@ -341,18 +341,6 @@ main (
int ReturnStatus = 0;

17
template.patch
View File

@ -1,7 +1,16 @@
Index: acpica-unix2-20151124/tests/templates/Makefile
===================================================================
--- acpica-unix2-20151124.orig/tests/templates/Makefile
+++ acpica-unix2-20151124/tests/templates/Makefile
Add in a needed parameter for a test file template
From: Al Stone <ahs3@redhat.com>
---
tests/templates/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/templates/Makefile b/tests/templates/Makefile
index 1880dcc..6dce27d 100644
--- a/tests/templates/Makefile
+++ b/tests/templates/Makefile
@@ -2,7 +2,7 @@
PROG= templates