diff options
author | recht <recht> | 2004-06-02 12:29:28 +0000 |
---|---|---|
committer | recht <recht> | 2004-06-02 12:29:28 +0000 |
commit | 2a61891dfaf2f2b048e253893a2a2666c211bfc1 (patch) | |
tree | 67fde7bb84f7dc91876a358f74ae23e83d0644ee /lang/python23/patches | |
parent | ba17ad5f30860b811c4a5a8d5d43aa59f23b7c95 (diff) | |
download | pkgsrc-2a61891dfaf2f2b048e253893a2a2666c211bfc1.tar.gz |
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.
Diffstat (limited to 'lang/python23/patches')
-rw-r--r-- | lang/python23/patches/patch-ae | 8 | ||||
-rw-r--r-- | lang/python23/patches/patch-al | 10 | ||||
-rw-r--r-- | lang/python23/patches/patch-an | 67 | ||||
-rw-r--r-- | lang/python23/patches/patch-ao | 14 |
4 files changed, 9 insertions, 90 deletions
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; |