.gitattributes

 * text=auto !eol
+/INSTALL -text
+/README.txt -text
 /build-all.sh -text
+centos_files/at-3.1.13-22.el7.x86_64.rpm -text
+centos_files/audit-2.6.5-3.el7_3.1.x86_64.rpm -text
+centos_files/audit-libs-2.6.5-3.el7_3.1.i686.rpm -text
+centos_files/audit-libs-2.6.5-3.el7_3.1.x86_64.rpm -text
+centos_files/bc-1.06.95-13.el7.x86_64.rpm -text
+centos_files/cpp-4.8.5-11.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/cracklib-2.9.0-11.el7.i686.rpm -text
+centos_files/cups-client-1.6.3-26.el7.x86_64.rpm -text
+centos_files/ed-1.9-4.el7.x86_64.rpm -text
+centos_files/gcc-c++-4.8.5-11.el7.x86_64.rpm -text
+centos_files/glibc-2.17-157.el7_3.1.i686.rpm -text
+centos_files/jq-1.5-1.el7.x86_64.rpm -text
+centos_files/kernel-headers-3.10.0-514.16.1.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/libcap-ng-0.7.5-4.el7.i686.rpm -text
+centos_files/libdb-5.3.21-19.el7.i686.rpm -text
+centos_files/libgcc-4.8.5-11.el7.i686.rpm -text
+centos_files/libgomp-4.8.5-11.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/libmpc-1.0.1-3.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/libpqxx-4.0.1-1.el7.x86_64.rpm -text
+centos_files/libselinux-2.5-6.el7.i686.rpm -text
+centos_files/libsepol-2.5-6.el7.i686.rpm -text
+centos_files/libstdc++-4.8.5-11.el7.i686.rpm -text
+centos_files/libstdc++-4.8.5-11.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/libstdc++-devel-4.8.5-11.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/m4-1.4.16-10.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/mailx-12.5-12.el7_0.x86_64.rpm -text
+centos_files/nasm-2.10.07-7.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/ncurses-libs-5.9-13.20130511.el7.i686.rpm -text
+centos_files/nspr-4.13.1-1.0.el7_3.i686.rpm -text
+centos_files/nss-3.28.4-1.0.el7_3.i686.rpm -text
+centos_files/nss-softokn-3.16.2.3-14.4.el7.i686.rpm -text
+centos_files/nss-softokn-freebl-3.16.2.3-14.4.el7.i686.rpm -text
+centos_files/nss-util-3.28.4-1.0.el7_3.i686.rpm -text
+centos_files/oniguruma-5.9.5-3.el7.x86_64.rpm -text
+centos_files/pam-1.1.8-18.el7.i686.rpm -text
+centos_files/pam-1.1.8-18.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/patch-2.7.1-8.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/pcre-8.32-15.el7_2.1.i686.rpm -text
+centos_files/pcre-8.32-15.el7_2.1.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/perl-Data-Dumper-2.145-3.el7.x86_64.rpm -text
+centos_files/perl-JSON-PP-2.27202-2.el7.noarch.rpm -text
+centos_files/postgresql-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/postgresql-contrib-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/postgresql-devel-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/postgresql-libs-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/postgresql-server-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/readline-6.2-9.el7.i686.rpm -text
+centos_files/redhat-lsb-core-4.1-27.el7.centos.1.i686.rpm -text
+centos_files/redhat-lsb-submod-security-4.1-27.el7.centos.1.i686.rpm -text
+centos_files/screen-4.1.0-0.23.20120314git3c2946.el7_2.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/spax-1.5.2-13.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/sqlite-3.7.17-8.el7.i686.rpm -text
+centos_files/time-1.7-45.el7.x86_64.rpm -text
+centos_files/uuid-1.6.2-26.el7.x86_64.rpm -text svneol=unset#application/x-rpm
+centos_files/zlib-1.2.7-17.el7.i686.rpm -text
+centos_files/zlib-1.2.7-17.el7.x86_64.rpm -text svneol=unset#application/x-rpm
 /cfar_postgres_setup.sh -text
 /cfar_postgres_setup_for_other.sh -text
 /clean-all.sh -text
