Use symlinks instead of patching files (thanks @m3thodic)

4 files changed, 9 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9b4923e3554..b718018992a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = meanalyzer-git
 	pkgdesc = Intel Management Engine firmware analysis tool
-	pkgver = r269.r0.gc7694e4
+	pkgver = 1.282.0.r295.r0.g5f7ae54
 	pkgrel = 1
 	url = https://github.com/platomav/MEAnalyzer
 	arch = any
@@ -11,10 +11,6 @@ pkgbase = meanalyzer-git
 	depends = python-crccheck
 	depends = python-pltable
 	source = meanalyzer-git::git+https://github.com/platomav/MEAnalyzer#branch=master
-	source = change-mea_dir.patch
-	source = db-location.patch
 	sha256sums = SKIP
-	sha256sums = 8d77dc46728f5dc3b396910f2626f3508b28cfd76de77890e27e3c55b1c09e85
-	sha256sums = b99918610c6b6d949593c0e02af003010d7f5a46846131d8cb83c1969e20510e
 
 pkgname = meanalyzer-git
diff --git a/PKGBUILD b/PKGBUILD
index 456bdba45f31..325a134c75f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Alex Sarum <rum.274.4 at gmail dot com>
 # Contributor: Gavin Lloyd <gavinhungry@gmail.com>
 # Contributor: Bailey Fox <bfox200012@gmail.com>
+# Contributor: Tony Lambiris <tony@libpcap.net>
 
 pkgname=meanalyzer-git
-pkgver=r269.r0.gc7694e4
+pkgver=1.282.0.r295.r0.g5f7ae54
 pkgrel=1
 pkgdesc='Intel Management Engine firmware analysis tool'
 arch=('any')
@@ -12,12 +13,8 @@ _branch='master'
 license=('GPL3')
 depends=('python-colorama' 'python-crccheck' 'python-pltable')
 makedepends=('dos2unix' 'git')
-source=("${pkgname}::git+${url}#branch=${_branch}"
-        'change-mea_dir.patch'
-        'db-location.patch')
-sha256sums=('SKIP'
-            '8d77dc46728f5dc3b396910f2626f3508b28cfd76de77890e27e3c55b1c09e85'
-            'b99918610c6b6d949593c0e02af003010d7f5a46846131d8cb83c1969e20510e')
+source=("${pkgname}::git+${url}#branch=${_branch}")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
@@ -26,8 +23,6 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${pkgname}"
-  patch -p0 --binary < ../db-location.patch
-  patch -p0 --binary < ../change-mea_dir.patch
   dos2unix MEA.py
 }
 
@@ -35,5 +30,8 @@ package() {
   cd "${srcdir}/${pkgname}"
   install -Dm644 MEA.dat "${pkgdir}"/usr/lib/meanalyzer/MEA.dat
   install -Dm644 Huffman.dat "${pkgdir}"/usr/lib/meanalyzer/Huffman.dat
-  install -Dm755 MEA.py "${pkgdir}"/usr/bin/meanalyzer
+  install -Dm755 MEA.py "${pkgdir}"/usr/lib/meanalyzer/MEA.py
+
+  install -dm755 "${pkgdir}"/usr/bin
+  ln -s /usr/lib/meanalyzer/MEA.py "${pkgdir}"/usr/bin/meanalyzer
 }
diff --git a/change-mea_dir.patch b/change-mea_dir.patch
deleted file mode 100644
index 5144c06d2343..000000000000
--- a/change-mea_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MEA.py
-+++ MEA.py
-@@ -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
deleted file mode 100644
index a94d6a5739b3..000000000000
--- a/db-location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- MEA.py
-+++ MEA.py
-@@ -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)