Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xrootd for openSUSE:Factory checked in at 2023-01-17 17:35:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrootd (Old) and /work/SRC/openSUSE:Factory/.xrootd.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrootd" Tue Jan 17 17:35:20 2023 rev:27 rq:1058810 version:5.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xrootd/xrootd.changes 2022-11-02 12:47:48.897773138 +0100 +++ /work/SRC/openSUSE:Factory/.xrootd.new.32243/xrootd.changes 2023-01-17 17:35:32.881262609 +0100 @@ -1,0 +2,7 @@ +Sun Jan 15 18:20:46 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com> + +- Add xrootd-drop-python-distutils.patch: Drop distutils usage in + favour of setuptools; upstream commit d5732ef + [gh#xrootd/xrootd#1843]. This fixes build failures on Factory. + +------------------------------------------------------------------- New: ---- xrootd-drop-python-distutils.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrootd.spec ++++++ --- /var/tmp/diff_new_pack.8EUpoA/_old 2023-01-17 17:35:33.625266925 +0100 +++ /var/tmp/diff_new_pack.8EUpoA/_new 2023-01-17 17:35:33.629266949 +0100 @@ -1,7 +1,7 @@ # # spec file for package xrootd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,10 +32,13 @@ Source0: http://xrootd.org/download/v%{version}/xrootd-%{version}.tar.gz Source1: %{name}-user.conf Source100: xrootd-rpmlintrc -Patch0: harden_cmsd@.service.patch -Patch1: harden_frm_purged@.service.patch -Patch2: harden_frm_xfrd@.service.patch -Patch3: harden_xrootd@.service.patch +# PATCH-FIX-UPSTREAM xrootd-drop-python-distutils.patch badshah...@gmail.com -- Drop distutils usage in favour of setuptools; upstream commit +Patch0: https://github.com/xrootd/xrootd/commit/d5732ef1a602ee3559aebaebd7a64d682417ec26.patch#/xrootd-drop-python-distutils.patch +# PATCH-FEATURE-OPENSUSE Hardening patches +Patch100: harden_cmsd@.service.patch +Patch101: harden_frm_purged@.service.patch +Patch102: harden_frm_xfrd@.service.patch +Patch103: harden_xrootd@.service.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} ++++++ xrootd-drop-python-distutils.patch ++++++ >From 3006ff81671b20531f8a1b3830e79d760f96df40 Mon Sep 17 00:00:00 2001 From: Matthew Feickert <matthew.feick...@cern.ch> Date: Wed, 30 Nov 2022 14:06:31 -0600 Subject: [PATCH 1/2] feat: Use setuptools over setuptools._distutils.core Drop all usage of setuptools._distutils in favor of pure setuptools. This effectively solves the problems that were present in the attempt in https://github.com/xrootd/xrootd/pull/1585 and https://github.com/xrootd/xrootd/pull/1700. Co-authored-by: Henry Schreiner <henry.fredrick.schrei...@cern.ch> --- bindings/python/setup.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in index fbac3e6dfb8..c5bbec50386 100644 --- a/bindings/python/setup.py.in +++ b/bindings/python/setup.py.in @@ -3,7 +3,7 @@ from __future__ import print_function # setuptools._distutils added in setuptools v48.0.0 # c.f. https://setuptools.pypa.io/en/latest/history.html#v48-0-0 try: - from setuptools._distutils.core import setup, Extension + from setuptools import setup, Extension # sysconfig v48.0.0+ is incompatible for Python 3.6 only, so fall back to distutils. # Instead of checking setuptools.__version__ explicitly, use the knowledge that # to get here in the 'try' block requires setuptools v48.0.0+. >From 237708dc4bff32025f1f8550621cd5d574706ac4 Mon Sep 17 00:00:00 2001 From: Matthew Feickert <matthew.feick...@cern.ch> Date: Wed, 30 Nov 2022 14:31:34 -0600 Subject: [PATCH 2/2] chore: Remove check for setuptools over distutils * Now that setuptools._distutils.core usage has been dropped, it is possible to go further and drop direct usage of distutils in favor of setuptools. This has already happened with the removal of setuptools._distutils as > from setuptools import setup, Extension should always pass, and so this commit just makes this explicitly clear by removing the try/except block. --- bindings/python/setup.py.in | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in index c5bbec50386..7fb8c53f63d 100644 --- a/bindings/python/setup.py.in +++ b/bindings/python/setup.py.in @@ -1,22 +1,14 @@ from __future__ import print_function -# setuptools._distutils added in setuptools v48.0.0 -# c.f. https://setuptools.pypa.io/en/latest/history.html#v48-0-0 -try: - from setuptools import setup, Extension - # sysconfig v48.0.0+ is incompatible for Python 3.6 only, so fall back to distutils. - # Instead of checking setuptools.__version__ explicitly, use the knowledge that - # to get here in the 'try' block requires setuptools v48.0.0+. - # FIXME: When support for Python 3.6 is dropped simplify this - import sys - - if sys.version_info < (3, 7): - from distutils import sysconfig - else: - import sysconfig -except ImportError: - from distutils.core import setup, Extension +from setuptools import setup, Extension +# sysconfig with setuptools v48.0.0+ is incompatible for Python 3.6 only, so fall back to distutils. +# FIXME: When support for Python 3.6 is dropped simplify this +import sys + +if sys.version_info < (3, 7): from distutils import sysconfig +else: + import sysconfig from os import getenv, walk, path import subprocess