+/externals.conf -text
 /get-peasoup-packages.sh -text
 /irdb_vars -text
-non_overlapping_heap/Makefile -text
-non_overlapping_heap/noh.c -text
-non_overlapping_heap/tests/Makefile -text
-non_overlapping_heap/tests/inputfile -text
-non_overlapping_heap/tests/test1.c -text
-non_overlapping_heap/tests/test2.c -text
-non_overlapping_libraries/ld-linux-x86-64.so.2 -text
-non_overlapping_libraries/patchelf -text
+/manifest.txt -text
 /postgres_setup.sh -text
+/regen_install.sh -text
 /set_command_envs -text
 /set_env_vars -text
 /set_ida_server -text
 /start_dev.sh -text
-/svn.externals.uva_dev -text
+ubuntu16_files/README.txt -text
+ubuntu16_files/Vagrantfile -text
+ubuntu16_files/generate_ais_installer.sh -text
+ubuntu16_files/install.sh -text
+ubuntu16_files/manifest.txt -text
+ubuntu16_files/test.sh -text
+/yum_packages.sh -text

INSTALL

+# Notes for setting up, building and installing peasoup_umbrella (non-CFAR)
+
+0. IMPORTANT:  You will need your own valid IDA Pro license key and IDA Pro installation.  Update the IDA* lines in the file set_env_vars to point to your installation.
+
+1. Get the required packages by running the get-peasoup-packages.sh script.
+	. ./set_env_vars; bash ./get-peasoup-packages.sh all
+
+2. Set up the postgres databases (enter password of your choice)
+	bash ./postgres_setup.sh
+
+3. Build and save the build results to build.out
+	bash ./build.sh | tee -ai build.out
+
+
+If the build succeeds, a directory named $PEASOUP_UMBRELLA_DIR/installed will be created  (see file set_env_vars for environment variable settings).  This directory will contain the built versions of the modules that comprise the toolchain.
+
+To test your installation, try a simple analysis using zipr static rewriter.
+
+. ./set_env_vars; $PSZ `which ls` ls.zipr
+
+If the toolchain build has completed successfully, then ls.zipr will be a working, statically rewritten version of ls.
+
+

README.txt

+
+
+Congratulations!  You've received a copy of
+the Zipr toolchain.  Before use, you need to install it.
+
+To install, pick an approriate directory for your OS from the 
+list below, and read the README file contained in that directory.
+
+	* ubuntu16_files  (Zipr Toolchain on ubuntu 16.04)
+	* centos_files    (DoubleHelix toolchain on CentOS 7.1) 

build-all.sh

@@ -10,47 +10,66 @@ if [ "$PEASOUP_UMBRELLA_DIR" != "$FULL_BUILD_LOC" ]; then
     exit 1;
 fi
 
+SCONSDEBUG=""
+if [[ "$*" =~ "--debug" ]]; then
+	SCONSDEBUG=" debug=1 "
+fi
+
 if [ `basename $FULL_BUILD_LOC` == "cfar_umbrella" ]; then
 	cfar_mode="--enable-cfar"
 fi
 
-# stratafier
-cd $PEASOUP_UMBRELLA_DIR/stratafier
-make || exit
+mkdir -p $ZEST_RUNTIME/lib32
+mkdir -p $ZEST_RUNTIME/lib64
+mkdir -p $ZEST_RUNTIME/bin
+mkdir -p $ZEST_RUNTIME/sbin
 
-# strata
-if [ ! "$STRATA_HOME" ]; then 
-    echo "STRATA_HOME not set.";
-    exit 1; 
+if [ ! -f manifest.txt.config -o ! -d "$PS_INSTALL" ]; then
+	mkdir -p "$PS_INSTALL"
+	$PEDI_HOME/pedi --setup -m manifest.txt -l ida -l ida_key -l ps -l zipr -l stars -i $PS_INSTALL
 fi
 
