[Backport rev. 51728 by neal.norwitz]

Patch #1540470, for OpenBSD 4.0.  Backport candidate for 2.[34].

diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index 8835ea3f5866f1d7a55f26b6a8c19422299bedad..1427f67bb2995d9351a6db024493528d990a9c3a 100755 (executable)
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -23,7 +23,7 @@ if sys.platform.startswith('atheos'):
 if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin',
                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
                     'bsdos2', 'bsdos3', 'bsdos4',
-                    'openbsd', 'openbsd2', 'openbsd3'):
+                    'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
     if struct.calcsize('l') == 8:
         off_t = 'l'
         pid_t = 'i'

diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index d5ae5de86f055e121fe27cbd2b28a78ba6792776..e6932cd4450ab5ea92759ff5f9dd07c8496335ff 100644 (file)
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -27,7 +27,7 @@ has_spawnl = hasattr(os, 'spawnl')
 # number of files that can be opened at one time (see ulimit -n)
 if sys.platform == 'mac':
     TEST_FILES = 32
-elif sys.platform == 'openbsd3':
+elif sys.platform in ('openbsd3', 'openbsd4'):
     TEST_FILES = 48
 else:
     TEST_FILES = 100

diff --git a/Misc/NEWS b/Misc/NEWS
index fb20fa43a5dc693e6b55c2cc9fde6f4e0267eb0a..bc48b007b2d6f2f5688e47a9a1b076a9f12e85ff 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -218,7 +218,7 @@ Build
 
 - Bug #1502728: Correctly link against librt library on HP-UX.
 
-- OpenBSD 3.9 is now supported.
+- OpenBSD 3.9 and 4.0 are now supported.
 
 - Test for sys/statvfs.h before including it, as statvfs is present
   on some OSX installation, but its header file is not.

diff --git a/configure b/configure
index 5bc56dcd718a7dfbdc6d5cf9564072d8a1700f53..4f25e0941d0ae48743a35d88feaf56f61d350b01 100755 (executable)
--- a/configure
+++ b/configure
@@ -1480,7 +1480,7 @@ case $ac_sys_system/$ac_sys_release in
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.[0123456789])
+  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0])
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.

diff --git a/configure.in b/configure.in
index 45af720e9f8661e7fa4dc84d73d3e03c4aaa4d27..f66f43db2fc837d100f02487368ab6b704c2781a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -140,7 +140,7 @@ case $ac_sys_system/$ac_sys_release in
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@) 
+  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0@:>@) 
     define_xopen_source=no;;
   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
   # of union __?sigval. Reported by Stuart Bishop.