[Buildroot] [PATCH 01/21] package/python-aexpect: bump version to 1.8.0

[Bernd Kuhls]

Removed patch which is included in this release.

Signed-off-by: Bernd Kuhls <bernd at kuhls.net>
---
 .../0001-Drop-the-use-of-pipes.patch          | 70 -------------------
 package/python-aexpect/python-aexpect.hash    |  4 +-
 package/python-aexpect/python-aexpect.mk      |  4 +-
 3 files changed, 4 insertions(+), 74 deletions(-)
 delete mode 100644 package/python-aexpect/0001-Drop-the-use-of-pipes.patch

diff --git a/package/python-aexpect/0001-Drop-the-use-of-pipes.patch b/package/python-aexpect/0001-Drop-the-use-of-pipes.patch
deleted file mode 100644
index a952ddc8fb..0000000000
--- a/package/python-aexpect/0001-Drop-the-use-of-pipes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3753ad491bf5847a11a7f4baf3ecaa490e0e9111 Mon Sep 17 00:00:00 2001
-From: Xu Han <xuhan at redhat.com>
-Date: Wed, 31 Jan 2024 14:57:37 +0800
-Subject: [PATCH] Drop the use of pipes
-
-`pipes` was deprecated since version 3.11 so let's replace the use
-of that module with the alternatives.
-
-Signed-off-by: Xu Han <xuhan at redhat.com>
-Upstream: https://github.com/avocado-framework/aexpect/commit/f2b888b1bd453a46820d38b62fd2b5db1228e4b7
-[Romain: backport to 1.7.0]
-Signed-off-by: Romain Naour <romain.naour at smile.fr>
----
- aexpect/remote.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/aexpect/remote.py b/aexpect/remote.py
-index d7e09ec..2bfd92a 100644
---- a/aexpect/remote.py
-+++ b/aexpect/remote.py
-@@ -47,7 +47,7 @@ import logging
- import time
- import re
- import os
--import pipes
-+import shlex
- 
- from aexpect.client import Expect
- from aexpect.client import RemoteSession
-@@ -217,8 +217,8 @@ def quote_path(path):
-     :return: Shell escaped version
-     """
-     if isinstance(path, list):
--        return ' '.join(map(pipes.quote, path))
--    return pipes.quote(path)
-+        return ' '.join(map(shlex.quote, path))
-+    return shlex.quote(path)
- 
- 
- def handle_prompts(session, username, password, prompt=PROMPT_LINUX,
-@@ -621,7 +621,7 @@ def scp_to_remote(host, port, username, password, local_path, remote_path,
-                 r"-o StrictHostKeyChecking=no "
-                 fr"-o PreferredAuthentications=password {limit} "
-                 fr"-P {port} {quote_path(local_path)} {username}@\[{host}\]:"
--                fr"{pipes.quote(remote_path)}")
-+                fr"{shlex.quote(remote_path)}")
-     password_list = [password]
-     return remote_scp(command, password_list,
-                       log_filename, log_function, timeout)
-@@ -664,7 +664,7 @@ def scp_from_remote(host, port, username, password, remote_path, local_path,
-                 r"-o StrictHostKeyChecking=no "
-                 fr"-o PreferredAuthentications=password {limit} "
-                 fr"-P {port} {username}@\[{host}\]:{quote_path(remote_path)} "
--                fr"{pipes.quote(local_path)}")
-+                fr"{shlex.quote(local_path)}")
-     password_list = [password]
-     remote_scp(command, password_list,
-                log_filename, log_function, timeout)
-@@ -717,7 +717,7 @@ def scp_between_remotes(src, dst, port, s_passwd, d_passwd, s_name, d_name,
-                 r"-o StrictHostKeyChecking=no "
-                 fr"-o PreferredAuthentications=password {limit} -P {port}"
-                 fr" {s_name}@\[{src}\]:{quote_path(s_path)} {d_name}@\[{dst}\]"
--                fr":{pipes.quote(d_path)}")
-+                fr":{shlex.quote(d_path)}")
-     password_list = [s_passwd, d_passwd]
-     return remote_scp(command, password_list,
-                       log_filename, log_function, timeout)
--- 
-2.50.1
-
diff --git a/package/python-aexpect/python-aexpect.hash b/package/python-aexpect/python-aexpect.hash
index ff30c765e3..8ca28a2e71 100644
--- a/package/python-aexpect/python-aexpect.hash
+++ b/package/python-aexpect/python-aexpect.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/aexpect/json
-md5  bb05319c277cfe97114780579d251c30  aexpect-1.7.0.tar.gz
-sha256  11bfeea78ef6147ac8f6e29c2a720bd332598383d88274cdca5e6413c2070d52  aexpect-1.7.0.tar.gz
+md5  46eb96cf409cd59c8d39ca5c092b734e  aexpect-1.8.0.tar.gz
+sha256  97b753e4b0aa08d455bd64d2486c97d6bf6a18a9b8c26315519ec61448400b78  aexpect-1.8.0.tar.gz
 # Locally computed sha256 checksums
 sha256  7be26abf35e531a226dc742d2379d42d372cb61f027a6e26477c0e2f1a03bfcb  LICENSE
diff --git a/package/python-aexpect/python-aexpect.mk b/package/python-aexpect/python-aexpect.mk
index 1cfcc9ffaf..066f8d0480 100644
--- a/package/python-aexpect/python-aexpect.mk
+++ b/package/python-aexpect/python-aexpect.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_AEXPECT_VERSION = 1.7.0
+PYTHON_AEXPECT_VERSION = 1.8.0
 PYTHON_AEXPECT_SOURCE = aexpect-$(PYTHON_AEXPECT_VERSION).tar.gz
-PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/dd/32/738b5190adb5ed387d3e755885f646b714fbf9c22adbda7ff988db7ede49
+PYTHON_AEXPECT_SITE = https://files.pythonhosted.org/packages/a3/74/837acfcdb3187cb931aa2edc4979e64aa9954092e4fd36b1161f65d65fdb
 PYTHON_AEXPECT_SETUP_TYPE = setuptools
 PYTHON_AEXPECT_LICENSE = GPL-2.0+
 PYTHON_AEXPECT_LICENSE_FILES = LICENSE
-- 
2.47.3