-if [ `uname -m` = 'x86_64' ]; then
-	# build 32-bit strata
-	if [ ! -d $STRATA_HOME32 ] ; then 
-		cd $STRATA
-		if [ -f Makefile ] ; then
-			make clean distclean
-		fi
-		cd $PEASOUP_UMBRELLA_DIR
-		echo Creating strata 32-bit build directory
-		cp -R $STRATA $STRATA32
+
+use_strata=0
+if [[ $use_strata = 1 ]]; then
+	# stratafier
+	cd $PEASOUP_UMBRELLA_DIR/stratafier
+	make || exit
+
+	# strata
+	if [ ! "$STRATA_HOME" ]; then 
+	    echo "STRATA_HOME not set.";
+	    exit 1; 
 	fi
-	
-	cd $STRATA_HOME32
-	STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux || exit
-
-	# build x86-64 strata
-	cd $STRATA_HOME
-	if [ -f Makefile -a Makefile -nt configure -a Makefile -nt Makefile.in ]; then
-		echo Skipping Strata reconfigure step
+
+	if [ `uname -m` = 'x86_64' ]; then
+		# build 32-bit strata
+		if [ ! -d $STRATA_HOME32 ] ; then 
+			cd $STRATA
+			if [ -f Makefile ] ; then
+				make clean distclean
+			fi
+			cd $PEASOUP_UMBRELLA_DIR
+			echo Creating strata 32-bit build directory
+			cp -R $STRATA $STRATA32
+		fi
+		
+		cd $STRATA_HOME32
+		STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux || exit
+
+		# build x86-64 strata
+		cd $STRATA_HOME
+		if [ -f Makefile -a Makefile -nt configure -a Makefile -nt Makefile.in ]; then
+			echo Skipping Strata reconfigure step
+		else
+			./configure $cfar_mode || exit
+		fi
+		make || exit
+
 	else
-		./configure $cfar_mode || exit
+		cd $STRATA_HOME
+		./build $cfar_mode || exit
 	fi
-	make || exit
-
-else
-	cd $STRATA_HOME
-	./build $cfar_mode || exit
 fi
 
 # smp-static-analyzer
@@ -66,10 +85,10 @@ if [ ! "$SECURITY_TRANSFORMS_HOME" ]; then
 fi
 
 cd $SECURITY_TRANSFORMS_HOME
-scons || exit
+scons $SCONSDEBUG -j 3 || exit
 
 cd $SMPSA_HOME
-scons  || exit
+scons $SCONSDEBUG -j 3 || exit
 
 cd $PEASOUP_HOME
 make || exit
@@ -83,39 +102,44 @@ fi
 
 if [ -d $ZIPR_HOME ]; then
 	cd $ZIPR_HOME
-	scons  || exit
+	scons $SCONSDEBUG -j 3|| exit
 fi
 
 if [ -d $ZIPR_SCFI_PLUGIN ]; then
 	cd $ZIPR_SCFI_PLUGIN
-	scons  || exit
+	scons  $SCONSDEBUG || exit
 fi
 
 cd $PEASOUP_UMBRELLA_DIR/zipr_large_only_plugin/
-scons || exit
+scons $SCONSDEBUG || exit
+
+if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin ]]  ; then
+	cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/
+	scons $SCONSDEBUG || exit
+fi
+
+if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin ]]  ; then
+	cd $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin/
+	scons $SCONSDEBUG || exit
+fi
 
 cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
-scons || exit
+scons $SCONSDEBUG || exit
 
 cd $PEASOUP_UMBRELLA_DIR/zipr_unpin_plugin
-scons || exit
+scons $SCONSDEBUG || exit
 
 cd $IRDB_TRANSFORMS
-scons || exit
+scons $SCONSDEBUG -j 3 || exit
 
-cd $PEASOUP_UMBRELLA_DIR
-if [ -d DieHard ]; then
-	cd DieHard
-	./build_diehard.sh
-fi
-
-cd $PEASOUP_UMBRELLA_DIR
-if [ -d non_overlapping_heap ]; then
-	make -C non_overlapping_heap
+if [ -d $DAFFY_HOME ]; then
+	cd $DAFFY_HOME
+	./setup_cfar.sh
 fi
 
 cd $PEASOUP_UMBRELLA_DIR
 
+$PEDI_HOME/pedi -m manifest.txt 
 
 echo
 echo