From 7e016cb43daab3abec98fabba9cb89b76703ee2a Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@ahs3.net>
Date: Feb 01 2020 22:53:11 +0000
Subject: Update to 20191213 upstream source


Signed-off-by: Al Stone <ahs3@ahs3.net>

---

diff --git a/debian/changelog b/debian/changelog
index 9ea2615..adda4d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+acpica-unix (20191213-1) UNRELEASED; urgency=medium
+
+  * Upgrade to 20191018 upstream
+  * Refresh patches as needed
+  * Remove one patch already pulled in by upstream
+
+ -- Al Stone <ahs3@debian.org>  Sat, 01 Feb 2020 15:43:26 -0700
+
 acpica-unix (20191018-1) unstable; urgency=medium
 
   * Upgrade to 20191018 upstream
diff --git a/debian/patches/.badexit.patch.swp b/debian/patches/.badexit.patch.swp
new file mode 100644
index 0000000..51a8007
Binary files /dev/null and b/debian/patches/.badexit.patch.swp differ
diff --git a/debian/patches/OPT_LDFLAGS.patch b/debian/patches/OPT_LDFLAGS.patch
index 5d9a21f..7e9d02d 100644
--- a/debian/patches/OPT_LDFLAGS.patch
+++ b/debian/patches/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/generate/unix/Makefile.config
+Index: acpica-unix-20191213/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20191018.orig/generate/unix/Makefile.config
-+++ acpica-unix-20191018/generate/unix/Makefile.config
+--- acpica-unix-20191213.orig/generate/unix/Makefile.config
++++ acpica-unix-20191213/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
diff --git a/debian/patches/add-testing.patch b/debian/patches/add-testing.patch
index d1dbfa0..a67e5c6 100644
--- a/debian/patches/add-testing.patch
+++ b/debian/patches/add-testing.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/Makefile
+Index: acpica-unix-20191213/Makefile
 ===================================================================
---- acpica-unix-20191018.orig/Makefile
-+++ acpica-unix-20191018/Makefile
+--- acpica-unix-20191213.orig/Makefile
++++ acpica-unix-20191213/Makefile
 @@ -20,3 +20,11 @@ else
  	include generate/unix/Makefile.config
  	include generate/unix/Makefile.common
@@ -12,5 +12,5 @@ Index: acpica-unix-20191018/Makefile
 +	$(CURDIR)/tests/aslts.sh $(CURDIR)/tests/aslts $(CURDIR)/generate/unix
 +
 +	# misc tests
