From owner-svn-ports-head@freebsd.org Thu Feb 28 14:54:37 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A88A7150A686; Thu, 28 Feb 2019 14:54:37 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 470546E648; Thu, 28 Feb 2019 14:54:37 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A681685C; Thu, 28 Feb 2019 14:54:37 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1SEsbSc094399; Thu, 28 Feb 2019 14:54:37 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1SEsadq094396; Thu, 28 Feb 2019 14:54:36 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201902281454.x1SEsadq094396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Thu, 28 Feb 2019 14:54:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494154 - in head/devel/plasma: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/devel/plasma: . files X-SVN-Commit-Revision: 494154 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 470546E648 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2019 14:54:38 -0000 Author: kai Date: Thu Feb 28 14:54:36 2019 New Revision: 494154 URL: https://svnweb.freebsd.org/changeset/ports/494154 Log: devel/plasma: Update to latest snapshot and undeprecate Upstream has no yet adapted the code to use PyQt5 instead PyQt4. Thus the option MEMMAP that requires Qt4 has been completely removed to make the removal of Qt4 in the ports tree somewhat easier. While I'm here: * Fix license * Simply GitHub usage by removing GH_PROJECT * Add a patch to fix an issue with fake headers (not merged into upstream's repository, yet) Approved by: miwi (mentor) Differential Revision: https://reviews.freebsd.org/D19395 Added: head/devel/plasma/files/patch-plasma_lib_fileformat_elf.py (contents, props changed) Modified: head/devel/plasma/Makefile head/devel/plasma/distinfo Modified: head/devel/plasma/Makefile ============================================================================== --- head/devel/plasma/Makefile Thu Feb 28 14:42:53 2019 (r494153) +++ head/devel/plasma/Makefile Thu Feb 28 14:54:36 2019 (r494154) @@ -1,14 +1,13 @@ # $FreeBSD$ PORTNAME= plasma -DISTVERSION= g20171121 -PORTREVISION= 1 +DISTVERSION= g20180708 CATEGORIES= devel python MAINTAINER= kai@FreeBSD.org COMMENT= Interactive disassembler for x86/ARM/MIPS -LICENSE= GPLv3 +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash:shells/bash \ @@ -27,25 +26,11 @@ USES= python:3.4+ shebangfix USE_GITHUB= yes GH_ACCOUNT= plasma-disassembler -GH_PROJECT= plasma -GH_TAGNAME= 8ec3bb7 +GH_TAGNAME= 5bb07b3 USE_PYTHON= distutils noflavors autoplist SHEBANG_FILES= tests/analyzer/run.sh SHEBANG_GLOB= *.py - -OPTIONS_DEFINE= MEMMAP -OPTIONS_DEFAULT= MEMMAP -MEMMAP_DESC= View memory maps (pulls in QT4) -MEMMAP_USES= pyqt:4 -MEMMAP_USE= PYQT=gui_run - -.include - -.if ${PORT_OPTIONS:MMEMMAP} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 -.endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/setup.py Modified: head/devel/plasma/distinfo ============================================================================== --- head/devel/plasma/distinfo Thu Feb 28 14:42:53 2019 (r494153) +++ head/devel/plasma/distinfo Thu Feb 28 14:54:36 2019 (r494154) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517675748 -SHA256 (plasma-disassembler-plasma-g20171121-8ec3bb7_GH0.tar.gz) = 5ae00ef3fa3326000968323bd6843fa293938a1024b2fcb6176b624c99e8c050 -SIZE (plasma-disassembler-plasma-g20171121-8ec3bb7_GH0.tar.gz) = 352158 +TIMESTAMP = 1551048444 +SHA256 (plasma-disassembler-plasma-g20180708-5bb07b3_GH0.tar.gz) = 586b577dc3c428b7e45d76039921b56c3a60743f977756374614081f2730f0f4 +SIZE (plasma-disassembler-plasma-g20180708-5bb07b3_GH0.tar.gz) = 352170 Added: head/devel/plasma/files/patch-plasma_lib_fileformat_elf.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/plasma/files/patch-plasma_lib_fileformat_elf.py Thu Feb 28 14:54:36 2019 (r494154) @@ -0,0 +1,69 @@ +--- plasma/lib/fileformat/elf.py.orig 2019-02-27 16:23:45 UTC ++++ plasma/lib/fileformat/elf.py +@@ -215,9 +215,13 @@ class ELF(Binary): + # pyreadelf's assumptions make our own string table + fakestrtabheader = { + "sh_offset": self.__get_offset(self.dtags["DT_STRTAB"]), ++ "sh_size":0, ++ "sh_flags":0, ++ "sh_addralign":0 + } ++ + strtab = StringTableSection( +- fakestrtabheader, "strtab_plasma", self.elf.stream) ++ fakestrtabheader, "strtab_plasma", self.elf) + + # ... + # Here in CLE was checked the DT_SONAME +@@ -232,7 +236,9 @@ class ELF(Binary): + fakesymtabheader = { + "sh_offset": self.__get_offset(self.dtags["DT_SYMTAB"]), + "sh_entsize": self.dtags["DT_SYMENT"], +- "sh_size": 0 ++ "sh_size": 0, ++ "sh_flags": 0, ++ "sh_addralign" : 0 + } # bogus size: no iteration allowed + + # ... +@@ -240,7 +246,7 @@ class ELF(Binary): + # ... + + self.dynsym = SymbolTableSection( +- fakesymtabheader, "symtab_plasma", self.elf.stream, ++ fakesymtabheader, "symtab_plasma", + self.elf, strtab) + + # mips' relocations are absolutely screwed up, handle some of them here. +@@ -276,11 +282,12 @@ class ELF(Binary): + "sh_offset": self.__get_offset(reloffset), + "sh_type": "SHT_" + rela_type, + "sh_entsize": relentsz, +- "sh_size": relsz ++ "sh_size": relsz, ++ "sh_flags":0, ++ "sh_addralign":0 + } + reloc_sec = RelocationSection( +- fakerelheader, "reloc_plasma", +- self.elf.stream, self.elf) ++ fakerelheader, "reloc_plasma", self.elf) + self.__register_relocs(reloc_sec) + + # try to parse relocations out of a table of type DT_JMPREL +@@ -291,11 +298,13 @@ class ELF(Binary): + "sh_offset": self.__get_offset(jmpreloffset), + "sh_type": "SHT_" + rela_type, + "sh_entsize": relentsz, +- "sh_size": jmprelsz ++ "sh_size": jmprelsz, ++ "sh_flags":0, ++ "sh_addralign":0 + } + jmprel_sec = RelocationSection( + fakejmprelheader, "jmprel_plasma", +- self.elf.stream, self.elf) ++ self.elf) + + self.jmprel = self.__register_relocs(jmprel_sec) +