- Update to Python 2.3.4.

- Test WITHOUT_* instead of WITH_* for values which are on by default
  so that package build clusters detect correctly.

3 files changed, 0 insertions, 85 deletions

diff --git a/lang/python24/files/patch-Objects::intobject.c b/lang/python24/files/patch-Objects::intobject.c
deleted file mode 100644
index 05983721a6cb..000000000000
--- a/lang/python24/files/patch-Objects::intobject.c
+++ /dev/null
@@ -1,12 +0,0 @@
-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/python24/files/patch-Objects::weakrefobject.c b/lang/python24/files/patch-Objects::weakrefobject.c
deleted file mode 100644
index 13789fbde97f..000000000000
--- a/lang/python24/files/patch-Objects::weakrefobject.c
+++ /dev/null
@@ -1,65 +0,0 @@
-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/python24/files/patch-configure b/lang/python24/files/patch-configure
index 40e715f8aa0e..46e70b302d23 100644
--- a/lang/python24/files/patch-configure
+++ b/lang/python24/files/patch-configure
@@ -31,11 +31,3 @@
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
-@@ -15001,6 +15007,7 @@
-     hints.ai_family = AF_UNSPEC;
-     hints.ai_flags = passive ? AI_PASSIVE : 0;
-     hints.ai_socktype = SOCK_STREAM;
-+    hints.ai_protocol = IPPROTO_TCP;
-     if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
-       (void)gai_strerror(gaierr);
-       goto bad;