Hello community, here is the log from the commit of package python-cheroot for openSUSE:Factory checked in at 2019-09-07 11:31:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cheroot (Old) and /work/SRC/openSUSE:Factory/.python-cheroot.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cheroot" Sat Sep 7 11:31:45 2019 rev:6 rq:728681 version:6.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cheroot/python-cheroot.changes 2019-07-26 12:39:42.525931079 +0200 +++ /work/SRC/openSUSE:Factory/.python-cheroot.new.7948/python-cheroot.changes 2019-09-07 11:31:47.154446547 +0200 @@ -1,0 +2,12 @@ +Thu Sep 5 09:09:44 UTC 2019 - Michel Normand <[email protected]> + +- Add cheroot_fix_so_peercred_ppc.patch + to solve python 2.7 tests failures for PowerPC, boo#1147151 + +------------------------------------------------------------------- +Mon Sep 2 18:49:49 UTC 2019 - Dan Čermák <[email protected]> + +- Drop dependency on backports.functools_lru_cache for the python3 subpackage + This fixes bsc#1149124 + +------------------------------------------------------------------- New: ---- cheroot_fix_so_peercred_ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cheroot.spec ++++++ --- /var/tmp/diff_new_pack.IgIufy/_old 2019-09-07 11:31:48.166446421 +0200 +++ /var/tmp/diff_new_pack.IgIufy/_new 2019-09-07 11:31:48.202446416 +0200 @@ -17,14 +17,16 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-cheroot +%define pypi_name cheroot +Name: python-%{pypi_name} Version: 6.5.5 Release: 0 Summary: Pure-python HTTP server License: BSD-3-Clause Group: Development/Languages/Python -URL: https://github.com/cherrypy/cheroot -Source: https://files.pythonhosted.org/packages/source/c/cheroot/cheroot-%{version}.tar.gz +URL: https://github.com/cherrypy/%{pypi_name} +Source: https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Patch1: cheroot_fix_so_peercred_ppc.patch BuildRequires: %{python_module more-itertools >= 2.6} BuildRequires: %{python_module pyOpenSSL} BuildRequires: %{python_module pytest >= 2.8} @@ -55,9 +57,13 @@ Cheroot is the pure-Python HTTP server used by CherryPy. %prep -%setup -q -n cheroot-%{version} +%autosetup -n cheroot-%{version} -p1 # do not require cov/xdist/etc sed -i -e '/addopts/d' pytest.ini +for file in "%{pypi_name}.egg-info/requires.txt" "setup.cfg"; do + sed -i "s/backports.functools_lru_cache$/backports.functools_lru_cache ; python_version < '3.3'/" \ + "${file}" +done %build %python_build ++++++ cheroot_fix_so_peercred_ppc.patch ++++++ commit 621f4ee2c6cda819263be7b26f352abe879b3cd3 Author: Sviatoslav Sydorenko <[email protected]> Date: Wed Sep 4 23:41:18 2019 +0200 Fix socket.SO_PEERCRED constant fallback @ PowerPC Resolves #222 Refs: https://bugzilla.redhat.com/show_bug.cgi?id=1733967 https://www.mail-archive.com/[email protected]/msg136822.html http://ftp.linuxfoundation.org/pub/lsb/lsb-openjdk/openjdk7-lsb-overrides/lsb_flags.h https://git.wukl.net/wukl/uefi-musl/blob/29ec7677a73a5227badbb1064205be09e707e466/arch/powerpc/bits/socket.h --- cheroot/_compat.py | 3 +++ cheroot/server.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) Index: cheroot-6.5.5/cheroot/_compat.py =================================================================== --- cheroot-6.5.5.orig/cheroot/_compat.py +++ cheroot-6.5.5/cheroot/_compat.py @@ -24,6 +24,9 @@ IS_WINDOWS = SYS_PLATFORM == 'Windows' IS_LINUX = SYS_PLATFORM == 'Linux' IS_MACOS = SYS_PLATFORM == 'Darwin' +PLATFORM_ARCH = platform.machine() +IS_PPC = PLATFORM_ARCH.startswith('ppc') + if six.PY3: def ntob(n, encoding='ISO-8859-1'): Index: cheroot-6.5.5/cheroot/server.py =================================================================== --- cheroot-6.5.5.orig/cheroot/server.py +++ cheroot-6.5.5/cheroot/server.py @@ -86,6 +86,7 @@ from six.moves import urllib from . import errors, __version__ from ._compat import bton, ntou +from ._compat import IS_PPC from .workers import threadpool from .makefile import MakeFile, StreamWriter @@ -142,7 +143,7 @@ if not hasattr(socket, 'SO_PEERCRED'): which case the getsockopt() will hopefully fail. The arch specific value could be derived from platform.processor() """ - socket.SO_PEERCRED = 17 + socket.SO_PEERCRED = 21 if IS_PPC else 17 LF = b'\n'