-+	$(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20191018
++	$(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20191213
 +
diff --git a/debian/patches/arm7hl.patch b/debian/patches/arm7hl.patch
index 75abf45..b3a7d7a 100644
--- a/debian/patches/arm7hl.patch
+++ b/debian/patches/arm7hl.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/include/acmacros.h
+Index: acpica-unix-20191213/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/acmacros.h
-+++ acpica-unix-20191018/source/include/acmacros.h
+--- acpica-unix-20191213.orig/source/include/acmacros.h
++++ acpica-unix-20191213/source/include/acmacros.h
 @@ -178,6 +178,8 @@
  
  /* 16-bit source, 16/32/64 destination */
diff --git a/debian/patches/aslcodegen.patch b/debian/patches/aslcodegen.patch
index 2e2854e..357ae47 100644
--- a/debian/patches/aslcodegen.patch
+++ b/debian/patches/aslcodegen.patch
@@ -4,10 +4,10 @@ support; this patch repairs that adaptation.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20191018/source/compiler/aslcodegen.c
+Index: acpica-unix-20191213/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20191018/source/compiler/aslcodegen.c
+--- acpica-unix-20191213.orig/source/compiler/aslcodegen.c
++++ acpica-unix-20191213/source/compiler/aslcodegen.c
 @@ -497,8 +497,7 @@ CgWriteTableHeader (
  
      /* Table length. Checksum zero for now, will rewrite later */
diff --git a/debian/patches/badexit.patch b/debian/patches/badexit.patch
deleted file mode 100644
index 6bcc699..0000000
--- a/debian/patches/badexit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-When iasl is invoked with 'iasl -T ALL', and everything works correctly,
-it still exits with a non-zero value.  Exit with zero if all is well.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
-Index: acpica-unix-20191018/source/compiler/asloptions.c
-===================================================================
---- acpica-unix-20191018.orig/source/compiler/asloptions.c
-+++ acpica-unix-20191018/source/compiler/asloptions.c
-@@ -111,7 +111,7 @@ AslCommandLine (
-         {
-             exit (-1);
-         }
--        exit (1);
-+        exit (0);
-     }
- 
-     /* Next parameter must be the input filename */
diff --git a/debian/patches/big-endian-dmtbdump.patch b/debian/patches/big-endian-dmtbdump.patch
index fed81c1..426d97b 100644
--- a/debian/patches/big-endian-dmtbdump.patch
+++ b/debian/patches/big-endian-dmtbdump.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/common/dmtbdump.c
+Index: acpica-unix-20191213/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump.c
-+++ acpica-unix-20191018/source/common/dmtbdump.c
+--- acpica-unix-20191213.orig/source/common/dmtbdump.c
++++ acpica-unix-20191213/source/common/dmtbdump.c
 @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
      UINT32                  Entries;
      UINT32                  Offset;
diff --git a/debian/patches/big-endian-dmtbdump1.patch b/debian/patches/big-endian-dmtbdump1.patch
index ba37c6f..8e0a143 100644
--- a/debian/patches/big-endian-dmtbdump1.patch
+++ b/debian/patches/big-endian-dmtbdump1.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/common/dmtbdump1.c
+Index: acpica-unix-20191213/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump1.c
-+++ acpica-unix-20191018/source/common/dmtbdump1.c
+--- acpica-unix-20191213.orig/source/common/dmtbdump1.c
++++ acpica-unix-20191213/source/common/dmtbdump1.c
 @@ -79,17 +79,21 @@ AcpiDmDumpAsf (
      UINT32                  DataOffset = 0;
      UINT32                  i;
diff --git a/debian/patches/big-endian-dmtbdump2.patch b/debian/patches/big-endian-dmtbdump2.patch
index 381da29..9023431 100644
--- a/debian/patches/big-endian-dmtbdump2.patch
+++ b/debian/patches/big-endian-dmtbdump2.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/common/dmtbdump2.c
+Index: acpica-unix-20191213/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20191018/source/common/dmtbdump2.c
+--- acpica-unix-20191213.orig/source/common/dmtbdump2.c
++++ acpica-unix-20191213/source/common/dmtbdump2.c
 @@ -75,16 +75,23 @@ AcpiDmDumpIort (
      ACPI_IORT_SMMU          *IortSmmu = NULL;
      UINT32                  Offset;
diff --git a/debian/patches/big-endian-dmtbdump3.patch b/debian/patches/big-endian-dmtbdump3.patch
index 4daf79c..6cf5ebd 100644
--- a/debian/patches/big-endian-dmtbdump3.patch
+++ b/debian/patches/big-endian-dmtbdump3.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/common/dmtbdump3.c
+Index: acpica-unix-20191213/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump3.c
-+++ acpica-unix-20191018/source/common/dmtbdump3.c
+--- acpica-unix-20191213.orig/source/common/dmtbdump3.c
++++ acpica-unix-20191213/source/common/dmtbdump3.c
 @@ -68,9 +68,11 @@ void
  AcpiDmDumpSlic (
      ACPI_TABLE_HEADER       *Table)
diff --git a/debian/patches/big-endian-v2.patch b/debian/patches/big-endian-v2.patch
index 807e534..90bb67e 100644
--- a/debian/patches/big-endian-v2.patch
+++ b/debian/patches/big-endian-v2.patch
@@ -3,10 +3,10 @@ in the original big-endian patch; we try to capture those here.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20191018/source/compiler/asllookup.c
+Index: acpica-unix-20191213/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/asllookup.c
-+++ acpica-unix-20191018/source/compiler/asllookup.c
+--- acpica-unix-20191213.orig/source/compiler/asllookup.c
++++ acpica-unix-20191213/source/compiler/asllookup.c
 @@ -249,7 +249,8 @@ LkIsObjectUsed (
       * ACPI names and are typically not referenced since they are meant
       * to be called by the host OS.
diff --git a/debian/patches/big-endian.patch b/debian/patches/big-endian.patch
index bb12ed6..37d3522 100644
--- a/debian/patches/big-endian.patch
+++ b/debian/patches/big-endian.patch
@@ -8,10 +8,10 @@ To date, this has been critical for the s390x architecture only.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20191018/source/compiler/aslcodegen.c
+Index: acpica-unix-20191213/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20191018/source/compiler/aslcodegen.c
+--- acpica-unix-20191213.orig/source/compiler/aslcodegen.c
++++ acpica-unix-20191213/source/compiler/aslcodegen.c
 @@ -237,16 +237,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -253,10 +253,10 @@ Index: acpica-unix-20191018/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix-20191018/source/compiler/aslopcodes.c
+Index: acpica-unix-20191213/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslopcodes.c
-+++ acpica-unix-20191018/source/compiler/aslopcodes.c
+--- acpica-unix-20191213.orig/source/compiler/aslopcodes.c
++++ acpica-unix-20191213/source/compiler/aslopcodes.c
 @@ -485,6 +485,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
@@ -275,10 +275,10 @@ Index: acpica-unix-20191018/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix-20191018/source/compiler/aslrestype1.c
+Index: acpica-unix-20191213/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype1.c
-+++ acpica-unix-20191018/source/compiler/aslrestype1.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype1.c
++++ acpica-unix-20191213/source/compiler/aslrestype1.c
 @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -475,10 +475,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix-20191018/source/compiler/aslrestype1i.c
+Index: acpica-unix-20191213/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix-20191018/source/compiler/aslrestype1i.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype1i.c
++++ acpica-unix-20191213/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -615,10 +615,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix-20191018/source/compiler/aslrestype2.c
+Index: acpica-unix-20191213/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype2.c
++++ acpica-unix-20191213/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -759,10 +759,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix-20191018/source/compiler/aslrestype2d.c
+Index: acpica-unix-20191213/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2d.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype2d.c
++++ acpica-unix-20191213/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1118,10 +1118,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/compiler/aslrestype2e.c
+Index: acpica-unix-20191213/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2e.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype2e.c
++++ acpica-unix-20191213/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1227,10 +1227,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/compiler/aslrestype2q.c
+Index: acpica-unix-20191213/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2q.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype2q.c
++++ acpica-unix-20191213/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1569,10 +1569,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/compiler/aslrestype2s.c
+Index: acpica-unix-20191213/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2s.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype2s.c
++++ acpica-unix-20191213/source/compiler/aslrestype2s.c
 @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -2038,10 +2038,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix-20191018/source/compiler/aslrestype2w.c
+Index: acpica-unix-20191213/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2w.c
+--- acpica-unix-20191213.orig/source/compiler/aslrestype2w.c
++++ acpica-unix-20191213/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2385,10 +2385,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/include/acmacros.h
+Index: acpica-unix-20191213/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/acmacros.h
-+++ acpica-unix-20191018/source/include/acmacros.h
+--- acpica-unix-20191213.orig/source/include/acmacros.h
++++ acpica-unix-20191213/source/include/acmacros.h
 @@ -98,9 +98,12 @@
                                             ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
                                             ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@@ -2467,10 +2467,10 @@ Index: acpica-unix-20191018/source/include/acmacros.h
  
  #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
  
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
+Index: acpica-unix-20191213/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
+--- acpica-unix-20191213.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191213/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -2490,10 +2490,10 @@ Index: acpica-unix-20191018/source/include/platform/aclinux.h
  #endif /* __KERNEL__ */
  
  #endif /* __ACLINUX_H__ */
-Index: acpica-unix-20191018/source/compiler/aslanalyze.c
+Index: acpica-unix-20191213/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20191018/source/compiler/aslanalyze.c
+--- acpica-unix-20191213.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20191213/source/compiler/aslanalyze.c
 @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
@@ -2512,10 +2512,10 @@ Index: acpica-unix-20191018/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix-20191018/source/compiler/asllookup.c
+Index: acpica-unix-20191213/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/asllookup.c
-+++ acpica-unix-20191018/source/compiler/asllookup.c
+--- acpica-unix-20191213.orig/source/compiler/asllookup.c
++++ acpica-unix-20191213/source/compiler/asllookup.c
 @@ -119,6 +119,7 @@ LkIsObjectUsed (
  {
      ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@@ -2546,10 +2546,10 @@ Index: acpica-unix-20191018/source/compiler/asllookup.c
              AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
                  LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
              return (AE_OK);
-Index: acpica-unix-20191018/source/compiler/aslmain.c
+Index: acpica-unix-20191213/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslmain.c
-+++ acpica-unix-20191018/source/compiler/aslmain.c
+--- acpica-unix-20191213.orig/source/compiler/aslmain.c
++++ acpica-unix-20191213/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -2569,10 +2569,10 @@ Index: acpica-unix-20191018/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix-20191018/source/common/acfileio.c
+Index: acpica-unix-20191213/source/common/acfileio.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/acfileio.c
-+++ acpica-unix-20191018/source/common/acfileio.c
+--- acpica-unix-20191213.orig/source/common/acfileio.c
++++ acpica-unix-20191213/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -2639,10 +2639,10 @@ Index: acpica-unix-20191018/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix-20191018/source/common/dmtable.c
+Index: acpica-unix-20191213/source/common/dmtable.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtable.c
-+++ acpica-unix-20191018/source/common/dmtable.c
+--- acpica-unix-20191213.orig/source/common/dmtable.c
++++ acpica-unix-20191213/source/common/dmtable.c
 @@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@@ -2741,10 +2741,10 @@ Index: acpica-unix-20191018/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix-20191018/source/common/dmtables.c
+Index: acpica-unix-20191213/source/common/dmtables.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtables.c
-+++ acpica-unix-20191018/source/common/dmtables.c
+--- acpica-unix-20191213.orig/source/common/dmtables.c
++++ acpica-unix-20191213/source/common/dmtables.c
 @@ -142,7 +142,9 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -2810,10 +2810,10 @@ Index: acpica-unix-20191018/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
      ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
  
-Index: acpica-unix-20191018/source/compiler/dtfield.c
+Index: acpica-unix-20191213/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dtfield.c
-+++ acpica-unix-20191018/source/compiler/dtfield.c
+--- acpica-unix-20191213.orig/source/compiler/dtfield.c
++++ acpica-unix-20191213/source/compiler/dtfield.c
 @@ -361,7 +361,27 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
@@ -2843,10 +2843,10 @@ Index: acpica-unix-20191018/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix-20191018/source/compiler/dtsubtable.c
+Index: acpica-unix-20191213/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dtsubtable.c
-+++ acpica-unix-20191018/source/compiler/dtsubtable.c
+--- acpica-unix-20191213.orig/source/compiler/dtsubtable.c
++++ acpica-unix-20191213/source/compiler/dtsubtable.c
 @@ -378,6 +378,21 @@ DtSetSubtableLength (
          return;
      }
@@ -2871,10 +2871,10 @@ Index: acpica-unix-20191018/source/compiler/dtsubtable.c
 +        	Subtable->SizeOfLengthField);
 +    }
  }
-Index: acpica-unix-20191018/source/compiler/dttable1.c
+Index: acpica-unix-20191213/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dttable1.c
-+++ acpica-unix-20191018/source/compiler/dttable1.c
+--- acpica-unix-20191213.orig/source/compiler/dttable1.c
++++ acpica-unix-20191213/source/compiler/dttable1.c
 @@ -281,6 +281,8 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
@@ -3246,10 +3246,10 @@ Index: acpica-unix-20191018/source/compiler/dttable1.c
      return (AE_OK);
  }
  
-Index: acpica-unix-20191018/source/compiler/dttable2.c
+Index: acpica-unix-20191213/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dttable2.c
-+++ acpica-unix-20191018/source/compiler/dttable2.c
+--- acpica-unix-20191213.orig/source/compiler/dttable2.c
++++ acpica-unix-20191213/source/compiler/dttable2.c
 @@ -345,7 +345,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
@@ -3360,7 +3360,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      LocalityBuffer = UtLocalCalloc (Localities);
      LocalityListLength = 0;
  
-@@ -1740,6 +1746,7 @@ DtCompileTcpa (
+@@ -1741,6 +1747,7 @@ DtCompileTcpa (
      ACPI_TABLE_TCPA_HDR     *TcpaHeader;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status;
@@ -3368,7 +3368,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -1760,7 +1767,8 @@ DtCompileTcpa (
+@@ -1761,7 +1768,8 @@ DtCompileTcpa (
       */
      TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
  
@@ -3378,7 +3378,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      {
      case ACPI_TCPA_CLIENT_TABLE:
  
-@@ -1808,6 +1816,7 @@ DtCompileTpm2Rev3 (
+@@ -1809,6 +1817,7 @@ DtCompileTpm2Rev3 (
      ACPI_TABLE_TPM23        *Tpm23Header;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
@@ -3386,7 +3386,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm23,
-@@ -1819,7 +1828,8 @@ DtCompileTpm2Rev3 (
+@@ -1820,7 +1829,8 @@ DtCompileTpm2Rev3 (
  
      /* Subtable type depends on the StartMethod */
  
@@ -3396,7 +3396,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      {
      case ACPI_TPM23_ACPI_START_METHOD:
  
-@@ -1866,6 +1876,7 @@ DtCompileTpm2 (
+@@ -1867,6 +1877,7 @@ DtCompileTpm2 (
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
      ACPI_TABLE_HEADER       *Header;
@@ -3404,7 +3404,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1909,7 +1920,8 @@ DtCompileTpm2 (
+@@ -1910,7 +1921,8 @@ DtCompileTpm2 (
  
      /* Subtable type depends on the StartMethod */
  
@@ -3414,7 +3414,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      {
      case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
  
-@@ -2125,6 +2137,9 @@ DtCompileWpbt (
+@@ -2126,6 +2138,9 @@ DtCompileWpbt (
      ACPI_TABLE_WPBT         *Table;
      ACPI_STATUS             Status;
      UINT16                  Length;
@@ -3424,7 +3424,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -2152,7 +2167,16 @@ DtCompileWpbt (
+@@ -2153,7 +2168,16 @@ DtCompileWpbt (
  
      Length = (UINT16) Subtable->TotalLength;
      Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
@@ -3442,10 +3442,10 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix-20191018/source/components/disassembler/dmbuffer.c
+Index: acpica-unix-20191213/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix-20191018/source/components/disassembler/dmbuffer.c
+--- acpica-unix-20191213.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix-20191213/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -3521,10 +3521,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmbuffer.c
  
      NextOp = AcpiPsGetDepthNext (NULL, Op);
      if (!NextOp)
-Index: acpica-unix-20191018/source/components/disassembler/dmopcode.c
+Index: acpica-unix-20191213/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix-20191018/source/components/disassembler/dmopcode.c
+--- acpica-unix-20191213.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix-20191213/source/components/disassembler/dmopcode.c
 @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
      char                        *NameString;
      int                         LastCharIsDigit;
@@ -3595,10 +3595,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmopcode.c
  
              Info->Level += 1;
              Info->MappingOp = Op;
-Index: acpica-unix-20191018/source/components/disassembler/dmresrcl.c
+Index: acpica-unix-20191213/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix-20191018/source/components/disassembler/dmresrcl.c
+--- acpica-unix-20191213.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix-20191213/source/components/disassembler/dmresrcl.c
 @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -3747,10 +3747,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix-20191213/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
+--- acpica-unix-20191213.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix-20191213/source/components/disassembler/dmresrcl2.c
 @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -3974,10 +3974,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix-20191018/source/components/disassembler/dmresrcs.c
+Index: acpica-unix-20191213/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix-20191018/source/components/disassembler/dmresrcs.c
+--- acpica-unix-20191213.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix-20191213/source/components/disassembler/dmresrcs.c
 @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
      UINT32                  Length,
      UINT32                  Level)
@@ -4034,10 +4034,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix-20191018/source/components/dispatcher/dsfield.c
+Index: acpica-unix-20191213/source/components/dispatcher/dsfield.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsfield.c
+--- acpica-unix-20191213.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix-20191213/source/components/dispatcher/dsfield.c
 @@ -324,6 +324,7 @@ AcpiDsGetFieldNames (
      ACPI_STATUS             Status;
      UINT64                  Position;
@@ -4082,10 +4082,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix-20191018/source/components/events/evgpeblk.c
+Index: acpica-unix-20191213/source/components/events/evgpeblk.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/events/evgpeblk.c
-+++ acpica-unix-20191018/source/components/events/evgpeblk.c
+--- acpica-unix-20191213.orig/source/components/events/evgpeblk.c
++++ acpica-unix-20191213/source/components/events/evgpeblk.c
 @@ -380,6 +380,7 @@ AcpiEvCreateGpeBlock (
      ACPI_STATUS             Status;
      ACPI_GPE_BLOCK_INFO     *GpeBlock;
@@ -4118,10 +4118,10 @@ Index: acpica-unix-20191018/source/components/events/evgpeblk.c
          InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
  
      /* Update global count of currently available GPEs */
-Index: acpica-unix-20191018/source/components/hardware/hwregs.c
+Index: acpica-unix-20191213/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20191018/source/components/hardware/hwregs.c
+--- acpica-unix-20191213.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20191213/source/components/hardware/hwregs.c
 @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
       * Address must not be null. A null address also indicates an optional
       * ACPI register that is not supported, so no error message.
@@ -4131,10 +4131,10 @@ Index: acpica-unix-20191018/source/components/hardware/hwregs.c
      if (!(*Address))
      {
          return (AE_BAD_ADDRESS);
-Index: acpica-unix-20191018/source/components/hardware/hwvalid.c
+Index: acpica-unix-20191213/source/components/hardware/hwvalid.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix-20191018/source/components/hardware/hwvalid.c
+--- acpica-unix-20191213.orig/source/components/hardware/hwvalid.c
++++ acpica-unix-20191213/source/components/hardware/hwvalid.c
 @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
      UINT32                  ByteWidth;
      ACPI_IO_ADDRESS         LastAddress;
@@ -4156,10 +4156,10 @@ Index: acpica-unix-20191018/source/components/hardware/hwvalid.c
      {
          ACPI_ERROR ((AE_INFO,
              "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix-20191018/source/components/namespace/nsaccess.c
+Index: acpica-unix-20191213/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix-20191018/source/components/namespace/nsaccess.c
+--- acpica-unix-20191213.orig/source/components/namespace/nsaccess.c
++++ acpica-unix-20191213/source/components/namespace/nsaccess.c
 @@ -349,6 +349,7 @@ AcpiNsLookup (
      UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
      UINT32                  LocalFlags;
@@ -4180,10 +4180,10 @@ Index: acpica-unix-20191018/source/components/namespace/nsaccess.c
                      AcpiUtGetTypeName (ThisNode->Type),
                      AcpiUtGetTypeName (TypeToCheckFor)));
              }
-Index: acpica-unix-20191018/source/components/namespace/nsparse.c
+Index: acpica-unix-20191213/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/namespace/nsparse.c
-+++ acpica-unix-20191018/source/components/namespace/nsparse.c
+--- acpica-unix-20191213.orig/source/components/namespace/nsparse.c
++++ acpica-unix-20191213/source/components/namespace/nsparse.c
 @@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
@@ -4201,10 +4201,10 @@ Index: acpica-unix-20191018/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix-20191018/source/components/tables/tbdata.c
+Index: acpica-unix-20191213/source/components/tables/tbdata.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbdata.c
-+++ acpica-unix-20191018/source/components/tables/tbdata.c
+--- acpica-unix-20191213.orig/source/components/tables/tbdata.c
++++ acpica-unix-20191213/source/components/tables/tbdata.c
 @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
      UINT32                  *TableIndex)
  {
@@ -4223,10 +4223,10 @@ Index: acpica-unix-20191018/source/components/tables/tbdata.c
          if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix-20191018/source/components/tables/tbfadt.c
+Index: acpica-unix-20191213/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20191018/source/components/tables/tbfadt.c
+--- acpica-unix-20191213.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20191213/source/components/tables/tbfadt.c
 @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length)
@@ -4338,10 +4338,10 @@ Index: acpica-unix-20191018/source/components/tables/tbfadt.c
                  "PmRegisters", 0);
          }
      }
-Index: acpica-unix-20191018/source/components/tables/tbfind.c
+Index: acpica-unix-20191213/source/components/tables/tbfind.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbfind.c
-+++ acpica-unix-20191018/source/components/tables/tbfind.c
+--- acpica-unix-20191213.orig/source/components/tables/tbfind.c
++++ acpica-unix-20191213/source/components/tables/tbfind.c
 @@ -108,8 +108,11 @@ AcpiTbFindTable (
      (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
      for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@@ -4355,10 +4355,10 @@ Index: acpica-unix-20191018/source/components/tables/tbfind.c
          {
              /* Not the requested table */
  
-Index: acpica-unix-20191018/source/components/tables/tbprint.c
+Index: acpica-unix-20191213/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbprint.c
-+++ acpica-unix-20191018/source/components/tables/tbprint.c
+--- acpica-unix-20191213.orig/source/components/tables/tbprint.c
++++ acpica-unix-20191213/source/components/tables/tbprint.c
 @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
      ACPI_TABLE_HEADER       *Header)
  {
@@ -4400,10 +4400,10 @@ Index: acpica-unix-20191018/source/components/tables/tbprint.c
      }
  }
  
-Index: acpica-unix-20191018/source/components/tables/tbutils.c
+Index: acpica-unix-20191213/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20191018/source/components/tables/tbutils.c
+--- acpica-unix-20191213.orig/source/components/tables/tbutils.c
++++ acpica-unix-20191213/source/components/tables/tbutils.c
 @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -4463,10 +4463,10 @@ Index: acpica-unix-20191018/source/components/tables/tbutils.c
          {
              AcpiGbl_FadtIndex = TableIndex;
              AcpiTbParseFadt ();
-Index: acpica-unix-20191018/source/components/tables/tbxface.c
+Index: acpica-unix-20191213/source/components/tables/tbxface.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbxface.c
-+++ acpica-unix-20191018/source/components/tables/tbxface.c
+--- acpica-unix-20191213.orig/source/components/tables/tbxface.c
++++ acpica-unix-20191213/source/components/tables/tbxface.c
 @@ -293,8 +293,11 @@ AcpiGetTableHeader (
  
      for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@@ -4480,10 +4480,10 @@ Index: acpica-unix-20191018/source/components/tables/tbxface.c
          {
              continue;
          }
-Index: acpica-unix-20191018/source/components/tables/tbxfload.c
+Index: acpica-unix-20191213/source/components/tables/tbxfload.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbxfload.c
-+++ acpica-unix-20191018/source/components/tables/tbxfload.c
+--- acpica-unix-20191213.orig/source/components/tables/tbxfload.c
++++ acpica-unix-20191213/source/components/tables/tbxfload.c
 @@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
      ACPI_TABLE_DESC         *Table;
      UINT32                  TablesLoaded = 0;
@@ -4503,10 +4503,10 @@ Index: acpica-unix-20191018/source/components/tables/tbxfload.c
           ACPI_FAILURE (AcpiTbValidateTable (Table)))
      {
          Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix-20191018/source/tools/acpiexec/aetables.c
+Index: acpica-unix-20191213/source/tools/acpiexec/aetables.c
 ===================================================================
---- acpica-unix-20191018.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix-20191018/source/tools/acpiexec/aetables.c
+--- acpica-unix-20191213.orig/source/tools/acpiexec/aetables.c
++++ acpica-unix-20191213/source/tools/acpiexec/aetables.c
 @@ -146,21 +146,25 @@ AeInitializeTableHeader (
      char                    *Signature,
      UINT32                  Length)
@@ -4658,10 +4658,10 @@ Index: acpica-unix-20191018/source/tools/acpiexec/aetables.c
      }
  
      return (AE_OK);
-Index: acpica-unix-20191018/source/common/dmswitch.c
+Index: acpica-unix-20191213/source/common/dmswitch.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmswitch.c
-+++ acpica-unix-20191018/source/common/dmswitch.c
+--- acpica-unix-20191213.orig/source/common/dmswitch.c
++++ acpica-unix-20191213/source/common/dmswitch.c
 @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
      ACPI_PARSE_OBJECT_LIST  *Current;
      ACPI_PARSE_OBJECT_LIST  *Previous;
diff --git a/debian/patches/cve-2017-13693.patch b/debian/patches/cve-2017-13693.patch
index b0af7a6..45dea78 100644
--- a/debian/patches/cve-2017-13693.patch
+++ b/debian/patches/cve-2017-13693.patch
@@ -63,10 +63,10 @@ Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175
  source/components/dispatcher/dsutils.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
+Index: acpica-unix-20191213/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsutils.c
+--- acpica-unix-20191213.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix-20191213/source/components/dispatcher/dsutils.c
 @@ -759,6 +759,8 @@ AcpiDsCreateOperands (
      ACPI_PARSE_OBJECT       *Arguments[ACPI_OBJ_NUM_OPERANDS];
      UINT32                  ArgCount = 0;
diff --git a/debian/patches/cve-2017-13694.patch b/debian/patches/cve-2017-13694.patch
index 8d582e0..e24bd13 100644
--- a/debian/patches/cve-2017-13694.patch
+++ b/debian/patches/cve-2017-13694.patch
@@ -130,10 +130,10 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94
  source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
  1 file changed, 16 insertions(+), 28 deletions(-)
 
-Index: acpica-unix-20191018/source/components/parser/psobject.c
+Index: acpica-unix-20191213/source/components/parser/psobject.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/parser/psobject.c
-+++ acpica-unix-20191018/source/components/parser/psobject.c
+--- acpica-unix-20191213.orig/source/components/parser/psobject.c
++++ acpica-unix-20191213/source/components/parser/psobject.c
 @@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
      ACPI_PARSE_OBJECT       *Op,
      ACPI_STATUS             Status)
diff --git a/debian/patches/cve-2017-13695.patch b/debian/patches/cve-2017-13695.patch
index 5f77aaf..a1066af 100644
--- a/debian/patches/cve-2017-13695.patch
+++ b/debian/patches/cve-2017-13695.patch
@@ -67,10 +67,10 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
  source/components/namespace/nseval.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-Index: acpica-unix-20191018/source/components/namespace/nseval.c
+Index: acpica-unix-20191213/source/components/namespace/nseval.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/namespace/nseval.c
-+++ acpica-unix-20191018/source/components/namespace/nseval.c
+--- acpica-unix-20191213.orig/source/components/namespace/nseval.c
++++ acpica-unix-20191213/source/components/namespace/nseval.c
 @@ -329,6 +329,16 @@ AcpiNsEvaluate (
              Info->ReturnObject = NULL;
          }
diff --git a/debian/patches/f23-harden.patch b/debian/patches/f23-harden.patch
index c719d07..ac277f3 100644
--- a/debian/patches/f23-harden.patch
+++ b/debian/patches/f23-harden.patch
@@ -8,10 +8,10 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix-20191018/generate/unix/Makefile.config
+Index: acpica-unix-20191213/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20191018.orig/generate/unix/Makefile.config
-+++ acpica-unix-20191018/generate/unix/Makefile.config
+--- acpica-unix-20191213.orig/generate/unix/Makefile.config
++++ acpica-unix-20191213/generate/unix/Makefile.config
 @@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
@@ -21,10 +21,10 @@ Index: acpica-unix-20191018/generate/unix/Makefile.config
  CFLAGS += \
      -D$(HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix-20191018/generate/unix/iasl/Makefile
+Index: acpica-unix-20191213/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix-20191018.orig/generate/unix/iasl/Makefile
-+++ acpica-unix-20191018/generate/unix/iasl/Makefile
+--- acpica-unix-20191213.orig/generate/unix/iasl/Makefile
++++ acpica-unix-20191213/generate/unix/iasl/Makefile
 @@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # 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.
diff --git a/debian/patches/fix_ftbfs_debian-hurd.patch b/debian/patches/fix_ftbfs_debian-hurd.patch
index b5a8146..4f0cd5b 100644
--- a/debian/patches/fix_ftbfs_debian-hurd.patch
+++ b/debian/patches/fix_ftbfs_debian-hurd.patch
@@ -3,11 +3,11 @@ Fix FTBFS on hurd-i386.
  source/include/platform/acenv.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix-20191018/source/include/platform/acenv.h
+Index: acpica-unix-20191213/source/include/platform/acenv.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/acenv.h
-+++ acpica-unix-20191018/source/include/platform/acenv.h
-@@ -185,7 +185,7 @@
+--- acpica-unix-20191213.orig/source/include/platform/acenv.h
++++ acpica-unix-20191213/source/include/platform/acenv.h
+@@ -200,7 +200,7 @@
  
  #endif
  
diff --git a/debian/patches/fix_ftbfs_debian-kfreebsd.patch b/debian/patches/fix_ftbfs_debian-kfreebsd.patch
index 99a369b..2a57513 100644
--- a/debian/patches/fix_ftbfs_debian-kfreebsd.patch
+++ b/debian/patches/fix_ftbfs_debian-kfreebsd.patch
@@ -22,11 +22,11 @@ Thanks in advance
  source/include/platform/acenv.h |    3 +++
  1 file changed, 3 insertions(+)
 
-Index: acpica-unix-20191018/source/include/platform/acenv.h
+Index: acpica-unix-20191213/source/include/platform/acenv.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/acenv.h
-+++ acpica-unix-20191018/source/include/platform/acenv.h
-@@ -163,6 +163,9 @@
+--- acpica-unix-20191213.orig/source/include/platform/acenv.h
++++ acpica-unix-20191213/source/include/platform/acenv.h
+@@ -178,6 +178,9 @@
  #endif
  
  /*! [Begin] no source code translation */
diff --git a/debian/patches/int-format.patch b/debian/patches/int-format.patch
index bf0b05c..81df884 100644
--- a/debian/patches/int-format.patch
+++ b/debian/patches/int-format.patch
@@ -21,11 +21,11 @@ From: Al Stone <ahs3@redhat.com>
  source/components/utilities/utownerid.c |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix-20191018/source/compiler/aslerror.c
+Index: acpica-unix-20191213/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslerror.c
-+++ acpica-unix-20191018/source/compiler/aslerror.c
-@@ -898,7 +898,7 @@ AslLogNewError (
+--- acpica-unix-20191213.orig/source/compiler/aslerror.c
++++ acpica-unix-20191213/source/compiler/aslerror.c
+@@ -907,7 +907,7 @@ AslLogNewError (
      AslGbl_ExceptionCount[ModifiedLevel]++;
      if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
      {
@@ -34,10 +34,10 @@ Index: acpica-unix-20191018/source/compiler/aslerror.c
  
          AslGbl_SourceLine = 0;
          AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix-20191018/source/compiler/aslopt.c
+Index: acpica-unix-20191213/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslopt.c
-+++ acpica-unix-20191018/source/compiler/aslopt.c
+--- acpica-unix-20191213.orig/source/compiler/aslopt.c
++++ acpica-unix-20191213/source/compiler/aslopt.c
 @@ -583,7 +583,7 @@ OptOptimizeNamePath (
      }
  
@@ -47,10 +47,10 @@ Index: acpica-unix-20191018/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix-20191018/source/compiler/aslprepkg.c
+Index: acpica-unix-20191213/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslprepkg.c
-+++ acpica-unix-20191018/source/compiler/aslprepkg.c
+--- acpica-unix-20191213.orig/source/compiler/aslprepkg.c
++++ acpica-unix-20191213/source/compiler/aslprepkg.c
 @@ -309,7 +309,7 @@ ApCheckPackage (
  
          if (Count & 1)
@@ -60,10 +60,10 @@ Index: acpica-unix-20191018/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix-20191018/source/components/debugger/dbexec.c
+Index: acpica-unix-20191213/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/debugger/dbexec.c
-+++ acpica-unix-20191018/source/components/debugger/dbexec.c
+--- acpica-unix-20191213.orig/source/components/debugger/dbexec.c
++++ acpica-unix-20191213/source/components/debugger/dbexec.c
 @@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible buffer overflow within AML Debugger "
@@ -73,10 +73,10 @@ Index: acpica-unix-20191018/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix-20191213/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
+--- acpica-unix-20191213.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix-20191213/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -95,10 +95,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
+Index: acpica-unix-20191213/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsutils.c
+--- acpica-unix-20191213.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix-20191213/source/components/dispatcher/dsutils.c
 @@ -786,7 +786,7 @@ AcpiDsCreateOperands (
      }
  
@@ -108,10 +108,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix-20191018/source/components/dispatcher/dswscope.c
+Index: acpica-unix-20191213/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix-20191018/source/components/dispatcher/dswscope.c
+--- acpica-unix-20191213.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix-20191213/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -130,10 +130,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix-20191018/source/components/events/evgpe.c
+Index: acpica-unix-20191213/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/events/evgpe.c
-+++ acpica-unix-20191018/source/components/events/evgpe.c
+--- acpica-unix-20191213.orig/source/components/events/evgpe.c
++++ acpica-unix-20191213/source/components/events/evgpe.c
 @@ -488,7 +488,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -143,10 +143,10 @@ Index: acpica-unix-20191018/source/components/events/evgpe.c
                      GpeRegisterInfo->EnableForRun,
                      GpeRegisterInfo->EnableForWake));
                  continue;
-Index: acpica-unix-20191018/source/components/executer/exdump.c
+Index: acpica-unix-20191213/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exdump.c
-+++ acpica-unix-20191018/source/components/executer/exdump.c
+--- acpica-unix-20191213.orig/source/components/executer/exdump.c
++++ acpica-unix-20191213/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -156,10 +156,10 @@ Index: acpica-unix-20191018/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix-20191018/source/components/executer/exfldio.c
+Index: acpica-unix-20191213/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exfldio.c
-+++ acpica-unix-20191018/source/components/executer/exfldio.c
+--- acpica-unix-20191213.orig/source/components/executer/exfldio.c
++++ acpica-unix-20191213/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -171,10 +171,10 @@ Index: acpica-unix-20191018/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix-20191018/source/components/executer/exnames.c
+Index: acpica-unix-20191213/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exnames.c
-+++ acpica-unix-20191018/source/components/executer/exnames.c
+--- acpica-unix-20191213.orig/source/components/executer/exnames.c
++++ acpica-unix-20191213/source/components/executer/exnames.c
 @@ -237,7 +237,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -193,10 +193,10 @@ Index: acpica-unix-20191018/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix-20191018/source/components/hardware/hwregs.c
+Index: acpica-unix-20191213/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20191018/source/components/hardware/hwregs.c
+--- acpica-unix-20191213.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20191213/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -206,10 +206,10 @@ Index: acpica-unix-20191018/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix-20191018/source/components/tables/tbfadt.c
+Index: acpica-unix-20191213/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20191018/source/components/tables/tbfadt.c
+--- acpica-unix-20191213.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20191213/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -237,10 +237,10 @@ Index: acpica-unix-20191018/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix-20191018/source/components/tables/tbxfroot.c
+Index: acpica-unix-20191213/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix-20191018/source/components/tables/tbxfroot.c
+--- acpica-unix-20191213.orig/source/components/tables/tbxfroot.c
++++ acpica-unix-20191213/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -268,10 +268,10 @@ Index: acpica-unix-20191018/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix-20191018/source/components/utilities/utownerid.c
+Index: acpica-unix-20191213/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/utilities/utownerid.c
-+++ acpica-unix-20191018/source/components/utilities/utownerid.c
+--- acpica-unix-20191213.orig/source/components/utilities/utownerid.c
++++ acpica-unix-20191213/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
diff --git a/debian/patches/mips-be-fix.patch b/debian/patches/mips-be-fix.patch
index 0e7fa91..dd531de 100644
--- a/debian/patches/mips-be-fix.patch
+++ b/debian/patches/mips-be-fix.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/compiler/aslparseop.c
+Index: acpica-unix-20191213/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslparseop.c
-+++ acpica-unix-20191018/source/compiler/aslparseop.c
+--- acpica-unix-20191213.orig/source/compiler/aslparseop.c
++++ acpica-unix-20191213/source/compiler/aslparseop.c
 @@ -283,7 +283,16 @@ TrCreateValuedLeafOp (
  
  
@@ -20,10 +20,10 @@ Index: acpica-unix-20191018/source/compiler/aslparseop.c
  
      DbgPrint (ASL_PARSE_OUTPUT,
          "\nCreateValuedLeafOp  Ln/Col %u/%u NewOp %p  "
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
+Index: acpica-unix-20191213/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
+--- acpica-unix-20191213.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191213/source/include/platform/aclinux.h
 @@ -232,10 +232,8 @@
  #endif
  
diff --git a/debian/patches/ppc64le.patch b/debian/patches/ppc64le.patch
index 228f9d9..667a106 100644
--- a/debian/patches/ppc64le.patch
+++ b/debian/patches/ppc64le.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
+Index: acpica-unix-20191213/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
+--- acpica-unix-20191213.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191213/source/include/platform/aclinux.h
 @@ -233,9 +233,11 @@
  #define __cdecl
  #endif
diff --git a/debian/patches/ptr-cast.patch b/debian/patches/ptr-cast.patch
index d052057..6112cc8 100644
--- a/debian/patches/ptr-cast.patch
+++ b/debian/patches/ptr-cast.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/components/tables/tbutils.c
+Index: acpica-unix-20191213/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20191018/source/components/tables/tbutils.c
+--- acpica-unix-20191213.orig/source/components/tables/tbutils.c
++++ acpica-unix-20191213/source/components/tables/tbutils.c
 @@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -32,10 +32,10 @@ Index: acpica-unix-20191018/source/components/tables/tbutils.c
      }
  }
  
-Index: acpica-unix-20191018/source/compiler/aslparseop.c
+Index: acpica-unix-20191213/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslparseop.c
-+++ acpica-unix-20191018/source/compiler/aslparseop.c
+--- acpica-unix-20191213.orig/source/compiler/aslparseop.c
++++ acpica-unix-20191213/source/compiler/aslparseop.c
 @@ -287,7 +287,11 @@ TrCreateValuedLeafOp (
          ParseOpcode == PARSEOP_NAMESEG ||
          ParseOpcode == PARSEOP_STRING_LITERAL)
diff --git a/debian/patches/series b/debian/patches/series
index 0f140ac..54bd3f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,4 +22,3 @@ cve-2017-13695.patch
 str-trunc-warn.patch
 ptr-cast.patch
 aslcodegen.patch
-badexit.patch
diff --git a/debian/patches/simple-64bit.patch b/debian/patches/simple-64bit.patch
index 80c771f..e944d71 100644
--- a/debian/patches/simple-64bit.patch
+++ b/debian/patches/simple-64bit.patch
@@ -3,10 +3,10 @@ Description: Stop listing all 64bit architectures
  64bit architectures.
 Author: Adrian Bunk <bunk@debian.org>
 
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
+Index: acpica-unix-20191213/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
+--- acpica-unix-20191213.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191213/source/include/platform/aclinux.h
 @@ -215,9 +215,7 @@
  #define ACPI_FLUSH_CPU_CACHE()
  #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
diff --git a/debian/patches/str-trunc-warn.patch b/debian/patches/str-trunc-warn.patch
index a62a34a..4cdf332 100644
--- a/debian/patches/str-trunc-warn.patch
+++ b/debian/patches/str-trunc-warn.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/compiler/aslanalyze.c
+Index: acpica-unix-20191213/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20191018/source/compiler/aslanalyze.c
+--- acpica-unix-20191213.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20191213/source/compiler/aslanalyze.c
 @@ -355,11 +355,16 @@ AnCheckMethodReturnValue (
           */
          if (ThisNodeBtype != 0)
@@ -21,10 +21,10 @@ Index: acpica-unix-20191018/source/compiler/aslanalyze.c
          }
      }
  }
-Index: acpica-unix-20191018/source/compiler/aslpredef.c
+Index: acpica-unix-20191213/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslpredef.c
-+++ acpica-unix-20191018/source/compiler/aslpredef.c
+--- acpica-unix-20191213.orig/source/compiler/aslpredef.c
++++ acpica-unix-20191213/source/compiler/aslpredef.c
 @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
          if (MethodInfo->NumReturnNoValue &&
              ThisName->Info.ExpectedBtypes)
@@ -84,10 +84,10 @@ Index: acpica-unix-20191018/source/compiler/aslpredef.c
      return (AE_TYPE);
  }
  
-Index: acpica-unix-20191018/source/compiler/aslwalks.c
+Index: acpica-unix-20191213/source/compiler/aslwalks.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslwalks.c
-+++ acpica-unix-20191018/source/compiler/aslwalks.c
+--- acpica-unix-20191213.orig/source/compiler/aslwalks.c
++++ acpica-unix-20191213/source/compiler/aslwalks.c
 @@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
              else if (!CommonBtypes)
              {
diff --git a/debian/patches/template.patch b/debian/patches/template.patch
index 662216a..01805f1 100644
--- a/debian/patches/template.patch
+++ b/debian/patches/template.patch
@@ -7,10 +7,10 @@ From: Al Stone <ahs3@redhat.com>
  tests/templates/Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix-20191018/tests/templates/Makefile
+Index: acpica-unix-20191213/tests/templates/Makefile
 ===================================================================
---- acpica-unix-20191018.orig/tests/templates/Makefile
-+++ acpica-unix-20191018/tests/templates/Makefile
+--- acpica-unix-20191213.orig/tests/templates/Makefile
++++ acpica-unix-20191213/tests/templates/Makefile
 @@ -26,7 +26,7 @@ $(aml_obj): %.aml:  %.asl
  
  
diff --git a/debian/patches/unaligned.patch b/debian/patches/unaligned.patch
index f1f35a0..51fc124 100644
--- a/debian/patches/unaligned.patch
+++ b/debian/patches/unaligned.patch
@@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  source/include/actypes.h              |   26 +++++++++++++-------------
  3 files changed, 32 insertions(+), 21 deletions(-)
 
-Index: acpica-unix-20191018/source/components/executer/exoparg2.c
+Index: acpica-unix-20191213/source/components/executer/exoparg2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exoparg2.c
-+++ acpica-unix-20191018/source/components/executer/exoparg2.c
+--- acpica-unix-20191213.orig/source/components/executer/exoparg2.c
++++ acpica-unix-20191213/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;
@@ -58,10 +58,10 @@ Index: acpica-unix-20191018/source/components/executer/exoparg2.c
          break;
  
      case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix-20191018/source/include/actypes.h
+Index: acpica-unix-20191213/source/include/actypes.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/actypes.h
-+++ acpica-unix-20191018/source/include/actypes.h
+--- acpica-unix-20191213.orig/source/include/actypes.h
++++ acpica-unix-20191213/source/include/actypes.h
 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
   */
  #define ACPI_THREAD_ID                  UINT64
diff --git a/debian/rules b/debian/rules
index 6d2479e..421d2a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPP
 
 DESTDIR ?= debian/acpica-tools
 
-VERSION = 20191018
+VERSION = 20191213
 
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)