Index: head/security/sandsifter/Makefile =================================================================== --- head/security/sandsifter/Makefile (revision 450999) +++ head/security/sandsifter/Makefile (revision 451000) @@ -1,41 +1,41 @@ # $FreeBSD$ PORTNAME= sandsifter PORTVERSION= 0.1 CATEGORIES= security MAINTAINER= rene@FreeBSD.org COMMENT= Processor fuzzer for x86 CPUs BUILD_DEPENDS= ${LOCALBASE}/include/capstone/capstone.h:devel/capstone3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}capstone>0:devel/py-capstone USES= gmake python localbase shebangfix ONLY_FOR_ARCH= amd64 i386 -ONLY_FOR_ARCH_RAESON=Designed for x86 +ONLY_FOR_ARCH_REASON=Designed for x86 USE_GITHUB= yes GH_ACCOUNT= xoreaxeaxeax GH_TAGNAME= dff63246fed84d90118441b8ba5b5d3bdd094427 SHEBANG_FILES= sifter.py summarize.py OPTIONS_DEFINE= DOCS PORTDOCS= references/* do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} gui ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} pyutil ${STAGEDIR}${DATADIR}) ${INSTALL_PROGRAM} ${WRKSRC}/injector ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/sifter.py ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/summarize.py ${STAGEDIR}${DATADIR} ${RLN} ${STAGEDIR}${DATADIR}/sifter.py ${STAGEDIR}${PREFIX}/bin/sifter ${RLN} ${STAGEDIR}${DATADIR}/summarize.py ${STAGEDIR}${PREFIX}/bin/summarize ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/references/* ${STAGEDIR}${DOCSDIR} .include Index: head/security/sandsifter/files/patch-sifter.py =================================================================== --- head/security/sandsifter/files/patch-sifter.py (revision 450999) +++ head/security/sandsifter/files/patch-sifter.py (revision 451000) @@ -1,44 +1,42 @@ ---- sifter.py.orig 2017-09-22 12:42:26 UTC +--- sifter.py.orig 2017-09-30 17:57:06 UTC +++ sifter.py -@@ -26,11 +26,12 @@ import argparse - import code +@@ -27,10 +27,10 @@ import code import copy from ctypes import * -+import sysctl -INJECTOR = "./injector" +INJECTOR = "injector" arch = "" -OUTPUT = "./data/" +OUTPUT = os.getenv("HOME") + "/.sandsifter/" LOG = OUTPUT + "log" SYNC = OUTPUT + "sync" TICK = OUTPUT + "tick" -@@ -679,7 +680,7 @@ class Gui: +@@ -679,7 +679,7 @@ class Gui: time.sleep(self.TIME_SLICE) def get_cpu_info(): - with open("/proc/cpuinfo", "r") as f: + with open("/compat/linux/proc/cpuinfo", "r") as f: cpu = [l.strip() for l in f.readlines()[:7]] return cpu -@@ -808,9 +809,16 @@ def main(): +@@ -808,9 +808,16 @@ def main(): if not os.path.exists(OUTPUT): os.makedirs(OUTPUT) + real_injector, errors = \ + subprocess.Popen( + ['which', INJECTOR], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE + ).communicate() + real_injector = real_injector.replace('\n', '') # strip newline from shell output injector_bitness, errors = \ subprocess.Popen( - ['file', INJECTOR], + ['file', real_injector], stdout=subprocess.PIPE, stderr=subprocess.PIPE ).communicate()