From 0acbcbbf5c18c839bd4532605f856b1a1d9b7c5c Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Wed, 4 Aug 2021 18:27:54 +0000
Subject: [PATCH] Remove ZIPR_INSTALL variable in favor of ZIPR_PLUGIN_PATH
---
IdaProServer | 2 +-
SConscript | 1 -
SConstruct | 2 +-
SMPStaticAnalyzer | 2 +-
irdb-libs/plugins_install/zipr.sh | 2 +-
pedi | 2 +-
set_env_vars | 2 +-
tools/ps_analyze.sh | 3 +--
zipr | 2 +-
zipr_callbacks | 2 +-
zipr_install | 2 +-
zipr_push64_reloc_plugin | 2 +-
zipr_unpin_plugin | 2 +-
13 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/IdaProServer b/IdaProServer
index cb67db40b..59abf408f 160000
--- a/IdaProServer
+++ b/IdaProServer
@@ -1 +1 @@
-Subproject commit cb67db40bac86cabef2e769afa6b8f7ec613640a
+Subproject commit 59abf408fdfc83000c2bf77670b06f5f80bed549
diff --git a/SConscript b/SConscript
index a9066ef0a..596fbf2d4 100644
--- a/SConscript
+++ b/SConscript
@@ -29,7 +29,6 @@ libsmpsa= SConscript("SMPStaticAnalyzer/SConscript")
libirdbdeep=SConscript("irdb-libs/SConscript.deep")
Depends(libirdbdeep,libsmpsa)
-print("Zipr install is "+env['ZIPR_INSTALL'])
Export('env')
diff --git a/SConstruct b/SConstruct
index ab0e29eac..a5c1c74eb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -17,7 +17,7 @@ env.Replace(SMPSA_HOME=os.environ['SMPSA_HOME'])
env.Replace(PEASOUP_HOME=os.environ['PEASOUP_HOME'])
env.Replace(debug=ARGUMENTS.get("debug",0))
env.Replace(PEDI_HOME=os.environ['PEDI_HOME'])
-env.Replace(ZIPR_INSTALL=os.environ['ZIPR_INSTALL'])
+env.Replace(ZIPR_PLUGIN_PATH=os.environ['ZIPR_PLUGIN_PATH'])
diff --git a/SMPStaticAnalyzer b/SMPStaticAnalyzer
index e1fbb4ee3..a032cd0f6 160000
--- a/SMPStaticAnalyzer
+++ b/SMPStaticAnalyzer
@@ -1 +1 @@
-Subproject commit e1fbb4ee3957dbdd2d04f6bfd11c17916b552079
+Subproject commit a032cd0f6ff6e3efb63f8e46e5ebb6c57c93347b
diff --git a/irdb-libs/plugins_install/zipr.sh b/irdb-libs/plugins_install/zipr.sh
index e37c8e25d..42cecd325 100755
--- a/irdb-libs/plugins_install/zipr.sh
+++ b/irdb-libs/plugins_install/zipr.sh
@@ -4,4 +4,4 @@ cloneid=$1
shift
other_opts="$@"
-(set -x ; LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ZIPR_INSTALL/lib $ZIPR_INSTALL/bin/zipr.exe --variant $cloneid --zipr:objcopy $PS_OBJCOPY $other_opts)
+(set -x ; LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PEASOUP_HOME/zipr_install/lib $PEASOUP_HOME/zipr_install/bin/zipr.exe --variant $cloneid --zipr:objcopy $PS_OBJCOPY $other_opts)
diff --git a/pedi b/pedi
index b73c76a18..6cbb68d1b 160000
--- a/pedi
+++ b/pedi
@@ -1 +1 @@
-Subproject commit b73c76a183d86142b039afaa0885f004f8be3572
+Subproject commit 6cbb68d1b5bda03f8f5fa91d2fe6d181594e3bc6
diff --git a/set_env_vars b/set_env_vars
index 8e5f761b7..c791f3443 100755
--- a/set_env_vars
+++ b/set_env_vars
@@ -37,7 +37,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZEST_RUNTIME/lib32:$ZEST_RUNTIME/lib64
# deprecated: going away soon.
export SECURITY_TRANSFORMS_HOME=$PEASOUP_HOME/irdb-libs
-export ZIPR_INSTALL=$PEASOUP_HOME/zipr_install
+export ZIPR_PLUGIN_PATH=$PEASOUP_HOME/zipr_install/plugins
export PEASOUP_UMBRELLA_DIR=$PEASOUP_HOME
diff --git a/tools/ps_analyze.sh b/tools/ps_analyze.sh
index 7b5818b1d..01f576cc2 100755
--- a/tools/ps_analyze.sh
+++ b/tools/ps_analyze.sh
@@ -1179,8 +1179,7 @@ main()
check_environ_vars STRATA_HOME
check_files $PEASOUP_HOME/tools/getsyms.sh $STRATA_HOME/tools/pc_confinement/stratafy_with_pc_confine.sh
elif [ $backend = "zipr" ]; then
- check_environ_vars ZIPR_INSTALL
- check_files $ZIPR_INSTALL/bin/zipr.exe
+ check_files $PEASOUP_HOME/zipr_install/bin/zipr.exe
else
echo "Unknown backend!"
exit 1
diff --git a/zipr b/zipr
index 69b50a5a9..019f73899 160000
--- a/zipr
+++ b/zipr
@@ -1 +1 @@
-Subproject commit 69b50a5a9ada750e286854e2ecc7e4ad68cd94d6
+Subproject commit 019f7389935b297963e908cb0416b919513282ec
diff --git a/zipr_callbacks b/zipr_callbacks
index d62699e2b..2c7add66a 160000
--- a/zipr_callbacks
+++ b/zipr_callbacks
@@ -1 +1 @@
-Subproject commit d62699e2bac14b1cfae4860976fc7af2a22d4d06
+Subproject commit 2c7add66a40199a290bcff47bcffa45fbbc54a1c
diff --git a/zipr_install b/zipr_install
index b2e97e9fe..351419f20 160000
--- a/zipr_install
+++ b/zipr_install
@@ -1 +1 @@
-Subproject commit b2e97e9fe880ebd58b46503071acceb1de1cd07f
+Subproject commit 351419f20db350cd3798a82fb077b6c7b9dd5337
diff --git a/zipr_push64_reloc_plugin b/zipr_push64_reloc_plugin
index 66a493ca6..01106bddc 160000
--- a/zipr_push64_reloc_plugin
+++ b/zipr_push64_reloc_plugin
@@ -1 +1 @@
-Subproject commit 66a493ca6d9cc966021a5479e20df1f803f8a9bf
+Subproject commit 01106bddc37d609cfced20b600fcac90a84963a1
diff --git a/zipr_unpin_plugin b/zipr_unpin_plugin
index 90d2fd995..67feacc2f 160000
--- a/zipr_unpin_plugin
+++ b/zipr_unpin_plugin
@@ -1 +1 @@
-Subproject commit 90d2fd995fb64d37a6874c3f7d62a3e43a774817
+Subproject commit 67feacc2fa26419ed4cab7793bedf361a33f6fd8
--
GitLab