From 4ffdbde343b2298fbafa1d4fdea7a0041ce19f04 Mon Sep 17 00:00:00 2001
From: Alexander Neff <alex99.neff@gmx.de>
Date: Thu, 20 Feb 2025 18:34:06 -0500
Subject: [PATCH 1/3] Fix python 3.13 logging issue

---
 nxc/logger.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nxc/logger.py b/nxc/logger.py
index f44c37a42..88871f599 100755
--- a/nxc/logger.py
+++ b/nxc/logger.py
@@ -80,7 +80,7 @@ def wrapper(self, msg, *args, **kwargs):
 
 
 class NXCAdapter(logging.LoggerAdapter):
-    def __init__(self, extra=None):
+    def __init__(self, extra=None, merge_extra=False):
         logging.basicConfig(
             format="%(message)s",
             datefmt="[%X]",
@@ -93,6 +93,7 @@ def __init__(self, extra=None):
         )
         self.logger = logging.getLogger("nxc")
         self.extra = extra
+        self.merge_extra = merge_extra
         self.output_file = None
 
         logging.getLogger("impacket").disabled = True

From c6c1c2f14ea8ddfee45b51a3f6fea72257ac35e2 Mon Sep 17 00:00:00 2001
From: Alexander Neff <alex99.neff@gmx.de>
Date: Thu, 20 Feb 2025 18:35:43 -0500
Subject: [PATCH 2/3] Update github workflows to py3.13

---
 .github/workflows/build-binaries.yml | 2 +-
 .github/workflows/build-zipapps.yml  | 2 +-
 .github/workflows/lint.yml           | 2 +-
 .github/workflows/test.yml           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 6b7dba980..dba5bf534 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        python-version: ["3.12"]
+        python-version: ["3.13"]
         #python-version: ["3.8", "3.9", "3.10", "3.11"] # for binary builds we only need one version
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/build-zipapps.yml b/.github/workflows/build-zipapps.yml
index 9970f294d..e35b4f047 100644
--- a/.github/workflows/build-zipapps.yml
+++ b/.github/workflows/build-zipapps.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
     - uses: actions/checkout@v4
     - name: NetExec set up python on ${{ matrix.os }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f92e53d20..f747ec587 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: 3.13
           cache: poetry
           cache-dependency-path: poetry.lock
       - name: Install dependencies with dev group
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fb85ab467..9a9d281a3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       max-parallel: 5
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Install poetry

From 1911ca9e51e6b751e9ff0ed7035f6b4c72410a45 Mon Sep 17 00:00:00 2001
From: Alexander Neff <alex99.neff@gmx.de>
Date: Thu, 20 Feb 2025 18:36:51 -0500
Subject: [PATCH 3/3] Update impacket and pynfsclient

---
 poetry.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index cbe8b2612..157c33bd5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -893,7 +893,7 @@ all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2
 
 [[package]]
 name = "impacket"
-version = "0.13.0.dev0+20241125.162952.ea27e8b2"
+version = "0.13.0.dev0+20250220.93348.6315ebd5"
 description = "Network protocols Constructors and Dissectors"
 optional = false
 python-versions = "*"
@@ -917,7 +917,7 @@ six = "*"
 type = "git"
 url = "https://github.com/fortra/impacket.git"
 reference = "HEAD"
-resolved_reference = "ea27e8b2dfedf57370d2f65c5053a2b8eeb8ca9d"
+resolved_reference = "6315ebd5388cf5bf52a809b8101f18d49c6a0ef7"
 
 [[package]]
 name = "iniconfig"
@@ -1870,7 +1870,7 @@ develop = false
 type = "git"
 url = "https://github.com/Pennyw0rth/NfsClient"
 reference = "HEAD"
-resolved_reference = "a94a3254b279dc49395caecf27ec097a71eea91b"
+resolved_reference = "0fa1c048394f601d565c6301880da84912b8245a"
 
 [[package]]
 name = "pyopenssl"