Index: head/security/py-volatility/Makefile =================================================================== --- head/security/py-volatility/Makefile (revision 430647) +++ head/security/py-volatility/Makefile (revision 430648) @@ -1,42 +1,42 @@ # Created by: antoine@FreeBSD.org # $FreeBSD$ PORTNAME= volatility -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.6 CATEGORIES= security python MASTER_SITES= http://downloads.volatilityfoundation.org/releases/${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= antoine@FreeBSD.org COMMENT= Advanced memory forensics framework LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \ ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara \ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl -USES= python:2 zip +NO_ARCH= yes +USES= python:2.7 zip USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS WRKSRC= ${WRKDIR}/volatility-master DATADIR= ${PREFIX}/share/py-${PORTNAME} PORTDOCS= AUTHORS.txt CHANGELOG.txt CREDITS.txt LEGAL.txt README.txt DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} .include PYDISTUTILS_INSTALLARGS+=--install-data ${DATADIR} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/security/py-volatility/distinfo =================================================================== --- head/security/py-volatility/distinfo (revision 430647) +++ head/security/py-volatility/distinfo (revision 430648) @@ -1,2 +1,3 @@ -SHA256 (volatility-2.5.zip) = b90dfd18b6a99e1b35ef0f92f28422cca03bea0b7b8ec411cfbc603e72aa594b -SIZE (volatility-2.5.zip) = 3276052 +TIMESTAMP = 1483110602 +SHA256 (volatility-2.6.zip) = 5b73050d72bf94870ffce22843f03d4b0b7764011dec29ef1a0a5b1b46cf9295 +SIZE (volatility-2.6.zip) = 4179806 Index: head/security/py-volatility/files/patch-setup.py =================================================================== --- head/security/py-volatility/files/patch-setup.py (revision 430647) +++ head/security/py-volatility/files/patch-setup.py (nonexistent) @@ -1,14 +0,0 @@ ---- setup.py.orig 2015-10-21 20:39:22 UTC -+++ setup.py -@@ -44,7 +44,10 @@ def find_files(topdirs, py = False): - ret = [] - for topdir in topdirs: - for r, _ds, fs in os.walk(topdir): -- ret.append((r, [ os.path.join(r, f) for f in fs if (f.endswith('.py') or not py)])) -+ fl = [ os.path.join(r, f) for f in fs if (f.endswith('.py') or not py)] -+ # Do not record directories (with no regular files inside) -+ if len(fl) > 0: -+ ret.append((r, fl)) - return ret - - opts = {} Property changes on: head/security/py-volatility/files/patch-setup.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/py-volatility/files/patch-volatility_plugins_malware_psxview.py =================================================================== --- head/security/py-volatility/files/patch-volatility_plugins_malware_psxview.py (revision 430647) +++ head/security/py-volatility/files/patch-volatility_plugins_malware_psxview.py (revision 430648) @@ -1,67 +1,67 @@ ---- volatility/plugins/malware/psxview.py.orig 2015-10-21 20:39:22 UTC +--- volatility/plugins/malware/psxview.py.orig 2016-12-27 15:54:47 UTC +++ volatility/plugins/malware/psxview.py @@ -35,8 +35,8 @@ import volatility.plugins.addrspaces.sta try: from openpyxl.workbook import Workbook from openpyxl.writer.excel import ExcelWriter - from openpyxl.cell import get_column_letter - from openpyxl.styles import Color, Fill, Style, PatternFill, Border, Side, Alignment, Protection, Font + from openpyxl.utils import get_column_letter + from openpyxl.styles import Color, Fill, NamedStyle, PatternFill, Border, Side, Alignment, Protection, Font from openpyxl.cell import Cell from openpyxl import load_workbook has_openpyxl = True @@ -233,7 +233,7 @@ class PsXview(common.AbstractWindowsComm yield offset, source[offset], ps_sources def render_xlsx(self, outfd, data): - BoldStyle = Style(font=Font(name='Calibri', + BoldStyle = NamedStyle(name='BoldStyle', font=Font(name='Calibri', size=11, bold=True, italic=False, @@ -244,7 +244,7 @@ class PsXview(common.AbstractWindowsComm fill=PatternFill(fill_type="solid", start_color='FF000000', end_color='FF000000')) - RedStyle = Style(font=Font(name='Calibri', + RedStyle = NamedStyle(name='RedStyle', font=Font(name='Calibri', size=11, bold=False, italic=False, @@ -272,7 +272,7 @@ class PsXview(common.AbstractWindowsComm fill=PatternFill(start_color = 'FFFF0000', end_color = 'FFFF0000', fill_type = 'solid')) - GreenStyle = Style(font=Font(name='Calibri', + GreenStyle = NamedStyle(name='GreenStyle', font=Font(name='Calibri', size=11, bold=False, italic=False, @@ -284,7 +284,7 @@ class PsXview(common.AbstractWindowsComm end_color = "FF00FF00", fill_type = "solid")) - wb = Workbook(optimized_write = True) + wb = Workbook(write_only = True) ws = wb.create_sheet() ws.title = "Psxview Output" ws.append(["Offset (P)", @@ -350,13 +350,13 @@ class PsXview(common.AbstractWindowsComm wb = load_workbook(filename = self._config.OUTPUT_FILE) ws = wb.get_sheet_by_name(name = "Psxview Output") for col in xrange(1, 12): - ws.cell("{0}{1}".format(get_column_letter(col), 1)).style = BoldStyle + ws["{0}{1}".format(get_column_letter(col), 1)].style = BoldStyle for row in xrange(2, total + 1): for col in xrange(4, 11): - if ws.cell("{0}{1}".format(get_column_letter(col), row)).value == "False": - ws.cell("{0}{1}".format(get_column_letter(col), row)).style = RedStyle + if ws["{0}{1}".format(get_column_letter(col), row)].value == "False": + ws["{0}{1}".format(get_column_letter(col), row)].style = RedStyle else: - ws.cell("{0}{1}".format(get_column_letter(col), row)).style = GreenStyle + ws["{0}{1}".format(get_column_letter(col), row)].style = GreenStyle wb.save(filename = self._config.OUTPUT_FILE) def unified_output(self, data): Index: head/security/py-volatility/files/patch-volatility_renderers_xlsx.py =================================================================== --- head/security/py-volatility/files/patch-volatility_renderers_xlsx.py (revision 430647) +++ head/security/py-volatility/files/patch-volatility_renderers_xlsx.py (revision 430648) @@ -1,22 +1,22 @@ ---- volatility/renderers/xlsx.py.orig 2015-10-21 20:39:22 UTC +--- volatility/renderers/xlsx.py.orig 2016-12-27 15:54:47 UTC +++ volatility/renderers/xlsx.py @@ -6,8 +6,8 @@ __author__ = "gleeda" try: from openpyxl.workbook import Workbook from openpyxl.writer.excel import ExcelWriter - from openpyxl.cell import get_column_letter - from openpyxl.styles import Color, Fill, Style, PatternFill, Border, Side, Alignment, Protection, Font + from openpyxl.utils import get_column_letter + from openpyxl.styles import Color, Fill, NamedStyle, PatternFill, Border, Side, Alignment, Protection, Font from openpyxl.cell import Cell from openpyxl import load_workbook has_openpyxl = True @@ -22,7 +22,7 @@ class XLSXRenderer(Renderer): self._columns = None self._text_cell_renderers_func = renderers_func self._text_cell_renderers = None - self._wb = Workbook(optimized_write = True) + self._wb = Workbook(write_only = True) self._ws = self._wb.create_sheet() def description(self):