Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Aug 2019 11:12:11 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r507955 - in head/security/sandsifter: . files
Message-ID:  <201908031112.x73BCBWu038735@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Sat Aug  3 11:12:11 2019
New Revision: 507955
URL: https://svnweb.freebsd.org/changeset/ports/507955

Log:
  security/sandsifter: update to 1.04
  
  Restrict this port to Python 2.7 for now, work to get it running
  with Python 3.6 is in progress upstream.
  
  Pet portlint (remove an extraneous spacae from pkg-descr)
  
  Reported by:	upstream / portscout

Added:
  head/security/sandsifter/files/patch-sifter.py   (contents, props changed)
Deleted:
  head/security/sandsifter/files/patch-injector.c
Modified:
  head/security/sandsifter/Makefile
  head/security/sandsifter/distinfo
  head/security/sandsifter/pkg-descr

Modified: head/security/sandsifter/Makefile
==============================================================================
--- head/security/sandsifter/Makefile	Sat Aug  3 11:08:59 2019	(r507954)
+++ head/security/sandsifter/Makefile	Sat Aug  3 11:12:11 2019	(r507955)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sandsifter
-PORTVERSION=	1.03
+PORTVERSION=	1.04
 DISTVERSIONPREFIX=v
 CATEGORIES=	security
 
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS_REASON=Designed for x86
 BUILD_DEPENDS=	${LOCALBASE}/include/capstone/capstone.h:devel/capstone3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}capstone>0:devel/py-capstone@${PY_FLAVOR}
 
-USES=		gmake python localbase shebangfix
+USES=		gmake python:2.7 localbase shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	rigred
 
@@ -28,9 +28,7 @@ OPTIONS_DEFINE=	DOCS
 PORTDOCS=	references/*
 
 post-patch:
-	${REINPLACE_CMD} -e 's,/proc/cpuinfo,/compat/linux/proc/cpuinfo,' \
-			-e 's,/usr/sbin,${PREFIX}/sbin,' \
-			${WRKSRC}/sifter.py
+	${REINPLACE_CMD} -e 's,/usr/sbin,${PREFIX}/sbin,' ${WRKSRC}/sifter.py
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} gui ${STAGEDIR}${DATADIR})

Modified: head/security/sandsifter/distinfo
==============================================================================
--- head/security/sandsifter/distinfo	Sat Aug  3 11:08:59 2019	(r507954)
+++ head/security/sandsifter/distinfo	Sat Aug  3 11:12:11 2019	(r507955)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547931250
-SHA256 (rigred-sandsifter-v1.03_GH0.tar.gz) = aece752dbe1831b2c215d9345b124ad9fb0180996dc81bff34fdc3a609332e9c
-SIZE (rigred-sandsifter-v1.03_GH0.tar.gz) = 5288254
+TIMESTAMP = 1564689727
+SHA256 (rigred-sandsifter-v1.04_GH0.tar.gz) = c62087155077190f7abe3e2646595b336b8f7f626e7fae63af5dbcc7c66f33be
+SIZE (rigred-sandsifter-v1.04_GH0.tar.gz) = 5288475

Added: head/security/sandsifter/files/patch-sifter.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/sandsifter/files/patch-sifter.py	Sat Aug  3 11:12:11 2019	(r507955)
@@ -0,0 +1,50 @@
+--- sifter.py.orig	2019-07-31 14:21:48 UTC
++++ sifter.py
+@@ -59,7 +59,7 @@ class InjectorResults(Structure):
+                 ('signum', c_int),
+                 ('sicode', c_int),
+                 ('siaddr', c_int),
+-		]
++                ]
+ 
+ class Settings:
+     SYNTH_MODE_RANDOM = "r"
+@@ -643,8 +643,8 @@ class Gui:
+                         # red.  doesn't happen if using a new random string each
+                         # time; doesn't happen if using a constant string each
+                         # time.  only happens with the specific implementation below.
+-						#TODO: on systems with limited color settings, this
+-						# makes the background look like random characters
++                                                #TODO: on systems with limited color settings, this
++                                                # makes the background look like random characters
+                         random_string = ("%02x" % random.randint(0,100)) * (raw_width-2)
+                         self.stdscr.addstr(top + 1 + y, left, random_string, curses.color_pair(self.BLACK))
+ 
+@@ -709,7 +709,7 @@ class Gui:
+ 
+ def get_cpu_info():
+     cpu_path = "/proc/cpuinfo"
+-    if platform.system == "FreeBSD":
++    if platform.system() == "FreeBSD":
+         cpu_path = "/compat/linux%s" % cpu_path
+     with open(cpu_path, "r") as f:
+         cpu = [l.strip() for l in f.readlines()[:7]]
+@@ -790,7 +790,8 @@ def main():
+         # Pick the first valid injector entry, this is not ideal but it should work fine
+         INJECTOR = INJECTOR[0]
+         print("Using injector from: %s" % INJECTOR)
+-        print("Injector BuildID: %s" % subprocess.check_output(['eu-readelf', '-n', INJECTOR]).split()[-1])
++        if platform.system() != "FreeBSD":
++            print("Injector BuildID: %s" % subprocess.check_output(['eu-readelf', '-n', INJECTOR]).split()[-1])
+         
+ 
+     parser = argparse.ArgumentParser()
+@@ -851,7 +852,7 @@ def main():
+         TICK = os.path.join(OUTPUT, "tick")
+         LAST = os.path.join(OUTPUT, "last")
+     else:
+-	print("warning: no log output path (--out) specified, results will be recorded to %s \nManualy specify a (--out) output path if you want your results recorded elsewhere." % OUTPUT)
++        print("warning: no log output path (--out) specified, results will be recorded to %s \nManualy specify a (--out) output path if you want your results recorded elsewhere." % OUTPUT)
+         # Wait to show message to user.
+         time.sleep(3)
+         # Create /tmp directory if it does not exist already, here we use much less strict checks.

Modified: head/security/sandsifter/pkg-descr
==============================================================================
--- head/security/sandsifter/pkg-descr	Sat Aug  3 11:08:59 2019	(r507954)
+++ head/security/sandsifter/pkg-descr	Sat Aug  3 11:12:11 2019	(r507955)
@@ -1,4 +1,4 @@
-The sandsifter audits x86 processors for hidden instructions and 
+The sandsifter audits x86 processors for hidden instructions and
 hardware bugs, by systematically generating machine code to search
 through a processor's instruction set, and monitoring execution for
 anomalies. Sandsifter has uncovered secret processor instructions from



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908031112.x73BCBWu038735>