Control: tags 1022534 + patch Control: tags 1022534 + pending Dear maintainer,
I've prepared an NMU for yaramod (versioned as 3.6.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Also filed as: https://salsa.debian.org/yangfl-guest/yaramod/-/merge_requests/1 Regards. SR
diff -Nru yaramod-3.6.0/debian/changelog yaramod-3.6.0/debian/changelog --- yaramod-3.6.0/debian/changelog 2020-07-18 10:32:07.000000000 +0200 +++ yaramod-3.6.0/debian/changelog 2022-11-13 10:21:29.000000000 +0200 @@ -1,3 +1,10 @@ +yaramod (3.6.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Patch: Support setuptools >= 60 (Closes: #1022534) + + -- Stefano Rivera <stefa...@debian.org> Sun, 13 Nov 2022 10:21:29 +0200 + yaramod (3.6.0-1) unstable; urgency=medium * New upstream release diff -Nru yaramod-3.6.0/debian/patches/0004-Import-setuptools-before-distutils.patch yaramod-3.6.0/debian/patches/0004-Import-setuptools-before-distutils.patch --- yaramod-3.6.0/debian/patches/0004-Import-setuptools-before-distutils.patch 1970-01-01 02:00:00.000000000 +0200 +++ yaramod-3.6.0/debian/patches/0004-Import-setuptools-before-distutils.patch 2022-11-13 10:21:29.000000000 +0200 @@ -0,0 +1,33 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Sun, 13 Nov 2022 10:19:19 +0200 +Subject: Import setuptools before distutils + +setuptools 60 uses its own bundled version of distutils, by default. It +injects this into sys.modules, at import time. So we need to make sure +that it is imported, before anything else imports distutils, to ensure +everything is using the same distutils version. + +This change in setuptools is to prepare for Python 3.12, which will drop +distutils. + +Bug-Debian: https://bugs.debian.org/1022534 +Forwarded: https://github.com/avast/yaramod/pull/224 +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index df3cfc3..3ad5594 100644 +--- a/setup.py ++++ b/setup.py +@@ -3,9 +3,9 @@ import re + import subprocess + import sys + +-from distutils.command.build import build + from setuptools import setup, Extension + from setuptools.command.build_ext import build_ext ++from distutils.command.build import build + + + script_dir = os.path.dirname(os.path.realpath(sys.argv[0])) diff -Nru yaramod-3.6.0/debian/patches/series yaramod-3.6.0/debian/patches/series --- yaramod-3.6.0/debian/patches/series 2020-07-18 10:32:07.000000000 +0200 +++ yaramod-3.6.0/debian/patches/series 2022-11-13 10:21:29.000000000 +0200 @@ -1,3 +1,4 @@ 0001-Build-Python-module-together.patch 0002-Build-shared-library.patch 0003-Use-system-packages.patch +0004-Import-setuptools-before-distutils.patch
