Control: tags 1022430 + patch Control: tags 1022430 + pending Dear maintainer,
I've prepared an NMU for osc (versioned as 0.169.1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards, SR
diff -Nru osc-0.169.1/debian/changelog osc-0.169.1/debian/changelog --- osc-0.169.1/debian/changelog 2021-01-09 11:08:08.000000000 +0200 +++ osc-0.169.1/debian/changelog 2022-11-05 18:02:07.000000000 +0200 @@ -1,3 +1,10 @@ +osc (0.169.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Patch: Support setuptools 60. (Closes: #1022430) + + -- Stefano Rivera <stefa...@debian.org> Sat, 05 Nov 2022 18:02:07 +0200 + osc (0.169.1-1) unstable; urgency=high * New upstream release (Closes: #969999, CVE-2019-3681) diff -Nru osc-0.169.1/debian/patches/series osc-0.169.1/debian/patches/series --- osc-0.169.1/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ osc-0.169.1/debian/patches/series 2022-11-05 18:02:07.000000000 +0200 @@ -0,0 +1 @@ +setuptools-60.patch diff -Nru osc-0.169.1/debian/patches/setuptools-60.patch osc-0.169.1/debian/patches/setuptools-60.patch --- osc-0.169.1/debian/patches/setuptools-60.patch 1970-01-01 02:00:00.000000000 +0200 +++ osc-0.169.1/debian/patches/setuptools-60.patch 2022-11-05 18:02:07.000000000 +0200 @@ -0,0 +1,34 @@ +From: Stefano Rivera <stefa...@debian.org> +Date: Sat, 5 Nov 2022 17:46:58 +0200 +Subject: Import setuptools before distutils + +Setuptools 60 bundles distutils and installs its own version into +sys.path. Make sure this happens before any other distutils imports. + +Forwarded: not-needed, upstream has stripped their setup.py down +Bug-Debian: https://bugs.debian.org/1022430 +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 118e8a5..7cacc9c 100755 +--- a/setup.py ++++ b/setup.py +@@ -1,5 +1,7 @@ + #!/usr/bin/env python + ++import setuptools ++ + from distutils.core import setup + import distutils.core + from distutils.command import build, install_data +@@ -7,8 +9,6 @@ import gzip + import os.path + import sys + +-import setuptools +- + import osc.core + from osc import commandline +
