diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/use-noiseprotocol-not-noise.patch | 35 |
3 files changed, 42 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 13cd7f0..2fafc7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-aioesphomeapi (25.1.0-2) unstable; urgency=medium + + * Add use-noiseprotocol-not-noise.patch. + + -- Thomas Goirand <zigo@debian.org> Sun, 08 Sep 2024 15:57:44 +0200 + python-aioesphomeapi (25.1.0-1) unstable; urgency=medium * Initial release. (Closes: #1079586) diff --git a/debian/patches/series b/debian/patches/series index aaf2817..868deaf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ relax-cryptography-depends.patch +use-noiseprotocol-not-noise.patch diff --git a/debian/patches/use-noiseprotocol-not-noise.patch b/debian/patches/use-noiseprotocol-not-noise.patch new file mode 100644 index 0000000..97e0d40 --- /dev/null +++ b/debian/patches/use-noiseprotocol-not-noise.patch @@ -0,0 +1,35 @@ +Description: Use noiseprotocol + The noiseprotocol package in Debian was conflicting with another + thing that uses the "noise" namespace, so we have to follow. +Author: Thomas Goirand <zigo@debian.org> +Forwarded: no +Last-Update: 2024-09-08 + +--- python-aioesphomeapi-25.1.0.orig/aioesphomeapi/_frame_helper/noise.py ++++ python-aioesphomeapi-25.1.0/aioesphomeapi/_frame_helper/noise.py +@@ -9,11 +9,11 @@ from typing import TYPE_CHECKING, Any, C + + from chacha20poly1305_reuseable import ChaCha20Poly1305Reusable + from cryptography.exceptions import InvalidTag +-from noise.backends.default import DefaultNoiseBackend # type: ignore[import-untyped] +-from noise.backends.default.ciphers import ( # type: ignore[import-untyped] ++from noiseprotocol.backends.default import DefaultNoiseBackend # type: ignore[import-untyped] ++from noiseprotocol.backends.default.ciphers import ( # type: ignore[import-untyped] + ChaCha20Cipher, + ) +-from noise.connection import NoiseConnection # type: ignore[import-untyped] ++from noiseprotocol.connection import NoiseConnection # type: ignore[import-untyped] + + from ..core import ( + APIConnectionError, +--- python-aioesphomeapi-25.1.0.orig/tests/test__frame_helper.py ++++ python-aioesphomeapi-25.1.0/tests/test__frame_helper.py +@@ -6,7 +6,7 @@ from typing import Any + from unittest.mock import AsyncMock, MagicMock, patch + + import pytest +-from noise.connection import NoiseConnection # type: ignore[import-untyped] ++from noiseprotocol.connection import NoiseConnection # type: ignore[import-untyped] + + from aioesphomeapi import APIConnection + from aioesphomeapi._frame_helper import APINoiseFrameHelper, APIPlaintextFrameHelper |