From 7add513b62f2c7abf3278430c310f140609a6da7 Mon Sep 17 00:00:00 2001
From: Arusekk <arek_koz@o2.pl>
Date: Sat, 29 Jul 2023 19:06:07 +0200
Subject: [PATCH 1/4] deps: make socks and serial optional

---
 pwn/toplevel.py                  |  7 ++++++-
 pwnlib/context/__init__.py       |  4 ++--
 pwnlib/protocols/adb/__init__.py |  1 -
 pwnlib/tubes/remote.py           | 16 +++++++++-------
 pwnlib/tubes/serialtube.py       |  5 +++--
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pwn/toplevel.py b/pwn/toplevel.py
index 92b01ad1d..727997330 100644
--- a/pwn/toplevel.py
+++ b/pwn/toplevel.py
@@ -6,7 +6,6 @@
 import os
 import platform
 import re
-import socks
 import signal
 import string
 import struct
@@ -84,6 +83,7 @@
 debug   = log.debug
 success = log.success
 
+# optional deps
 try:
     import colored_traceback
 except ImportError:
@@ -91,5 +91,10 @@
 else:
     colored_traceback.add_hook()
 
+try:
+    import socks
+except ImportError:
+    pass
+
 # Equivalence with the default behavior of "from import *"
 # __all__ = [x for x in tuple(globals()) if not x.startswith('_')]
diff --git a/pwnlib/context/__init__.py b/pwnlib/context/__init__.py
index 10a7a4f9c..badd89ed7 100644
--- a/pwnlib/context/__init__.py
+++ b/pwnlib/context/__init__.py
@@ -23,8 +23,6 @@
 import threading
 import time
 
-import socks
-
 from pwnlib.config import register_config
 from pwnlib.device import Device
 from pwnlib.timeout import Timeout
@@ -1191,6 +1189,8 @@ def proxy(self, proxy):
             socket.socket = _original_socket
             return None
 
+        import socks  # keep dependency optional
+
         if isinstance(proxy, str):
             proxy = (socks.SOCKS5, proxy)
 
diff --git a/pwnlib/protocols/adb/__init__.py b/pwnlib/protocols/adb/__init__.py
index bf305c74b..1c7f199a5 100644
--- a/pwnlib/protocols/adb/__init__.py
+++ b/pwnlib/protocols/adb/__init__.py
@@ -23,7 +23,6 @@
 from pwnlib.util.lists import group
 from pwnlib.util.misc import size
 from pwnlib.util.packing import p32
-from pwnlib.util.proc import pidof
 from pwnlib.util.sh_string import sh_string
 
 log = getLogger(__name__)
diff --git a/pwnlib/tubes/remote.py b/pwnlib/tubes/remote.py
index 58008194c..a2466ae2e 100644
--- a/pwnlib/tubes/remote.py
+++ b/pwnlib/tubes/remote.py
@@ -2,7 +2,6 @@
 from __future__ import division
 
 import socket
-import socks
 
 from pwnlib.log import getLogger
 from pwnlib.timeout import Timeout
