This commit was manufactured by cvs2svn to create tag 'RELEASE_4_10_0'.release/4.10.0

8 files changed, 0 insertions, 208 deletions

diff --git a/lang/python23/files/patch-Lib::distutils::spawn.py b/lang/python23/files/patch-Lib::distutils::spawn.py
deleted file mode 100644
index 208b10fc1083..000000000000
--- a/lang/python23/files/patch-Lib::distutils::spawn.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- Lib/distutils/spawn.py.orig	Tue Feb 24 16:55:44 2004
-+++ Lib/distutils/spawn.py	Tue Feb 24 16:56:01 2004
-@@ -144,7 +144,13 @@
-         # Loop until the child either exits or is terminated by a signal
-         # (ie. keep waiting if it's merely stopped)
-         while 1:
--            (pid, status) = os.waitpid(pid, 0)
-+            try:
-+                (pid, status) = os.waitpid(pid, 0)
-+            except OSError, exc:
-+                import errno
-+                if exc.errno == errno.EINTR:
-+                    continue
-+                raise exc
-             if os.WIFSIGNALED(status):
-                 raise DistutilsExecError, \
-                       "command '%s' terminated by signal %d" % \
diff --git a/lang/python23/files/patch-Lib::email::Charset.py b/lang/python23/files/patch-Lib::email::Charset.py
deleted file mode 100644
index 31063a951a80..000000000000
--- a/lang/python23/files/patch-Lib::email::Charset.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- Lib/email/Charset.py.orig	Sat Dec 20 15:16:29 2003
-+++ Lib/email/Charset.py	Sat Dec 20 15:16:54 2003
-@@ -99,13 +99,13 @@
- # of stability and useability.
- 
- CODEC_MAP = {
--    'euc-jp':      'japanese.euc-jp',
--    'iso-2022-jp': 'japanese.iso-2022-jp',
--    'shift_jis':   'japanese.shift_jis',
--    'euc-kr':      'korean.euc-kr',
--    'ks_c_5601-1987': 'korean.cp949',
--    'iso-2022-kr': 'korean.iso-2022-kr',
--    'johab':       'korean.johab',
-+    'euc-jp':      'euc-jp',
-+    'iso-2022-jp': 'iso-2022-jp',
-+    'shift_jis':   'shift_jis',
-+    'euc-kr':      'euc-kr',
-+    'ks_c_5601-1987': 'cp949',
-+    'iso-2022-kr': 'iso-2022-kr',
-+    'johab':       'johab',
-     'gb2132':      'eucgb2312_cn',
-     'big5':        'big5_tw',
-     'utf-8':       'utf-8',
diff --git a/lang/python23/files/patch-Makefile.pre.in b/lang/python23/files/patch-Makefile.pre.in
deleted file mode 100644
index 8ab09bec3ba2..000000000000
--- a/lang/python23/files/patch-Makefile.pre.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.pre.in.orig	Sat Nov 15 21:37:25 2003
-+++ Makefile.pre.in	Sat Nov 15 21:37:54 2003
-@@ -710,11 +710,11 @@
- 		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
--	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
diff --git a/lang/python23/files/patch-Objects::intobject.c b/lang/python23/files/patch-Objects::intobject.c
deleted file mode 100644
index 05983721a6cb..000000000000
--- a/lang/python23/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/python23/files/patch-Objects::weakrefobject.c b/lang/python23/files/patch-Objects::weakrefobject.c
deleted file mode 100644
index 13789fbde97f..000000000000
--- a/lang/python23/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/python23/files/patch-Python::ceval.c b/lang/python23/files/patch-Python::ceval.c
deleted file mode 100644
index fc42c6e58d51..000000000000
--- a/lang/python23/files/patch-Python::ceval.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- Python/ceval.c.orig	Sat Dec 20 15:13:53 2003
-+++ Python/ceval.c	Sat Dec 20 15:15:46 2003
-@@ -496,7 +496,10 @@
- 
- /* The interpreter's recursion limit */
- 
--static int recursion_limit = 1000;
-+#ifndef PYTHON_DEFAULT_RECURSION_LIMIT
-+#define PYTHON_DEFAULT_RECURSION_LIMIT 1000
-+#endif
-+static int recursion_limit = PYTHON_DEFAULT_RECURSION_LIMIT;
- 
- int
- Py_GetRecursionLimit(void)
diff --git a/lang/python23/files/patch-configure b/lang/python23/files/patch-configure
deleted file mode 100644
index 40e715f8aa0e..000000000000
--- a/lang/python23/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig	Wed Nov 19 04:59:36 2003
-+++ configure	Wed Apr 14 15:37:53 2004
-@@ -1321,7 +1321,7 @@
- VERSION=2.3
- 
- 
--SOVERSION=1.0
-+SOVERSION=1
- 
- # The later defininition of _XOPEN_SOURCE disables certain features
- # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -3608,6 +3608,12 @@
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  ;;
-+    FreeBSD*)
-+	  LDLIBRARY='libpython$(VERSION).so'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-+	  INSTSONAME="$LDLIBRARY".$SOVERSION
-+	  ;;
-     hp*|HP*)
- 	  LDLIBRARY='libpython$(VERSION).sl'
- 	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -12272,7 +12278,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_pthread_system_supported=yes
-+  ac_cv_pthread_system_supported="ignored by port"
- 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;
diff --git a/lang/python23/files/patch-setup.py b/lang/python23/files/patch-setup.py
deleted file mode 100644
index 41434bc89896..000000000000
--- a/lang/python23/files/patch-setup.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py.orig	Mon Sep 22 10:19:45 2003
-+++ setup.py	Tue Nov  4 05:22:59 2003
-@@ -15,7 +15,7 @@
- from distutils.command.install_lib import install_lib
- 
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"]
- 
- def add_dir_to_list(dirlist, dir):
-     """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -765,7 +765,7 @@
-             # Linux-specific modules
-             exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
- 
--        if platform in ('linux2', 'freebsd4'):
-+        if platform in ('linux2', 'freebsd4', 'freebsd5'):
-             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
- 
-         if platform == 'sunos5':