From 79a549f21170276cf1634b3599b89f5d8d2485e1 Mon Sep 17 00:00:00 2001
From: "Nick L. Petroni, Jr" <npetroni@volexity.com>
Date: Sun, 16 Jan 2022 15:34:03 -0500
Subject: [PATCH 1/5] use doc/requirements.txt when building with readthedocs

---
 .readthedocs.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 764bb5a1a..4d21d9b40 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -16,7 +16,4 @@ formats: all
 python:
   version: 3.7
   install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - doc
+    - requirements: doc/requirements.txt

From 374542d544265b650da4f516e17ce60e7cdff58e Mon Sep 17 00:00:00 2001
From: Paul Kermann <paulkermann@tutanota.com>
Date: Wed, 9 Feb 2022 10:40:37 +0200
Subject: [PATCH 2/5] Added data_offset to pattern matching result, fixes pdb
 scanning bug

---
 volatility3/framework/symbols/windows/pdbutil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/volatility3/framework/symbols/windows/pdbutil.py b/volatility3/framework/symbols/windows/pdbutil.py
index 4c3788a56..ce492831e 100644
--- a/volatility3/framework/symbols/windows/pdbutil.py
+++ b/volatility3/framework/symbols/windows/pdbutil.py
@@ -357,4 +357,4 @@ class PdbSignatureScanner(interfaces.layers.ScannerInterface):
 
                 guid = (16 * '{:02X}').format(g0, g1, g2, g3, g4, g5, g6, g7, g8, g9, ga, gb, gc, gd, ge, gf)
                 if match.start(0) < self.chunk_size:
-                    yield (guid, a, pdb_name, match.start(0))
+                    yield (guid, a, pdb_name, data_offset + match.start(0))

From de87fd0b226cfca60395f9f2e67248d7e343e770 Mon Sep 17 00:00:00 2001
From: trashcan122 <ilay122@gmail.com>
Date: Wed, 9 Feb 2022 16:30:40 +0200
Subject: [PATCH 3/5] fix pdb mz parsing

---
 volatility3/framework/symbols/windows/pdbutil.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/volatility3/framework/symbols/windows/pdbutil.py b/volatility3/framework/symbols/windows/pdbutil.py
index ce492831e..cc7b22e03 100644
--- a/volatility3/framework/symbols/windows/pdbutil.py
+++ b/volatility3/framework/symbols/windows/pdbutil.py
@@ -131,8 +131,14 @@ class PDBUtility(interfaces.configuration.VersionableInterface):
         # Check it is actually the MZ header
         if mz_sig != b"MZ":
             return None
-
-        nt_header_start = ord(layer.read(offset + 0x3C, 1))
+        
+        nt_header_start = struct.unpack("<I", layer.read(offset + 0x3C, 4))[0]
+        pe_sig = layer.read(offset + nt_header_start, 2)
+        
+        # Check it is actually the Nt Headers
+        if pe_sig != b"PE":
+            return None
+        
         optional_header_size = struct.unpack('<H', layer.read(offset + nt_header_start + 0x14, 2))[0]
         # Just enough to tell us the max size
         pe_header = layer.read(offset, nt_header_start + 0x16 + optional_header_size)

From 8376d1ca9e7d713bf69e937cd105a450fec3d2a9 Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Wed, 9 Feb 2022 20:18:04 +0000
Subject: [PATCH 4/5] Core: Prepare 2.0.1 release

---
 volatility3/framework/constants/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/volatility3/framework/constants/__init__.py b/volatility3/framework/constants/__init__.py
index 23598837b..4ce2dbe2d 100644
--- a/volatility3/framework/constants/__init__.py
+++ b/volatility3/framework/constants/__init__.py
@@ -40,7 +40,7 @@ BANG = "!"
 # We use the SemVer 2.0.0 versioning scheme
 VERSION_MAJOR = 2  # Number of releases of the library with a breaking change
 VERSION_MINOR = 0  # Number of changes that only add to the interface
-VERSION_PATCH = 0  # Number of changes that do not change the interface
+VERSION_PATCH = 1  # Number of changes that do not change the interface
 VERSION_SUFFIX = ""
 
 # TODO: At version 2.0.0, remove the symbol_shift feature

From 59102aae2a165a3ea383f1e28b9713257a6e53de Mon Sep 17 00:00:00 2001
From: "Nick L. Petroni, Jr" <npetroni@volexity.com>
Date: Sun, 16 Jan 2022 17:32:02 -0500
Subject: [PATCH 5/5] update doc copyright

---
 doc/source/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index eab5c2c94..3be41db5d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,4 +1,4 @@
-# This file is Copyright 2019 Volatility Foundation and licensed under the Volatility Software License 1.0
+# This file is Copyright 2022 Volatility Foundation and licensed under the Volatility Software License 1.0
 # which is available at https://www.volatilityfoundation.org/license/vsl-v1.0
 #
 #
@@ -126,7 +126,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Volatility 3'
-copyright = '2012-2019, Volatility Foundation'
+copyright = '2012-2022, Volatility Foundation'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the