Hello community,
here is the log from the commit of package python-cheroot for
openSUSE:Leap:15.2 checked in at 2020-05-14 06:51:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-cheroot (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-cheroot.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cheroot"
Thu May 14 06:51:19 2020 rev:14 rq:803509 version:6.5.5
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-cheroot/python-cheroot.changes
2020-05-12 11:32:16.711729008 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.python-cheroot.new.2738/python-cheroot.changes
2020-05-14 06:51:23.859692072 +0200
@@ -1,0 +2,8 @@
+Mon May 11 15:02:23 UTC 2020 - Pablo Suárez Hernández
<[email protected]>
+
+- Fix Peer authentication broken on ppc64le.
+
+- Added:
+ * 0002-Fix-socket.SO_PEERCRED-constant-fallback-PowerPC.patch
+
+-------------------------------------------------------------------
New:
----
0002-Fix-socket.SO_PEERCRED-constant-fallback-PowerPC.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cheroot.spec ++++++
--- /var/tmp/diff_new_pack.w4IA6T/_old 2020-05-14 06:51:24.219692848 +0200
+++ /var/tmp/diff_new_pack.w4IA6T/_new 2020-05-14 06:51:24.223692856 +0200
@@ -25,8 +25,10 @@
Group: Development/Languages/Python
URL: https://github.com/cherrypy/cheroot
Source:
https://files.pythonhosted.org/packages/source/c/cheroot/cheroot-%{version}.tar.gz
-# PATCH-FIX_UPSTREAM //github.com/cherrypy/cheroot/pull/282
+# PATCH-FIX_UPSTREAM https://github.com/cherrypy/cheroot/pull/282
Patch1: 0001-Avoid-race-condition-on-persistent-HTTP-connections.patch
+# PATCH-FIX_UPSTREAM
https://github.com/cherrypy/cheroot/commit/621f4ee2c6cda819263be7b26f352abe879b3cd3
+Patch2: 0002-Fix-socket.SO_PEERCRED-constant-fallback-PowerPC.patch
BuildRequires: %{python_module more-itertools >= 2.6}
BuildRequires: %{python_module pyOpenSSL}
@@ -60,6 +62,7 @@
%prep
%setup -q -n cheroot-%{version}
%patch1 -p1
+%patch2 -p1
# do not require cov/xdist/etc
sed -i -e '/addopts/d' pytest.ini
++++++ 0002-Fix-socket.SO_PEERCRED-constant-fallback-PowerPC.patch ++++++
>From 86957eb6b4fa2e4aeacb23145077a8effb13c27c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <[email protected]>
Date: Wed, 4 Sep 2019 23:41:18 +0200
Subject: [PATCH] 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(-)
diff --git a/cheroot/_compat.py b/cheroot/_compat.py
index d1d1af6c..7f40c755 100644
--- a/cheroot/_compat.py
+++ b/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'):
diff --git a/cheroot/server.py b/cheroot/server.py
index d3512254..f4757b12 100644
--- a/cheroot/server.py
+++ b/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'
--
2.23.0
