pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-pwntools: Update to 4.11.1
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Fri Jan 19 12:43:03 2024 +0100
Changeset: bdf2c1f5e3ed19279e934ee67e155d0b63ed6ed6
Modified Files:
py-pwntools/Makefile
py-pwntools/PLIST
py-pwntools/distinfo
Removed Files:
py-pwntools/patches/patch-setup.py
Log Message:
py-pwntools: Update to 4.11.1
pkgsrc changes:
- Remove no longer needed patch
- Convert to wheel.mk and add needed TOOL_DEPENDS
Changes:
- FIX: Generated shebang with path to python invalid if path contains spaces
- Fix `tube.clean_and_log` not logging buffered data
- FIX: Getting right amount of data for search fix
- Fix `_countdown_handler` not invoking `timeout_change`
- Fix atexit SEGV in aarch64 loader
- make fmtstr module able to create payload without $ notation
- Add search for libc binary by leaked function addresses `libcdb.search_by_symbol_offsets()`
- Support for RISC-V 64-bit architecture
- Enhance `ELF.nx` and `ELF.execstack`
- Handle `context.newline` correctly when typing in `tube.interactive()`
- Fix bug at ssh.py:`download` and `download_file` with relative paths
- Fix ssh.process not setting ssh_process.cwd attribute
- Fix corefile module after pyelftools update
In memoriam - Zach Riggle - long time contributor and maintainer of Pwntools.
- make pwn cyclic -l work with entry larger than 4 bytes
- shellcraft: dup() is now called dupio() consistently across all supported arches
- setresuid() in shellcraft uses current euid by default
- Allow tube.recvregex to return capture groups
- Removes `p2align 2` `asm()` headers from `x86-32`, `x86-64` and
`mips` architectures to avoid inconsistent instruction length when
patching binaries
- Add libcdb commandline tool
- Add `js_escape()` and `js_unescape()` to `util.fiddling`
- Fix tube's debug output of same byte compression
- Support KDE Konsole in run_in_new_terminal function
- Fix ELF.libc_start_main_return with glibc 2.34
- Quote file and core path in generated GDB script
- Change Buffer's parent class to object
- Allow SSH tunnel to be treated like a TCP socket (with 'raw=True')
- Fix ROP without a writeable cache directory
- Fix `tube.recvpred()` timeout argument
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bdf2c1f5e3ed19279e934ee67e155d0b63ed6ed6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-pwntools/Makefile | 10 +++++---
py-pwntools/PLIST | 51 ++++++++++++++++++++++++++++++--------
py-pwntools/distinfo | 7 +++---
py-pwntools/patches/patch-setup.py | 29 ----------------------
4 files changed, 49 insertions(+), 48 deletions(-)
diffs:
diff --git a/py-pwntools/Makefile b/py-pwntools/Makefile
index 33d2988d5f..5a680bea6f 100644
--- a/py-pwntools/Makefile
+++ b/py-pwntools/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= pwntools-4.9.0
+DISTNAME= pwntools-4.11.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_PYPI:=p/pwntools/}
@@ -10,6 +10,8 @@ HOMEPAGE= https://pwntools.com/
COMMENT= CTF framework and exploit development library
LICENSE= gnu-gpl-v3 AND 2-clause-bsd AND mit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=44.0:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
DEPENDS+= ${PYPKGPREFIX}-Socks-[0-9]*:../../net/py-Socks
DEPENDS+= ${PYPKGPREFIX}-capstone>=3.0.5:../../devel/py-capstone
DEPENDS+= ${PYPKGPREFIX}-colored-traceback-[0-9]*:../../wip/py-colored-traceback
@@ -18,9 +20,9 @@ DEPENDS+= ${PYPKGPREFIX}-intervaltree>=3.0:../../devel/py-intervaltree
DEPENDS+= ${PYPKGPREFIX}-mako>=1.0.0:../../devel/py-mako
DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
DEPENDS+= ${PYPKGPREFIX}-paramiko>=1.15.2:../../security/py-paramiko
-DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
+DEPENDS+= ${PYPKGPREFIX}-pip>=6.0.8:../../devel/py-pip
DEPENDS+= ${PYPKGPREFIX}-psutil>=3.3.0:../../sysutils/py-psutil
-DEPENDS+= ${PYPKGPREFIX}-pyelftools>=0.2.4:../../devel/py-pyelftools
+DEPENDS+= ${PYPKGPREFIX}-pyelftools>=0.24:../../devel/py-pyelftools
DEPENDS+= ${PYPKGPREFIX}-pygments>=2.0:../../textproc/py-pygments
DEPENDS+= ${PYPKGPREFIX}-requests>=2.0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-ropgadget>=5.3:../../wip/py-ropgadget
@@ -41,5 +43,5 @@ post-install:
${MV} ${DESTDIR}${PREFIX}/bin/pwn ${DESTDIR}${PREFIX}/bin/pwn${PYVERSSUFFIX}
${MV} ${DESTDIR}${PREFIX}/pwntools-doc ${DESTDIR}${PREFIX}/${PYSITELIB}
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pwntools/PLIST b/py-pwntools/PLIST
index 3199739b18..141c2c9b4a 100644
--- a/py-pwntools/PLIST
+++ b/py-pwntools/PLIST
@@ -522,6 +522,8 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/__doc__
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/connect.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/dupio.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/forkexit.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/kill.asm
@@ -530,6 +532,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/loader.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/loader_append.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/open.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/readn.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/socket.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/android/stage.asm
@@ -1017,6 +1020,8 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/__doc__
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/connect.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/dupio.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/forkexit.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/kill.asm
@@ -1025,6 +1030,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/loader.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/loader_append.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/open.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/readn.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/socket.asm
${PYSITELIB}/pwnlib/shellcraft/templates/aarch64/linux/stage.asm
@@ -1519,7 +1525,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/connect.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/connectstager.asm
-${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/dup.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/dupio.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/egghunter.asm
@@ -1546,6 +1552,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/readn.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/readptr.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/recvsize.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/setregid.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/setreuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/android/socket.asm
@@ -2040,7 +2047,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/connect.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/connectstager.asm
-${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/dup.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/dupio.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/egghunter.asm
@@ -2067,6 +2074,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/readn.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/readptr.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/recvsize.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/setregid.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/setreuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/linux/socket.asm
@@ -2562,6 +2570,15 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/amd64/setregs.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/strcpy.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/strlen.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/trap.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/__doc__
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/cmd.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/getexport.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/getprocaddress.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/kernel32base.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/ntdllbase.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/peb.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/teb.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/amd64/windows/winexec.asm
${PYSITELIB}/pwnlib/shellcraft/templates/amd64/xor.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/__doc__
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/__doc__
@@ -2570,6 +2587,8 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/connect.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/dir.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/dupio.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/egghunter.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/forkbomb.asm
@@ -2577,6 +2596,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/forkexit.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/kill.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/killparent.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/open_file.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/syscall.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/android/syscalls/__doc__
@@ -3064,6 +3084,8 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/connect.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/dir.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/dupio.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/egghunter.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/forkbomb.asm
@@ -3071,6 +3093,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/forkexit.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/kill.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/killparent.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/open_file.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/syscall.asm
${PYSITELIB}/pwnlib/shellcraft/templates/arm/linux/syscalls/__doc__
@@ -4066,6 +4089,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/readfile.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/readn.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/recvsize.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/setregid.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/setreuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/android/socket.asm
@@ -4597,6 +4621,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/readfile.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/readn.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/recvsize.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/setregid.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/setreuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/i386/linux/socket.asm
@@ -5110,6 +5135,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/kill.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/killparent.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/listen.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/readfile.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/stager.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/android/syscall.asm
@@ -5605,6 +5631,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/kill.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/killparent.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/listen.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/readfile.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/stager.asm
${PYSITELIB}/pwnlib/shellcraft/templates/mips/linux/syscall.asm
@@ -7047,7 +7074,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/connect.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/connectstager.asm
-${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/dup.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/dupio.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/findpeer.asm
@@ -7063,6 +7090,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/loader_append.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/readfile.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/readn.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/recvsize.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/stage.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/android/stager.asm
@@ -7552,7 +7580,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/cat.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/cat2.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/connect.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/connectstager.asm
-${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/dup.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/dupio.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/dupsh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/echo.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/findpeer.asm
@@ -7568,6 +7596,7 @@ ${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/loader_append.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/readfile.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/readn.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/recvsize.asm
+${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/setresuid.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/sh.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/stage.asm
${PYSITELIB}/pwnlib/shellcraft/templates/thumb/linux/stager.asm
@@ -8194,16 +8223,16 @@ ${PYSITELIB}/pwnlib/util/web.pyo
${PYSITELIB}/pwnlib/version.py
${PYSITELIB}/pwnlib/version.pyc
${PYSITELIB}/pwnlib/version.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE-pwntools.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
${PYSITELIB}/pwntools-doc/CHANGELOG.md
${PYSITELIB}/pwntools-doc/CONTRIBUTING.md
${PYSITELIB}/pwntools-doc/DOCKER.md
${PYSITELIB}/pwntools-doc/LICENSE-pwntools.txt
${PYSITELIB}/pwntools-doc/README.md
+${PYSITELIB}/pwntools-doc/SECURITY.md
${PYSITELIB}/pwntools-doc/TESTING.md
-${PYSITELIB}/pwntools-doc/requirements.txt
diff --git a/py-pwntools/distinfo b/py-pwntools/distinfo
index 797555c301..722d0afabc 100644
--- a/py-pwntools/distinfo
+++ b/py-pwntools/distinfo
@@ -1,6 +1,5 @@
$NetBSD$
-BLAKE2s (pwntools-4.9.0.tar.gz) = 6bd37f2f9f96a6cc5a07cc2e390715b74f18df99600067342436271fc6aa6360
-SHA512 (pwntools-4.9.0.tar.gz) = 7cc1430777fab7580b1ece9417d338f1bb9f67406dbc7aa2ff9e6dd3424fffa1c0fc5b67c62b38af965a967d785402888099f3515b6f64a4cbd98e59f3750d5b
-Size (pwntools-4.9.0.tar.gz) = 5272272 bytes
-SHA1 (patch-setup.py) = a21a32938996d1a4dfe7f30fedaa3137ae112d67
+BLAKE2s (pwntools-4.11.1.tar.gz) = 670c93d8b84321ee0696c58bb3402235300549629caac619106ef5f042400473
+SHA512 (pwntools-4.11.1.tar.gz) = 2330214a64740a55ed15f1b25dc4e56020b5c7065c3cc0b0067e44b8f5657a34f0dfe9094497849655d7748463ccb4719eed7f02412fe08dc00ccb92fb0772be
+Size (pwntools-4.11.1.tar.gz) = 5297392 bytes
diff --git a/py-pwntools/patches/patch-setup.py b/py-pwntools/patches/patch-setup.py
deleted file mode 100644
index e8ff84f34e..0000000000
--- a/py-pwntools/patches/patch-setup.py
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-- Avoid to needs and call pandoc to convert description
-
---- setup.py.orig 2021-07-12 21:07:26.000000000 +0000
-+++ setup.py
-@@ -76,14 +76,6 @@ if not os.path.exists(PythonH):
- print("$ apt-get install python-dev", file=sys.stderr)
- sys.exit(-1)
-
--# Convert README.md to reStructuredText for PyPI
--long_description = ''
--try:
-- long_description = subprocess.check_output(['pandoc', 'README.md', '--to=rst'], universal_newlines=True)
--except Exception as e:
-- print("Failed to convert README.md through pandoc, proceeding anyway", file=sys.stderr)
-- traceback.print_exc()
--
- setup(
- name = 'pwntools',
- python_requires = '>=2.7',
-@@ -105,7 +97,6 @@ setup(
- entry_points = {'console_scripts': console_scripts},
- scripts = glob.glob("bin/*"),
- description = "Pwntools CTF framework and exploit development library.",
-- long_description = long_description,
- author = "Gallopsled et al.",
- author_email = "pwntools-users%googlegroups.com@localhost",
- url = 'https://pwntools.com',
Home |
Main Index |
Thread Index |
Old Index