From c63af87347e126396c89a46c6f9067c2e8dbf254 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Tue, 29 Mar 2016 13:15:46 +0200 Subject: [PATCH] Remove Patch173 as test.support.bind_port seems to work --- 00173-workaround-ENOPROTOOPT-in-bind_port.patch | 12 ------------ python3.spec | 8 +------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 00173-workaround-ENOPROTOOPT-in-bind_port.patch diff --git a/00173-workaround-ENOPROTOOPT-in-bind_port.patch b/00173-workaround-ENOPROTOOPT-in-bind_port.patch deleted file mode 100644 index 8d8b0bc..0000000 --- a/00173-workaround-ENOPROTOOPT-in-bind_port.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Python-3.4.0b1/Lib/test/support/__init__.py.orig 2013-11-27 12:14:26.507216624 +0100 -+++ Python-3.4.0b1/Lib/test/support/__init__.py 2013-11-27 12:17:01.490805587 +0100 -@@ -593,7 +593,8 @@ - if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1: - raise TestFailed("tests should never set the SO_REUSEADDR " \ - "socket option on TCP/IP sockets!") -- if hasattr(socket, 'SO_REUSEPORT'): -+ if hasattr(socket, 'SO_REUSEPORT') \ -+ and 'WITHIN_PYTHON_RPM_BUILD' not in os.environ: # rhbz#913732 - try: - if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1: - raise TestFailed("tests should never set the SO_REUSEPORT " \ diff --git a/python3.spec b/python3.spec index 70b3dab..1c21ce0 100644 --- a/python3.spec +++ b/python3.spec @@ -331,11 +331,6 @@ Patch163: 00163-disable-parts-of-test_socket-in-rpm-build.patch # (rhbz#850013 Patch170: 00170-gc-assertions.patch -# 00173 # -# Workaround for ENOPROTOOPT seen in Koji withi test.support.bind_port() -# (rhbz#913732) -Patch173: 00173-workaround-ENOPROTOOPT-in-bind_port.patch - # 00178 # # Don't duplicate various FLAGS in sysconfig values # http://bugs.python.org/issue17679 @@ -648,11 +643,10 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en %patch160 -p1 %patch163 -p1 %patch170 -p0 -%patch173 -p1 %patch178 -p1 %patch179 -p1 %patch180 -p1 -%patch184 -p1 +%patch184 -p1 %patch186 -p1 %patch188 -p1