Update to 2.3.4

This is a bug-fix release for Python 2.3 that fixes a number of bugs,
including a couple of weakref bugs and a bug in pickle version 2. There
are also a number of fixes to the standard library, and some build
fixes - see the release notes ( http://www.python.org/2.3.4/NEWS.html )
for details.

15 files changed, 43 insertions, 211 deletions

diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile
index c3ff95422e0..402979317db 100644
--- a/lang/python23-pth/Makefile
+++ b/lang/python23-pth/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2004/05/12 16:25:34 recht Exp $
+# $NetBSD: Makefile,v 1.24 2004/06/02 12:29:28 recht Exp $
 #
 
-PKGNAME=	python23-pth-2.3.3
-PKGREVISION=	4
+PKGNAME=	python23-pth-2.3.4
 
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo
index d0bec0bc4a1..e520d63f602 100644
--- a/lang/python23-pth/distinfo
+++ b/lang/python23-pth/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.15 2004/05/12 15:19:49 recht Exp $
+$NetBSD: distinfo,v 1.16 2004/06/02 12:29:28 recht Exp $
 
-SHA1 (Python-2.3.3.tgz) = 034d2e3ed011ea753d4fee7efab16e31029b1e5e
-Size (Python-2.3.3.tgz) = 8491380 bytes
-SHA1 (patch-aa) = c4aad8fae46d55df93741a0378f5b930de0a5328
+SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
+Size (Python-2.3.4.tgz) = 8502738 bytes
+SHA1 (patch-aa) = a0fcef6a91ec4724f0aed0fdebce55ba139d3700
 SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
 SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
-SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3
+SHA1 (patch-ae) = 35d27825ea4f3930cce651761e192a7302696eba
 SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14
 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575
-SHA1 (patch-al) = 2dfed1a40493b571e3477cfb56c2d0ed1b1deddf
+SHA1 (patch-al) = 903b42991a83fe5f5f4f3a20f88abb4937174f26
 SHA1 (patch-am) = eda4c6161b4237e1281cc6b82b26c5195444dcff
-SHA1 (patch-an) = 446f580b7cf2e258b08d08ad00a574d5824dee36
-SHA1 (patch-ao) = e0dc5d7055ae9d52489c0eccc585c7bb170a36f7
 SHA1 (patch-ba) = dd8f89952d7f40c9a979e362758775f093e047bc
diff --git a/lang/python23-pth/patches/patch-aa b/lang/python23-pth/patches/patch-aa
index ce4ac9e65e2..c477532f835 100644
--- a/lang/python23-pth/patches/patch-aa
+++ b/lang/python23-pth/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2003/12/23 17:24:42 recht Exp $
+$NetBSD: patch-aa,v 1.5 2004/06/02 12:29:28 recht Exp $
 
---- Include/patchlevel.h.orig	2003-10-01 08:47:48.000000000 +0200
-+++ Include/patchlevel.h
+--- Include/patchlevel.h.orig	2004-05-19 05:14:27.000000000 +0200
++++ Include/patchlevel.h	2004-06-02 14:00:51.000000000 +0200
 @@ -26,7 +26,7 @@
  #define PY_RELEASE_SERIAL	0
  
  /* Version as a string */
--#define PY_VERSION		"2.3.3"
-+#define PY_VERSION		"2p3.3"
+-#define PY_VERSION		"2.3.4"
++#define PY_VERSION		"2p3.4"
  
  /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
     Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
diff --git a/lang/python23-pth/patches/patch-ae b/lang/python23-pth/patches/patch-ae
index e3e2b097710..d0731e391f0 100644
--- a/lang/python23-pth/patches/patch-ae
+++ b/lang/python23-pth/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2003/12/08 21:13:56 recht Exp $
+$NetBSD: patch-ae,v 1.3 2004/06/02 12:29:28 recht Exp $
 
---- Lib/distutils/command/build_scripts.py.orig	2003-06-27 21:33:38.000000000 +0200
-+++ Lib/distutils/command/build_scripts.py
-@@ -99,7 +99,7 @@ class build_scripts (Command):
+--- Lib/distutils/command/build_scripts.py.orig	2004-04-01 05:56:46.000000000 +0200
++++ Lib/distutils/command/build_scripts.py	2004-06-02 13:58:52.000000000 +0200
+@@ -101,7 +101,7 @@
                          outf.write("#!%s%s\n" %
                                     (os.path.join(
                              sysconfig.get_config_var("BINDIR"),
diff --git a/lang/python23-pth/patches/patch-al b/lang/python23-pth/patches/patch-al
index 4f5009bc82b..5518ba252f1 100644
--- a/lang/python23-pth/patches/patch-al
+++ b/lang/python23-pth/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
+$NetBSD: patch-al,v 1.7 2004/06/02 12:29:28 recht Exp $
 
---- configure.orig	2003-11-18 20:59:36.000000000 +0100
-+++ configure	2004-03-01 00:58:59.000000000 +0100
+--- configure.orig	2004-05-07 21:13:40.000000000 +0200
++++ configure	2004-06-02 13:59:28.000000000 +0200
 @@ -1318,7 +1318,7 @@
  mv confdefs.h.new confdefs.h
  
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3602,7 +3604,7 @@
+@@ -3603,7 +3605,7 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -29,7 +29,7 @@ $NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -13854,6 +13856,7 @@
+@@ -13855,6 +13857,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
diff --git a/lang/python23-pth/patches/patch-an b/lang/python23-pth/patches/patch-an
deleted file mode 100644
index 707f4f57b18..00000000000
--- a/lang/python23-pth/patches/patch-an
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/05/12 16:25:34 recht Exp $
-
-diff -u python/dist/src/Objects/weakrefobject.c:1.13.6.1 python/dist/src/Objects/weakrefobject.c:1.13.6.3
---- Objects/weakrefobject.c:1.13.6.1	Thu Nov 20 14:13:51 2003
-+++ Objects/weakrefobject.c	Wed Feb  4 15:13:43 2004
-@@ -624,20 +624,29 @@
-     }
-     list = GET_WEAKREFS_LISTPTR(ob);
-     get_basic_refs(*list, &ref, &proxy);
--    if (callback == NULL || callback == Py_None)
-+    if (callback == Py_None)
-+        callback = NULL;
-+    if (callback == NULL)
-         /* return existing weak reference if it exists */
-         result = ref;
-     if (result != NULL)
--        Py_XINCREF(result);
-+        Py_INCREF(result);
-     else {
-+        /* Note: new_weakref() can trigger cyclic GC, so the weakref
-+           list on ob can be mutated.  This means that the ref and
-+           proxy pointers we got back earlier may have been collected,
-+           so we need to compute these values again before we use
-+           them. */
-         result = new_weakref(ob, callback);
-         if (result != NULL) {
-             if (callback == NULL) {
-                 insert_head(result, list);
-             }
-             else {
--                PyWeakReference *prev = (proxy == NULL) ? ref : proxy;
-+                PyWeakReference *prev;
- 
-+                get_basic_refs(*list, &ref, &proxy);
-+                prev = (proxy == NULL) ? ref : proxy;
-                 if (prev == NULL)
-                     insert_head(result, list);
-                 else
-@@ -664,12 +673,19 @@
-     }
-     list = GET_WEAKREFS_LISTPTR(ob);
-     get_basic_refs(*list, &ref, &proxy);
-+    if (callback == Py_None)
-+        callback = NULL;
-     if (callback == NULL)
-         /* attempt to return an existing weak reference if it exists */
-         result = proxy;
-     if (result != NULL)
--        Py_XINCREF(result);
-+        Py_INCREF(result);
-     else {
-+        /* Note: new_weakref() can trigger cyclic GC, so the weakref
-+           list on ob can be mutated.  This means that the ref and
-+           proxy pointers we got back earlier may have been collected,
-+           so we need to compute these values again before we use
-+           them. */
-         result = new_weakref(ob, callback);
-         if (result != NULL) {
-             PyWeakReference *prev;
-@@ -678,6 +694,7 @@
-                 result->ob_type = &_PyWeakref_CallableProxyType;
-             else
-                 result->ob_type = &_PyWeakref_ProxyType;
-+            get_basic_refs(*list, &ref, &proxy);
-             if (callback == NULL)
-                 prev = ref;
-             else
diff --git a/lang/python23-pth/patches/patch-ao b/lang/python23-pth/patches/patch-ao
deleted file mode 100644
index 9d474757c36..00000000000
--- a/lang/python23-pth/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/05/12 16:25:34 recht Exp $
-
-diff -u python/dist/src/Objects/intobject.c:2.105 python/dist/src/Objects/intobject.c:2.105.8.1
---- Objects/intobject.c:2.105	Sat Jun 28 13:04:24 2003
-+++ Objects/intobject.c	Sun Feb  8 10:56:07 2004
-@@ -1080,7 +1080,7 @@
- 	int ival;
- #if NSMALLNEGINTS + NSMALLPOSINTS > 0
- 	for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) {
--		if ((free_list = fill_free_list()) == NULL)
-+              if (!free_list && (free_list = fill_free_list()) == NULL)
- 			return 0;
- 		/* PyObject_New is inlined */
- 		v = free_list;
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 41e81ef8c34..c5e2069f7c3 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/05/12 16:25:34 recht Exp $
+# $NetBSD: Makefile,v 1.20 2004/06/02 12:29:28 recht Exp $
 #
 
-PKGNAME=	python23-2.3.3
-PKGREVISION=	3
+PKGNAME=	python23-2.3.4
 
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index becf6ce7121..0bc5d963e35 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2004/05/12 16:25:34 recht Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/06/02 12:29:28 recht Exp $
 #
 
-DISTNAME=	Python-2.3.3
+DISTNAME=	Python-2.3.4
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.3.3/
+MASTER_SITES=	ftp://ftp.python.org/pub/python/2.3.4/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	recht@NetBSD.org
diff --git a/lang/python23/PLIST.common b/lang/python23/PLIST.common
index cfeb76b4123..3687be313a7 100644
--- a/lang/python23/PLIST.common
+++ b/lang/python23/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2004/01/26 12:10:24 grant Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2004/06/02 12:29:28 recht Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 include/python${PY_VER_SUFFIX}/Python.h
@@ -608,6 +608,7 @@ lib/python${PY_VER_SUFFIX}/email/test/data/msg_32.txt
 lib/python${PY_VER_SUFFIX}/email/test/data/msg_33.txt
 lib/python${PY_VER_SUFFIX}/email/test/data/msg_34.txt
 lib/python${PY_VER_SUFFIX}/email/test/data/msg_35.txt
+lib/python${PY_VER_SUFFIX}/email/test/data/msg_40.txt
 lib/python${PY_VER_SUFFIX}/email/test/test_email.py
 lib/python${PY_VER_SUFFIX}/email/test/test_email.pyc
 lib/python${PY_VER_SUFFIX}/email/test/test_email.pyo
@@ -1556,7 +1557,6 @@ lib/python${PY_VER_SUFFIX}/test/greyrgb.uue
 lib/python${PY_VER_SUFFIX}/test/output/test_MimeWriter
 lib/python${PY_VER_SUFFIX}/test/output/test_asynchat
 lib/python${PY_VER_SUFFIX}/test/output/test_augassign
-lib/python${PY_VER_SUFFIX}/test/output/test_binascii
 lib/python${PY_VER_SUFFIX}/test/output/test_cgi
 lib/python${PY_VER_SUFFIX}/test/output/test_class
 lib/python${PY_VER_SUFFIX}/test/output/test_coercion
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 9039836aa72..08b848d5498 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.16 2004/05/12 15:19:49 recht Exp $
+$NetBSD: distinfo,v 1.17 2004/06/02 12:29:28 recht Exp $
 
-SHA1 (Python-2.3.3.tgz) = 034d2e3ed011ea753d4fee7efab16e31029b1e5e
-Size (Python-2.3.3.tgz) = 8491380 bytes
+SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
+Size (Python-2.3.4.tgz) = 8502738 bytes
 SHA1 (patch-aa) = dd8f89952d7f40c9a979e362758775f093e047bc
 SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
 SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
-SHA1 (patch-ae) = 544af90b9b7c5eb5cbad0ba0cefa3d9496b5efe3
+SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
 SHA1 (patch-af) = 2989a1975c8ea435903eafc9add57cb7c4d7de14
 SHA1 (patch-ah) = 4bc95e775a2b3f4f1997d0779c561db2e9e7b575
-SHA1 (patch-al) = 30941bb705d216d40d1bbdbaf68d6fb2a4714bd2
+SHA1 (patch-al) = 9708d043b6dff795de5450c88ffb05c65a159942
 SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3
-SHA1 (patch-an) = 446f580b7cf2e258b08d08ad00a574d5824dee36
-SHA1 (patch-ao) = e0dc5d7055ae9d52489c0eccc585c7bb170a36f7
diff --git a/lang/python23/patches/patch-ae b/lang/python23/patches/patch-ae
index e3e2b097710..118937175c7 100644
--- a/lang/python23/patches/patch-ae
+++ b/lang/python23/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2003/12/08 21:13:56 recht Exp $
+$NetBSD: patch-ae,v 1.3 2004/06/02 12:29:28 recht Exp $
 
---- Lib/distutils/command/build_scripts.py.orig	2003-06-27 21:33:38.000000000 +0200
-+++ Lib/distutils/command/build_scripts.py
-@@ -99,7 +99,7 @@ class build_scripts (Command):
+--- Lib/distutils/command/build_scripts.py.orig	2004-04-01 05:56:46.000000000 +0200
++++ Lib/distutils/command/build_scripts.py	2004-06-02 13:45:05.000000000 +0200
+@@ -101,7 +101,7 @@
                          outf.write("#!%s%s\n" %
                                     (os.path.join(
                              sysconfig.get_config_var("BINDIR"),
diff --git a/lang/python23/patches/patch-al b/lang/python23/patches/patch-al
index 4839dfbaaa0..b52bf61db08 100644
--- a/lang/python23/patches/patch-al
+++ b/lang/python23/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
+$NetBSD: patch-al,v 1.7 2004/06/02 12:29:28 recht Exp $
 
---- configure.orig	2003-11-18 20:59:36.000000000 +0100
-+++ configure	2004-03-01 00:55:14.000000000 +0100
+--- configure.orig	2004-05-07 21:13:40.000000000 +0200
++++ configure	2004-06-02 13:45:43.000000000 +0200
 @@ -1440,6 +1440,8 @@
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    OpenBSD/2.* | OpenBSD/3.[01234])
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3602,7 +3604,7 @@
+@@ -3603,7 +3605,7 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.6 2004/03/01 00:16:35 recht Exp $
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -13854,6 +13856,7 @@
+@@ -13855,6 +13857,7 @@
  /* end confdefs.h.  */
  
  #include "confdefs.h"
diff --git a/lang/python23/patches/patch-an b/lang/python23/patches/patch-an
deleted file mode 100644
index d6a71985be3..00000000000
--- a/lang/python23/patches/patch-an
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/05/12 15:19:49 recht Exp $
-
-diff -u python/dist/src/Objects/weakrefobject.c:1.13.6.1 python/dist/src/Objects/weakrefobject.c:1.13.6.3
---- Objects/weakrefobject.c:1.13.6.1	Thu Nov 20 14:13:51 2003
-+++ Objects/weakrefobject.c	Wed Feb  4 15:13:43 2004
-@@ -624,20 +624,29 @@
-     }
-     list = GET_WEAKREFS_LISTPTR(ob);
-     get_basic_refs(*list, &ref, &proxy);
--    if (callback == NULL || callback == Py_None)
-+    if (callback == Py_None)
-+        callback = NULL;
-+    if (callback == NULL)
-         /* return existing weak reference if it exists */
-         result = ref;
-     if (result != NULL)
--        Py_XINCREF(result);
-+        Py_INCREF(result);
-     else {
-+        /* Note: new_weakref() can trigger cyclic GC, so the weakref
-+           list on ob can be mutated.  This means that the ref and
-+           proxy pointers we got back earlier may have been collected,
-+           so we need to compute these values again before we use
-+           them. */
-         result = new_weakref(ob, callback);
-         if (result != NULL) {
-             if (callback == NULL) {
-                 insert_head(result, list);
-             }
-             else {
--                PyWeakReference *prev = (proxy == NULL) ? ref : proxy;
-+                PyWeakReference *prev;
- 
-+                get_basic_refs(*list, &ref, &proxy);
-+                prev = (proxy == NULL) ? ref : proxy;
-                 if (prev == NULL)
-                     insert_head(result, list);
-                 else
-@@ -664,12 +673,19 @@
-     }
-     list = GET_WEAKREFS_LISTPTR(ob);
-     get_basic_refs(*list, &ref, &proxy);
-+    if (callback == Py_None)
-+        callback = NULL;
-     if (callback == NULL)
-         /* attempt to return an existing weak reference if it exists */
-         result = proxy;
-     if (result != NULL)
--        Py_XINCREF(result);
-+        Py_INCREF(result);
-     else {
-+        /* Note: new_weakref() can trigger cyclic GC, so the weakref
-+           list on ob can be mutated.  This means that the ref and
-+           proxy pointers we got back earlier may have been collected,
-+           so we need to compute these values again before we use
-+           them. */
-         result = new_weakref(ob, callback);
-         if (result != NULL) {
-             PyWeakReference *prev;
-@@ -678,6 +694,7 @@
-                 result->ob_type = &_PyWeakref_CallableProxyType;
-             else
-                 result->ob_type = &_PyWeakref_ProxyType;
-+            get_basic_refs(*list, &ref, &proxy);
-             if (callback == NULL)
-                 prev = ref;
-             else
diff --git a/lang/python23/patches/patch-ao b/lang/python23/patches/patch-ao
deleted file mode 100644
index c4fcf570a49..00000000000
--- a/lang/python23/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/05/12 15:19:49 recht Exp $
-
-diff -u python/dist/src/Objects/intobject.c:2.105 python/dist/src/Objects/intobject.c:2.105.8.1
---- Objects/intobject.c:2.105	Sat Jun 28 13:04:24 2003
-+++ Objects/intobject.c	Sun Feb  8 10:56:07 2004
-@@ -1080,7 +1080,7 @@
- 	int ival;
- #if NSMALLNEGINTS + NSMALLPOSINTS > 0
- 	for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) {
--		if ((free_list = fill_free_list()) == NULL)
-+              if (!free_list && (free_list = fill_free_list()) == NULL)
- 			return 0;
- 		/* PyObject_New is inlined */
- 		v = free_list;