summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2014-04-17 17:47:16 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2014-04-17 17:47:16 (GMT)
commit4a173bc4edfbc731f227a84a26eb24b6aef91dd6 (patch)
treee960a4496af35b2aecdf2ab3868750413d1e50a7
parenta3818a304327d31b4360dc9b545f2655d27c626e (diff)
downloadcpython-4a173bc4edfbc731f227a84a26eb24b6aef91dd6.zip
cpython-4a173bc4edfbc731f227a84a26eb24b6aef91dd6.tar.gz
cpython-4a173bc4edfbc731f227a84a26eb24b6aef91dd6.tar.bz2
Fixes for KFreeBSD and the Hurd:
- Issue #21274: Define PATH_MAX for GNU/Hurd in Python/pythonrun.c. - Issue #21276: posixmodule: Don't define USE_XATTRS on KFreeBSD and the Hurd. - Issue #21275: Fix a socket test on KFreeBSD.
-rw-r--r--Lib/test/test_socket.py2
-rw-r--r--Misc/NEWS9
-rw-r--r--Modules/posixmodule.c2
-rw-r--r--Python/pythonrun.c4
4 files changed, 15 insertions, 2 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index e94f539..aed10a7 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -867,7 +867,7 @@ class GeneralModuleTests(unittest.TestCase):
# Find one service that exists, then check all the related interfaces.
# I've ordered this by protocols that have both a tcp and udp
# protocol, at least for modern Linuxes.
- if (sys.platform.startswith(('freebsd', 'netbsd'))
+ if (sys.platform.startswith(('freebsd', 'netbsd', 'gnukfreebsd'))
or sys.platform in ('linux', 'darwin')):
# avoid the 'echo' service on this platform, as there is an
# assumption breaking non-standard port/protocol entry
diff --git a/Misc/NEWS b/Misc/NEWS
index 36322c2..2573732 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: TBA
Core and Builtins
-----------------
+- Issue #21274: Define PATH_MAX for GNU/Hurd in Python/pythonrun.c.
+
- Issue #21209: Fix sending tuples to custom generator objects with the yield
from syntax.
@@ -158,6 +160,11 @@ Library
- Issue #21209: Fix asyncio.tasks.CoroWrapper to workaround a bug
in yield-from implementation in CPythons prior to 3.4.1.
+Extension Modules
+-----------------
+
+- Issue #21276: posixmodule: Don't define USE_XATTRS on KFreeBSD and the Hurd.
+
IDLE
----
@@ -200,6 +207,8 @@ Documentation
Tests
-----
+- Issue #21275: Fix a socket test on KFreeBSD.
+
- Issue #21223: Pass test_site/test_startup_imports when some of the extensions
are built as builtins.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index dc9bd55..8cd5485 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -92,7 +92,7 @@ corresponding Unix manual entries for more information on calls.");
#undef HAVE_SCHED_SETAFFINITY
#endif
-#if defined(HAVE_SYS_XATTR_H) && defined(__GLIBC__)
+#if defined(HAVE_SYS_XATTR_H) && defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__)
#define USE_XATTRS
#endif
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index e9947e9..b3991ea 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -35,6 +35,10 @@
#define PATH_MAX MAXPATHLEN
#endif
+#ifdef __gnu_hurd__
+#define PATH_MAX MAXPATHLEN
+#endif
+
_Py_IDENTIFIER(builtins);
_Py_IDENTIFIER(excepthook);
_Py_IDENTIFIER(flush);