update to pwntools-4.3.1
This commit is contained in:
jasper
parent
93ff61b037
commit
b69e3445e2
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2021/01/04 15:02:37 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2021/01/18 20:11:41 jasper Exp $
|
||||
|
||||
COMMENT = Pwntools CTF framework and exploit development library
|
||||
|
||||
MODPY_EGG_VERSION = 4.2.2
|
||||
MODPY_EGG_VERSION = 4.3.1
|
||||
DISTNAME = pwntools-${MODPY_EGG_VERSION}
|
||||
REVISION = 0
|
||||
|
||||
CATEGORIES = security
|
||||
|
||||
@ -43,6 +42,5 @@ post-extract:
|
||||
# ???
|
||||
post-install:
|
||||
rm ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requirements.txt
|
||||
rm ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/robots.txt
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (pwntools-4.2.2.tar.gz) = xB3ewlYPMm2QCAz9BAoflKRvu5FH1IPL8E70Y7YAaEc=
|
||||
SIZE (pwntools-4.2.2.tar.gz) = 4894829
|
||||
SHA256 (pwntools-4.3.1.tar.gz) = xGGI5xPEdhey2/PjLRhn+UjTXYL935qdIpSjP0dISoo=
|
||||
SIZE (pwntools-4.3.1.tar.gz) = 4894280
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-pwnlib_asm_py,v 1.2 2020/06/13 09:24:29 jasper Exp $
|
||||
|
||||
We ship binutils 2.17, nothing the user can do about it.
|
||||
|
||||
Index: pwnlib/asm.py
|
||||
--- pwnlib/asm.py.orig
|
||||
+++ pwnlib/asm.py
|
||||
@@ -239,15 +239,6 @@ def _assembler():
|
||||
|
||||
assembler = assemblers.get(context.arch, [gas])
|
||||
|
||||
- if not checked_assembler_version[gas]:
|
||||
- checked_assembler_version[gas] = True
|
||||
- result = subprocess.check_output([gas, '--version','/dev/null'],
|
||||
- stderr=subprocess.STDOUT, universal_newlines=True)
|
||||
- version = re.search(r' (\d\.\d+)', result).group(1)
|
||||
- if version < '2.19':
|
||||
- log.warn_once('Your binutils version is too old and may not work!\n' + \
|
||||
- 'Try updating with: https://docs.pwntools.com/en/stable/install/binutils.html\n' + \
|
||||
- 'Reported Version: %r' % result.strip())
|
||||
|
||||
|
||||
return assembler
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-pwnlib_commandline_main_py,v 1.1.1.1 2019/05/08 21:15:44 jasper Exp $
|
||||
$OpenBSD: patch-pwnlib_commandline_main_py,v 1.2 2021/01/18 20:11:41 jasper Exp $
|
||||
|
||||
Disable automatic update checking.
|
||||
|
||||
@ -10,14 +10,14 @@ Index: pwnlib/commandline/main.py
|
||||
from pwnlib.commandline import template
|
||||
from pwnlib.commandline import unhex
|
||||
-from pwnlib.commandline import update
|
||||
from pwnlib.commandline import version
|
||||
from pwnlib.commandline.common import parser
|
||||
from pwnlib.context import context
|
||||
|
||||
@@ -42,7 +41,6 @@ commands = {
|
||||
@@ -43,7 +42,6 @@ commands = {
|
||||
'shellcraft': shellcraft.main,
|
||||
'template': template.main,
|
||||
'unhex': unhex.main,
|
||||
- 'update': update.main,
|
||||
'version': version.main,
|
||||
}
|
||||
|
||||
def main():
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-pwnlib_elf_elf_py,v 1.4 2020/07/17 18:08:56 jasper Exp $
|
||||
$OpenBSD: patch-pwnlib_elf_elf_py,v 1.5 2021/01/18 20:11:41 jasper Exp $
|
||||
|
||||
- Add support for checking for retguard
|
||||
|
||||
Index: pwnlib/elf/elf.py
|
||||
--- pwnlib/elf/elf.py.orig
|
||||
+++ pwnlib/elf/elf.py
|
||||
@@ -1727,6 +1727,15 @@ class ELF(ELFFile):
|
||||
@@ -1761,6 +1761,15 @@ class ELF(ELFFile):
|
||||
aslr=pie
|
||||
|
||||
@property
|
||||
@ -21,7 +21,7 @@ Index: pwnlib/elf/elf.py
|
||||
def rpath(self):
|
||||
""":class:`bool`: Whether the current binary has an ``RPATH``."""
|
||||
dt_rpath = self.dynamic_by_tag('DT_RPATH')
|
||||
@@ -1785,6 +1794,10 @@ class ELF(ELFFile):
|
||||
@@ -1819,6 +1828,10 @@ class ELF(ELFFile):
|
||||
True: green("PIE enabled"),
|
||||
False: red("No PIE (%#x)" % self.address)
|
||||
}[self.pie],
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2020/07/17 18:08:56 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2021/01/18 20:11:41 jasper Exp $
|
||||
bin/pwn
|
||||
lib/python${MODPY_VERSION}/site-packages/CHANGELOG.md
|
||||
lib/python${MODPY_VERSION}/site-packages/CONTRIBUTING.md
|
||||
lib/python${MODPY_VERSION}/site-packages/LICENSE-pwntools.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/README.md
|
||||
lib/python${MODPY_VERSION}/site-packages/TESTING.md
|
||||
lib/python${MODPY_VERSION}/site-packages/bar.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/foo.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pwn/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwn/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwn/${MODPY_PYCACHE}/
|
||||
@ -85,6 +83,7 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}shel
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}unhex.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/asm.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/checksec.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/common.py
|
||||
@ -105,6 +104,7 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/shellcraft.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/template.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/unhex.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/update.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/version.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/config.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/__init__.py
|
||||
@ -231,6 +231,10 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/__init__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/includes/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/includes/android/
|
||||
lib/python${MODPY_VERSION}/site-packages/pwnlib/data/includes/android/aarch64.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user