diff --git a/python-impacket.changes b/python-impacket.changes index 58f8f6c..b107b2d 100644 --- a/python-impacket.changes +++ b/python-impacket.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 5 01:47:52 UTC 2023 - Steve Kowalik + +- Add patch remove-future-requirement.patch, remove future requirement. +- Switch to pyproject macros. + ------------------------------------------------------------------- Sun Aug 27 10:04:40 UTC 2023 - Martin Hauke diff --git a/python-impacket.spec b/python-impacket.spec index 48c4be7..b12e97c 100644 --- a/python-impacket.spec +++ b/python-impacket.spec @@ -29,17 +29,21 @@ Group: Development/Languages/Python URL: https://www.secureauth.com/labs/open-source-tools/impacket #Git-Clone: https://github.com/fortra/impacket.git Source: https://files.pythonhosted.org/packages/source/i/impacket/impacket-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#fortra/impacket#1598 +Patch0: remove-future-requirement.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Flask >= 1.0 Requires: python-charset-normalizer -Requires: python-future Requires: python-ldap3 >= 2.5 Requires: python-ldapdomaindump >= 0.9.0 Requires: python-pyOpenSSL >= 0.13.1 Requires: python-pyasn1 >= 0.2.3 Requires: python-pycryptodomex +Requires: python-setuptools Requires: python-six Requires(post): update-alternatives Requires(postun):update-alternatives @@ -47,7 +51,6 @@ BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module Flask >= 1.0} BuildRequires: %{python_module chardet} -BuildRequires: %{python_module future} BuildRequires: %{python_module ldap3 >= 2.5} BuildRequires: %{python_module ldapdomaindump >= 0.9.0} BuildRequires: %{python_module pyOpenSSL >= 0.13.1} @@ -75,10 +78,10 @@ sed -e '/^#!\//, 1d' -i \ impacket/mqtt.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand cd %{buildroot}%{_bindir} && find . -name "*.py" -exec sh -c 'mv $0 impacket-`basename "$0" .py`' '{}' \; for b in %{binaries}; do %python_clone -a %{buildroot}%{_bindir}/$b @@ -141,6 +144,7 @@ rm tests/misc/test_structure.py %{lua:for b in rpm.expand("%{binaries}"):gmatch("%S+") do print(rpm.expand("%python_alternative %{_bindir}/" .. b .. "\n")) end} -%{python_sitelib}/impacket* +%{python_sitelib}/impacket +%{python_sitelib}/impacket-%{version}.dist-info %changelog diff --git a/remove-future-requirement.patch b/remove-future-requirement.patch new file mode 100644 index 0000000..b7c0dfd --- /dev/null +++ b/remove-future-requirement.patch @@ -0,0 +1,43 @@ +From b4bd3dab932d655586601cfe407f7bcc69d521d9 Mon Sep 17 00:00:00 2001 +From: anadrianmanrique +Date: Tue, 15 Aug 2023 20:36:47 +0000 +Subject: [PATCH 1/2] added setuptools requirement for pkg_resources python + library removed future as it wasn't being used + +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index cd19c89ec..3e113aae2 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,4 +1,4 @@ +-future ++setuptools + six + charset_normalizer + pyasn1>=0.2.3 + +From 479750fe2df28bcd1441404fe031be5a5d216c05 Mon Sep 17 00:00:00 2001 +From: anadrianmanrique +Date: Wed, 16 Aug 2023 13:10:46 +0000 +Subject: [PATCH 2/2] added setuptools to requirements, removed future + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 47a651f66..f9484a04c 100644 +--- a/setup.py ++++ b/setup.py +@@ -68,7 +68,7 @@ def read(fname): + scripts=glob.glob(os.path.join('examples', '*.py')), + data_files=data_files, + install_requires=['pyasn1>=0.2.3', 'pycryptodomex', 'pyOpenSSL>=21.0.0', 'six', 'ldap3>=2.5,!=2.5.2,!=2.5.0,!=2.6', +- 'ldapdomaindump>=0.9.0', 'flask>=1.0', 'future', 'charset_normalizer', 'dsinternals'], ++ 'ldapdomaindump>=0.9.0', 'flask>=1.0', 'setuptools', 'charset_normalizer', 'dsinternals'], + extras_require={'pyreadline:sys_platform=="win32"': [], + }, + classifiers=[