Hi,
Attached is a patch to update lang/python/2.4 to 2.4.4. It passes regress
on i386, but needs testing on other platforms.
-d
? w-python-2.4.4
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.4/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 10 Oct 2006 19:08:06 -0000 1.8
+++ Makefile 21 Oct 2006 01:22:40 -0000
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2006/10/10 19:08:06 alek Exp $
VERSION= 2.4
-PATCHLEVEL= .3
-PKG_PATCHLEVEL= p1
+PATCHLEVEL= .4
+PKG_PATCHLEVEL=
SHARED_LIBS= python2.4 0.0
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" ||
${MACHINE_ARCH} == "sparc64"
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.4/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 18 Apr 2006 17:29:35 -0000 1.3
+++ distinfo 21 Oct 2006 01:22:40 -0000
@@ -1,4 +1,4 @@
-MD5 (Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7
-RMD160 (Python-2.4.3.tgz) = 38757170a0e523c337c9266522916148970b8656
-SHA1 (Python-2.4.3.tgz) = 9b4daccb21b324e270c15a0db7f6425edef8e985
-SIZE (Python-2.4.3.tgz) = 9348239
+MD5 (Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58
+RMD160 (Python-2.4.4.tgz) = 3571184fbd370fd369a7c9dc63743c50238b1a85
+SHA1 (Python-2.4.4.tgz) = 123d7cf88934e50c3d834a43ef6080f2590347d3
+SIZE (Python-2.4.4.tgz) = 9531474
Index: patches/patch-Lib_test_regrtest_py
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-Lib_test_regrtest_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Lib_test_regrtest_py
--- patches/patch-Lib_test_regrtest_py 7 Jun 2005 01:12:58 -0000 1.1.1.1
+++ patches/patch-Lib_test_regrtest_py 21 Oct 2006 01:22:40 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-Lib_test_regrtest_py,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
---- Lib/test/regrtest.py.orig Sat Nov 13 12:13:35 2004
-+++ Lib/test/regrtest.py Fri Dec 31 16:52:45 2004
-@@ -1064,6 +1064,32 @@ _expectations = {
- test_winreg
- test_winsound
+--- Lib/test/regrtest.py.orig Mon Mar 13 16:53:04 2006
++++ Lib/test/regrtest.py Sat Oct 21 11:10:18 2006
+@@ -1113,7 +1113,34 @@ _expectations = {
+ test_zipimport
+ test_zlib
""",
+ 'openbsd3':
+ """
@@ -32,5 +32,7 @@ $OpenBSD: patch-Lib_test_regrtest_py,v 1
+ test_winsound
+ """,
}
++_expectations['openbsd4'] = _expectations['openbsd3']
_expectations['freebsd5'] = _expectations['freebsd4']
_expectations['freebsd6'] = _expectations['freebsd4']
+
Index: patches/patch-Lib_test_test_tempfile_py
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-Lib_test_test_tempfile_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Lib_test_test_tempfile_py
--- patches/patch-Lib_test_test_tempfile_py 7 Jun 2005 01:12:58 -0000
1.1.1.1
+++ patches/patch-Lib_test_test_tempfile_py 21 Oct 2006 01:22:40 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Lib_test_test_tempfile_py,v 1.1.1.1 2005/06/07 01:12:58 alek
Exp $
---- Lib/test/test_tempfile.py.orig Wed Sep 15 08:02:54 2004
-+++ Lib/test/test_tempfile.py Thu Dec 30 22:46:12 2004
+--- Lib/test/test_tempfile.py.orig Tue Oct 3 23:08:57 2006
++++ Lib/test/test_tempfile.py Sat Oct 21 11:06:13 2006
@@ -30,7 +30,7 @@ if sys.platform == 'mac':
- elif sys.platform == 'openbsd3':
+ elif sys.platform in ('openbsd3', 'openbsd4'):
TEST_FILES = 48
else:
- TEST_FILES = 100
Index: patches/patch-Lib_test_test_timeout_py
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-Lib_test_test_timeout_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Lib_test_test_timeout_py
--- patches/patch-Lib_test_test_timeout_py 7 Jun 2005 01:12:58 -0000
1.1.1.1
+++ patches/patch-Lib_test_test_timeout_py 21 Oct 2006 01:22:40 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Lib_test_test_timeout_py,v 1.1.1.1 2005/06/07 01:12:58 alek
Exp $
---- Lib/test/test_timeout.py.orig Sun Jul 11 12:10:16 2004
-+++ Lib/test/test_timeout.py Sun Jul 11 18:04:16 2004
+--- Lib/test/test_timeout.py.orig Sat Mar 18 13:47:38 2006
++++ Lib/test/test_timeout.py Sat Oct 21 11:06:13 2006
@@ -108,7 +108,7 @@ class TimeoutTestCase(unittest.TestCase)
def testConnectTimeout(self):
@@ -9,4 +9,4 @@ $OpenBSD: patch-Lib_test_test_timeout_py
+ _timeout = 0.0001
self.sock.settimeout(_timeout)
- _t1 = time.time()
+ # If we are too close to www.python.org, this test will fail.
Index: patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-Makefile_pre_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_pre_in
--- patches/patch-Makefile_pre_in 27 Dec 2005 19:41:21 -0000 1.2
+++ patches/patch-Makefile_pre_in 21 Oct 2006 01:22:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.2 2005/12/27 19:41:21 alek Exp $
---- Makefile.pre.in.orig Tue Mar 29 01:23:01 2005
-+++ Makefile.pre.in Sat Dec 24 10:36:43 2005
-@@ -311,7 +311,7 @@ all: $(BUILDPYTHON) oldsharedmods share
+--- Makefile.pre.in.orig Mon Oct 9 03:41:25 2006
++++ Makefile.pre.in Sat Oct 21 11:06:13 2006
+@@ -315,7 +315,7 @@ all: $(BUILDPYTHON) oldsharedmods share
$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
@@ -10,9 +10,9 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 20
platform: $(BUILDPYTHON)
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util
import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -360,6 +360,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
+@@ -364,6 +364,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
+# This rule for OpenBSD...
+$(LDLIBRARY): $(LIBRARY)
@@ -22,7 +22,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 20
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
# minimal framework (not including the Lib directory and such) in the current
# directory.
-@@ -596,7 +601,6 @@ bininstall: altbininstall
+@@ -626,7 +631,6 @@ bininstall: altbininstall
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
@@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 20
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
-@@ -607,7 +611,7 @@ altbininstall: $(BUILDPYTHON)
+@@ -637,7 +641,7 @@ altbininstall: $(BUILDPYTHON)
exit 1; \
fi; \
fi
@@ -39,7 +39,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 20
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
-@@ -616,14 +620,12 @@ altbininstall: $(BUILDPYTHON)
+@@ -646,14 +650,12 @@ altbininstall: $(BUILDPYTHON)
fi; \
done
$(INSTALL_PROGRAM) $(BUILDPYTHON)
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
@@ -57,7 +57,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.2 20
fi; \
else true; \
fi
-@@ -639,7 +641,7 @@ maninstall:
+@@ -669,7 +671,7 @@ maninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
Index: patches/patch-Modules_posixmodule_c
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-Modules_posixmodule_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Modules_posixmodule_c
--- patches/patch-Modules_posixmodule_c 7 Jun 2005 01:12:58 -0000 1.1.1.1
+++ patches/patch-Modules_posixmodule_c 21 Oct 2006 01:22:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_posixmodule_c,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
---- Modules/posixmodule.c.orig Fri Feb 18 17:13:36 2005
-+++ Modules/posixmodule.c Fri Feb 18 17:14:28 2005
-@@ -789,7 +789,7 @@ statresult_new(PyTypeObject *type, PyObj
+--- Modules/posixmodule.c.orig Tue Oct 10 05:29:06 2006
++++ Modules/posixmodule.c Sat Oct 21 11:06:14 2006
+@@ -805,7 +805,7 @@ statresult_new(PyTypeObject *type, PyObj
/* If true, st_?time is float. */
@@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_posixmodule_c,v
PyDoc_STRVAR(stat_float_times__doc__,
"stat_float_times([newval]) -> oldval\n\n\
-@@ -5350,6 +5349,10 @@ posix_read(PyObject *self, PyObject *arg
+@@ -5417,6 +5417,10 @@ posix_read(PyObject *self, PyObject *arg
PyObject *buffer;
if (!PyArg_ParseTuple(args, "ii:read", &fd, &size))
return NULL;
Index: patches/patch-Modules_socketmodule_c
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-Modules_socketmodule_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Modules_socketmodule_c
--- patches/patch-Modules_socketmodule_c 18 Apr 2006 17:29:35 -0000
1.3
+++ patches/patch-Modules_socketmodule_c 21 Oct 2006 01:22:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_socketmodule_c,v 1.3 2006/04/18 17:29:35 alek Exp $
---- Modules/socketmodule.c.orig Mon Feb 20 10:42:37 2006
-+++ Modules/socketmodule.c Mon Apr 17 20:33:22 2006
-@@ -63,9 +63,6 @@ Local naming conventions:
+--- Modules/socketmodule.c.orig Wed Oct 11 02:20:41 2006
++++ Modules/socketmodule.c Sat Oct 21 11:06:14 2006
+@@ -72,9 +72,6 @@ Local naming conventions:
#include "Python.h"
@@ -11,7 +11,7 @@ $OpenBSD: patch-Modules_socketmodule_c,v
/* Socket object documentation */
PyDoc_STRVAR(sock_doc,
"socket([family[, type[, proto]]]) -> socket object\n\
-@@ -1757,10 +1754,15 @@ internal_connect(PySocketSockObject *s,
+@@ -1807,10 +1804,15 @@ internal_connect(PySocketSockObject *s,
if (s->sock_timeout > 0.0) {
if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
@@ -30,9 +30,9 @@ $OpenBSD: patch-Modules_socketmodule_c,v
}
}
-@@ -3252,7 +3254,7 @@ socket_inet_aton(PyObject *self, PyObjec
- struct in_addr buf;
- #else
+@@ -3307,7 +3309,7 @@ socket_inet_aton(PyObject *self, PyObjec
+
+ #if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
/* Have to use inet_addr() instead */
- unsigned long packed_addr;
+ int packed_addr;
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-configure_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_in
--- patches/patch-configure_in 28 Jul 2006 22:36:41 -0000 1.5
+++ patches/patch-configure_in 21 Oct 2006 01:22:40 -0000
@@ -1,30 +1,7 @@
$OpenBSD: patch-configure_in,v 1.5 2006/07/28 22:36:41 steven Exp $
---- configure.in.orig Fri Feb 17 09:39:55 2006
-+++ configure.in Mon Apr 17 20:41:15 2006
-@@ -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.@<:@012345678@:>@)
-+ OpenBSD*)
- define_xopen_source=no;;
- # On Solaris 2.6, sys/wait.h is inconsistent in the usage
- # of union __?sigval. Reported by Stuart Bishop.
-@@ -1381,12 +1381,7 @@ then
- Linux*|GNU*) LDSHARED='$(CC) -shared';;
- BSD/OS*/4*) LDSHARED="gcc -shared";;
- OpenBSD*|FreeBSD*)
-- if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
-- then
-- LDSHARED="$CC -shared ${LDFLAGS}"
-- else
-- LDSHARED="ld -Bshareable ${LDFLAGS}"
-- fi;;
-+ LDSHARED="$CC -shared ${LDFLAGS}";;
- NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
- OpenUNIX*|UnixWare*)
- if test "$GCC" = "yes"
-@@ -1528,9 +1523,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic li
+--- configure.in.orig Wed Oct 18 02:03:36 2006
++++ configure.in Sat Oct 21 11:06:14 2006
+@@ -1616,9 +1616,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic li
# only check for sem_ini if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-setup_py
--- patches/patch-setup_py 7 Jun 2005 01:12:58 -0000 1.1.1.1
+++ patches/patch-setup_py 21 Oct 2006 01:22:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
---- setup.py.orig Sat Nov 13 12:13:34 2004
-+++ setup.py Thu Dec 30 22:47:09 2004
-@@ -1148,8 +1148,7 @@ def main():
+--- setup.py.orig Mon Oct 9 03:41:25 2006
++++ setup.py Sat Oct 21 11:06:15 2006
+@@ -1224,8 +1224,7 @@ def main():
ext_modules=[Extension('struct', ['structmodule.c'])],
# Scripts to install
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/python/2.4/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 28 Jul 2006 22:36:41 -0000 1.3
+++ pkg/PLIST 21 Oct 2006 01:22:40 -0000
@@ -5,6 +5,7 @@
bin/pydoc2.4
bin/python2.4
include/python2.4/
+include/python2.4/Python-ast.h
include/python2.4/Python.h
include/python2.4/abstract.h
include/python2.4/bitset.h
@@ -121,6 +122,9 @@ lib/python2.4/SocketServer.pyo
lib/python2.4/StringIO.py
lib/python2.4/StringIO.pyc
lib/python2.4/StringIO.pyo
+lib/python2.4/Tools/buildbot/Makefile
+lib/python2.4/Tools/buildbot/kill_python.c
+lib/python2.4/Tools/msi/uuids.py
lib/python2.4/UserDict.py
lib/python2.4/UserDict.pyc
lib/python2.4/UserDict.pyo
@@ -243,6 +247,9 @@ lib/python2.4/bsddb/test/test_lock.pyo
lib/python2.4/bsddb/test/test_misc.py
lib/python2.4/bsddb/test/test_misc.pyc
lib/python2.4/bsddb/test/test_misc.pyo
+lib/python2.4/bsddb/test/test_pickle.py
+lib/python2.4/bsddb/test/test_pickle.pyc
+lib/python2.4/bsddb/test/test_pickle.pyo
lib/python2.4/bsddb/test/test_queue.py
lib/python2.4/bsddb/test/test_queue.pyc
lib/python2.4/bsddb/test/test_queue.pyo
@@ -1410,6 +1417,10 @@ lib/python2.4/telnetlib.pyo
lib/python2.4/tempfile.py
lib/python2.4/tempfile.pyc
lib/python2.4/tempfile.pyo
+lib/python2.4/test/sgml_input.html
+lib/python2.4/test/threaded_import_hangers.py
+lib/python2.4/test/threaded_import_hangers.pyc
+lib/python2.4/test/threaded_import_hangers.pyo
lib/python2.4/textwrap.py
lib/python2.4/textwrap.pyc
lib/python2.4/textwrap.pyo
