From 5d23a875c3cb6d70ef9a6c2f00e3137d086107a2 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Oct 31 2017 14:22:07 +0000
Subject: drop patch 173


This was resolved upstream in 3.3/3.4.  The fix was later backported to 2.7.7rc1.

https://bugs.python.org/issue19901
https://github.com/python/cpython/commit/d82634d606583d7e2a55f57be70882a77aba5171
https://github.com/python/cpython/blob/2.7/Misc/NEWS.d/2.7.7rc1.rst

---

diff --git a/00173-workaround-ENOPROTOOPT-in-bind_port.patch b/00173-workaround-ENOPROTOOPT-in-bind_port.patch
deleted file mode 100644
index 3e83d67..0000000
--- a/00173-workaround-ENOPROTOOPT-in-bind_port.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up Python-2.7.3/Lib/test/test_support.py.rhbz913732 Python-2.7.3/Lib/test/test_support.py
---- Python-2.7.3/Lib/test/test_support.py.rhbz913732	2013-03-04 16:11:53.757315921 -0500
-+++ Python-2.7.3/Lib/test/test_support.py	2013-03-04 16:12:11.331314722 -0500
-@@ -304,7 +304,8 @@ def bind_port(sock, host=HOST):
-             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 "   \
-                                      "socket option on TCP/IP sockets!")
diff --git a/python2.spec b/python2.spec
index 23fa3cf..e348f8d 100644
--- a/python2.spec
+++ b/python2.spec
@@ -683,12 +683,6 @@ Patch169: 00169-avoid-implicit-usage-of-md5-in-multiprocessing.patch
 # (rhbz#850013)
 Patch170: 00170-gc-assertions.patch
 
-# 00173 #
-# Workaround for ENOPROTOOPT seen in Koji within
-# test.test_support.bind_port()
-# (rhbz#913732)
-Patch173: 00173-workaround-ENOPROTOOPT-in-bind_port.patch
-
 # 00174 #
 # Workaround for failure to set up prefix/exec_prefix when running
 # an embededed libpython that sets Py_SetProgramName() to a name not
@@ -1061,7 +1055,6 @@ mv Modules/cryptmodule.c Modules/_cryptmodule.c
 %patch168 -p1
 %patch169 -p1
 %patch170 -p1
-%patch173 -p1
 %patch174 -p1 -b .fix-for-usr-move
 %patch180 -p1
 %patch181 -p1