@@ -97,11 +96,12 @@ def __init__(self, host, port,
                 self.sock = ssl_context.wrap_socket(self.sock,**ssl_args)
 
     def _connect(self, fam, typ):
-        sock    = None
+        err = None
+        sock = None
         timeout = self.timeout
 
         with self.waitfor('Opening connection to %s on port %s' % (self.rhost, self.rport)) as h:
-            for res in socket.getaddrinfo(self.rhost, self.rport, fam, typ, 0, socket.AI_PASSIVE):
+            for res in socket.getaddrinfo(self.rhost, self.rport, fam, typ):
                 self.family, self.type, self.proto, _canonname, sockaddr = res
 
                 if self.type not in [socket.SOCK_STREAM, socket.SOCK_DGRAM]:
@@ -119,11 +119,13 @@ def _connect(self, fam, typ):
 
                 try:
                     sock.connect(sockaddr)
+                    err = None  # break ref cycle
                     return sock
-                except socks.ProxyError:
-                    raise
-                except socket.error:
-                    pass
+                except IOError as e:
+                    if err is None:
+                        err = e
+            if err is not None:
+                raise err
             self.error("Could not connect to %s on port %s", self.rhost, self.rport)
 
     @classmethod
diff --git a/pwnlib/tubes/serialtube.py b/pwnlib/tubes/serialtube.py
index f8d7b72b3..2cb06f931 100644
--- a/pwnlib/tubes/serialtube.py
+++ b/pwnlib/tubes/serialtube.py
@@ -6,8 +6,6 @@
 import sys
 import time
 
-import serial
-
 from pwnlib.log import getLogger
 from pwnlib.tubes import tube
 
@@ -30,6 +28,9 @@ def __init__(
         self.convert_newlines = convert_newlines
         # serial.Serial might throw an exception, which must be handled
         # and propagated accordingly using self.exception
+
+        import serial
+
         try:
             self.conn = serial.Serial(
                 port = port,

From 3c1b4535123a9c0bb05a008a1282cf407b5620ca Mon Sep 17 00:00:00 2001
From: Arusekk <arek_koz@o2.pl>
Date: Sun, 20 Aug 2023 12:46:27 +0200
Subject: [PATCH 2/4] make optional deps actually install-time optional

---
 README.md      |  2 +-
 pyproject.toml | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c9d31bf4b..26222e1df 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Python3 is suggested, but Pwntools still works with Python 2.7.  Most of the fun
 apt-get update
 apt-get install python3 python3-pip python3-dev git libssl-dev libffi-dev build-essential
 python3 -m pip install --upgrade pip
-python3 -m pip install --upgrade pwntools
+python3 -m pip install --upgrade pwntools[full]
 ```
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 832f7ef9d..c28dba207 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -34,30 +34,34 @@ keywords = ["pwntools", "exploit", "ctf", "capture", "the", "flag", "binary", "w
 
 requires-python = ">=2.7"
 dependencies = [
-    "paramiko>=1.15.2",
     "mako>=1.0.0",
     "pyelftools>=0.2.4",
-    "capstone>=3.0.5rc2",  # see Gallopsled/pwntools#971, Gallopsled/pwntools#1160
     "ropgadget>=5.3",
-    "pyserial>=2.7",
-    "requests>=2.0",
     "pip>=6.0.8",
     "pygments>=2.0",
-    "pysocks",
     "python-dateutil",
     "packaging",
     "psutil>=3.3.0",
     "intervaltree>=3.0",
     "sortedcontainers",
-    "unicorn>=1.0.2rc1",  # see unicorn-engine/unicorn#1100 and #1170
     "six>=1.12.0",
-    "rpyc",
-    "colored_traceback",
     "pathlib2; python_version < '3.4'",
     "unix-ar; python_version >= '3'",
     "zstandard",
 ]
 
+[project.optional-dependencies]
+full = [
+    "capstone>=3.0.5rc2",  # see Gallopsled/pwntools#971, Gallopsled/pwntools#1160
+    "colored_traceback",
+    "paramiko>=1.15.2",
+    "pyserial>=2.7",
+    "pysocks",
+    "requests>=2.0",
+    "rpyc",
+    "unicorn>=1.0.2rc1",  # see unicorn-engine/unicorn#1100 and #1170
+]
+
 [project.urls]
 homepage = "https://pwntools.com"
 download = "https://github.com/Gallopsled/pwntools/releases"

From 63d885ea0eb31ebce7589f2f8fdd085c7f5137fd Mon Sep 17 00:00:00 2001
From: Arusekk <arek_koz@o2.pl>
Date: Sun, 24 Sep 2023 14:57:39 +0200
Subject: [PATCH 3/4] ci: Try to fix pylint

---
 .github/workflows/pylint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index b70becc94..f6b08813f 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -27,7 +27,7 @@ jobs:
       run: |
         set -x
         pip install pylint
-        pip install --upgrade -e .
+        pip install --upgrade -e .[full]
         pylint --exit-zero --errors-only pwnlib -f parseable | cut -d ' ' -f2- > current.txt
         git fetch origin
         git checkout origin/"$GITHUB_BASE_REF"

From 8ee99a570eb6ac2527da986e1115ccc5fb0a79a5 Mon Sep 17 00:00:00 2001
From: Arusekk <arek_koz@o2.pl>
Date: Sun, 24 Sep 2023 15:06:33 +0200
Subject: [PATCH 4/4] tubes/remote: Fix doctests

---
 pwnlib/tubes/remote.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pwnlib/tubes/remote.py b/pwnlib/tubes/remote.py
index a2466ae2e..f749c88af 100644
--- a/pwnlib/tubes/remote.py
+++ b/pwnlib/tubes/remote.py
@@ -40,7 +40,7 @@ class remote(sock):
         >>> r = remote('127.0.0.1', 1)
         Traceback (most recent call last):
         ...
-        PwnlibException: Could not connect to 127.0.0.1 on port 1
+        ConnectionRefusedError: [Errno 111] Connection refused
 
         You can also use :meth:`.remote.fromsocket` to wrap an existing socket.