Sync with upstream (c7694e490a716dc667657c406f61dd278652557f)

4 files changed, 33 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3772a85d713..c9b4923e3554 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = meanalyzer-git
 	pkgdesc = Intel Management Engine firmware analysis tool
-	pkgver = 1.185.0.r227.r0.g8d9f6aa
+	pkgver = r269.r0.gc7694e4
 	pkgrel = 1
 	url = https://github.com/platomav/MEAnalyzer
 	arch = any
@@ -14,8 +14,7 @@ pkgbase = meanalyzer-git
 	source = change-mea_dir.patch
 	source = db-location.patch
 	sha256sums = SKIP
-	sha256sums = 879049a04596e87362e32bbc890dc7f6c9ad67ed59ec3fc1502a4265cdf7d58e
-	sha256sums = 80e0afb63393a1b6bcff85caf378058bff2f6cfe8fbc23835a555bf682cdc83b
+	sha256sums = 8d77dc46728f5dc3b396910f2626f3508b28cfd76de77890e27e3c55b1c09e85
+	sha256sums = b99918610c6b6d949593c0e02af003010d7f5a46846131d8cb83c1969e20510e
 
 pkgname = meanalyzer-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 6e7eb19d5c66..456bdba45f31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Bailey Fox <bfox200012@gmail.com>
 
 pkgname=meanalyzer-git
-pkgver=1.185.0.r227.r0.g8d9f6aa
+pkgver=r269.r0.gc7694e4
 pkgrel=1
 pkgdesc='Intel Management Engine firmware analysis tool'
 arch=('any')
@@ -16,8 +16,8 @@ source=("${pkgname}::git+${url}#branch=${_branch}"
         'change-mea_dir.patch'
         'db-location.patch')
 sha256sums=('SKIP'
-            '879049a04596e87362e32bbc890dc7f6c9ad67ed59ec3fc1502a4265cdf7d58e'
-            '80e0afb63393a1b6bcff85caf378058bff2f6cfe8fbc23835a555bf682cdc83b')
+            '8d77dc46728f5dc3b396910f2626f3508b28cfd76de77890e27e3c55b1c09e85'
+            'b99918610c6b6d949593c0e02af003010d7f5a46846131d8cb83c1969e20510e')
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
diff --git a/change-mea_dir.patch b/change-mea_dir.patch
index fe28d7154dad..5144c06d2343 100644
--- a/change-mea_dir.patch
+++ b/change-mea_dir.patch
@@ -1,11 +1,11 @@
 --- MEA.py
 +++ MEA.py
-@@ -9005,7 +9005,7 @@ cse_known_bad_hashes = [
- param = MEA_Param(mea_os, sys.argv)

- 

- # Get script location

--mea_dir = get_script_dir()

-+mea_dir = os.getcwd()

- 

- # Enumerate parameter input

- arg_num = len(sys.argv)

+@@ -10829,7 +10829,7 @@ ftbl_efst_plat = {
+ param = MEA_Param(sys.argv)
+
+ # Get script location
+-mea_dir = get_script_dir()
++mea_dir = os.getcwd()
+
+ # Enumerate parameter input
+ arg_num = len(sys.argv)
diff --git a/db-location.patch b/db-location.patch
index 8ca052a7727f..a94d6a5739b3 100644
--- a/db-location.patch
+++ b/db-location.patch
@@ -1,20 +1,20 @@
 --- MEA.py
 +++ MEA.py
-@@ -7654,7 +7654,7 @@ def cse_huffman_dictionary_load(cse_variant, cse_major, cse_minor, verbosity) :
- 	HUFFMAN_SYMBOLS = {}

- 	HUFFMAN_UNKNOWNS = {}

- 	mapping_types = {'code' : 0x20, 'data' : 0x60}

--	huffman_dict = os.path.join(mea_dir, 'Huffman.dat')

-+	huffman_dict = '/usr/lib/meanalyzer/Huffman.dat'

- 	

- 	# Check if Huffman dictionary version is supported

- 	if (cse_variant,cse_major) in [('CSME',11),('CSSPS',4)] or (cse_variant,cse_major,cse_minor) in [('CSME',14,5)] : dict_version = 11

-@@ -9011,7 +9011,7 @@ mea_dir = get_script_dir()
- arg_num = len(sys.argv)

- 

- # Set dependencies paths

--mea_db_path = os.path.join(mea_dir, 'MEA.dat')

-+mea_db_path = '/usr/lib/meanalyzer/MEA.dat'

- 

- # Check if dependencies exist

- depend_db = os.path.isfile(mea_db_path)

+@@ -9303,7 +9303,7 @@ def cse_huffman_dictionary_load(cse_variant, cse_major, cse_minor, verbosity) :
+ 	HUFFMAN_SYMBOLS = {}
+ 	HUFFMAN_UNKNOWNS = {}
+ 	mapping_types = {'code' : 0x20, 'data' : 0x60}
+-	huffman_dict = os.path.join(mea_dir, 'Huffman.dat')
++	huffman_dict = '/usr/lib/meanalyzer/Huffman.dat'
+ 	
+ 	# Message Verbosity: All | Error | None
+ 	
+@@ -10835,7 +10835,7 @@ mea_dir = get_script_dir()
+ arg_num = len(sys.argv)
+ 
+ # Set dependencies paths
+-mea_db_path = os.path.join(mea_dir, 'MEA.dat')
++mea_db_path = '/usr/lib/meanalyzer/MEA.dat'
+ 
+ # Initialize & Start background Thread for MEA & DB update check
+ thread_update = Thread_With_Result(target=mea_upd_check, args=(mea_db_path,), daemon=True)