Sat Nov 29 02:04:18 UTC 2008

Author: ivazquez

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29642/devel

Modified Files:
	.cvsignore python.spec sources 
Added Files:
	import.log python-2.6-canonicalize.patch 
	python-2.6-config.patch python-2.6-lib64.patch 
	python-2.6-rpath.patch 
Removed Files:
	python-2.3.4-pydocnodoc.patch python-2.4.1-canonicalize.patch 
	python-2.5-CVE-2008-2316.patch python-2.5-config.patch 
	python-2.5-disable-egginfo.patch python-2.5-lib64.patch 
	python-2.5-tkinter.patch 
	python-2.5-xmlrpclib-marshal-objects.patch 
	python-2.5.1-binutils-no-dep.patch 
	python-2.5.1-ctypes-exec-stack.patch python-2.5.1-db46.patch 
	python-2.5.1-db47.patch python-2.5.1-listdir.patch 
	python-2.5.1-pysqlite.patch python-2.5.2-db47.patch 
	python-2.5.2-set_wakeup_fd4.patch 
	python-2.5.CVE-2007-4965-int-overflow.patch 
	python2.6-set_wakeup_fd4.patch 
Log Message:
Update to 2.6

--- NEW FILE import.log ---
python-2_6-1:HEAD:python-2.6-1.src.rpm:1227924213

python-2.6-canonicalize.patch:

--- NEW FILE python-2.6-canonicalize.patch ---
diff -up Python-2.6/configure.in.canonicalize Python-2.6/configure.in
--- Python-2.6/configure.in.canonicalize	2008-09-07 15:18:16.000000000 -0400
+++ Python-2.6/configure.in	2008-11-24 02:09:29.000000000 -0500
@@ -2445,7 +2445,8 @@ fi
 AC_MSG_RESULT(MACHDEP_OBJS)
 
 # checks for library functions
-AC_CHECK_FUNCS(alarm setitimer getitimer bind_textdomain_codeset chown \
+AC_CHECK_FUNCS(alarm setitimer getitimer bind_textdomain_codeset \
+ canonicalize_file_name chown \
  clock confstr ctermid execv fchmod fchown fork fpathconf ftime ftruncate \
  gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
  getpriority getpwent getspnam getspent getsid getwd \
diff -up Python-2.6/pyconfig.h.in.canonicalize Python-2.6/pyconfig.h.in
--- Python-2.6/pyconfig.h.in.canonicalize	2008-09-07 01:15:18.000000000 -0400
+++ Python-2.6/pyconfig.h.in	2008-11-24 02:07:11.000000000 -0500
@@ -79,6 +79,9 @@
 /* Define to 1 if you have the `chflags' function. */
 #undef HAVE_CHFLAGS
 
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+#undef HAVE_CANONICALIZE_FILE_NAME
+
 /* Define to 1 if you have the `chown' function. */
 #undef HAVE_CHOWN
 
diff -up Python-2.6/Python/sysmodule.c.canonicalize Python-2.6/Python/sysmodule.c
--- Python-2.6/Python/sysmodule.c.canonicalize	2008-07-10 13:13:55.000000000 -0400
+++ Python-2.6/Python/sysmodule.c	2008-11-24 02:07:11.000000000 -0500
@@ -1524,11 +1524,13 @@ makeargvobject(int argc, char **argv)
 void
 PySys_SetArgv(int argc, char **argv)
 {
+#ifndef HAVE_CANONICALIZE_FILE_NAME
 #if defined(HAVE_REALPATH)
 	char fullpath[MAXPATHLEN];
 #elif defined(MS_WINDOWS)
 	char fullpath[MAX_PATH];
 #endif
+#endif
 	PyObject *av = makeargvobject(argc, argv);
 	PyObject *path = PySys_GetObject("path");
 	if (av == NULL)
@@ -1540,6 +1542,64 @@ PySys_SetArgv(int argc, char **argv)
 		char *p = NULL;
 		Py_ssize_t n = 0;
 		PyObject *a;
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+		char *link = NULL, *argv0copy = NULL;
+                
+                if (argc > 0 && argv0 != NULL) {
+			
+			link = canonicalize_file_name(argv0);
+			if (link == NULL) {
+				link = strdup(argv0);
+				if (!link)
+					Py_FatalError("no mem for sys.argv");
+			}
+		}
+		if (link) {
+			if (link[0] == SEP) /* Link to absolute path */
+				argv0 = link;
+			else if (strchr(link, SEP) == NULL) {
+				/* Link without path */
+				/* strdup argv0 so we can free it 
+				   unconditionally */
+				argv0 = strdup(argv0);
+				if (!argv0)
+					Py_FatalError("no mem for sys.argv");
+				free(link);
+			} else {
+				/* Must join(dirname(argv0), link) */
+				char *q = strrchr(argv0, SEP);
+				if (q == NULL) /* argv0 without path */
+					argv0 = link;
+				else {
+					/* Must make a copy */
+					argv0copy = calloc(
+                                                strlen(link) + strlen(q) +1,
+                                                sizeof (char));
+					if (!argv0copy)
+						Py_FatalError("no mem for sys.argv");
+					strcpy(argv0copy, argv0);
+					q = strrchr(argv0copy, SEP);
+					strcpy(argv0copy+1, link);
+					argv0 = argv0copy;
+					p = NULL;
+					free(link);
+				}
+			}
+		}
+		if (argc > 0 && argv0 != NULL) {
+			char *q;
+			p = strrchr(argv0, SEP);
+			/* Test for alternate separator */
+			q = strrchr(p ? p : argv0, '/');
+			if (q != NULL)
+				p = q;
+			if (p != NULL) {
+				n = p + 1 - argv0;
+				if (n > 1 && p[-1] != ':')
+					n--; /* Drop trailing separator */
+			}
+		}
+#else /* ! HAVE_CANONICALIZE_FILE_NAME */
 #ifdef HAVE_READLINK
 		char link[MAXPATHLEN+1];
 		char argv0copy[2*MAXPATHLEN+1];
@@ -1612,9 +1672,14 @@ PySys_SetArgv(int argc, char **argv)
 #endif /* Unix */
 		}
 #endif /* All others */
+#endif /* ! HAVE_CANONICALIZE_FILE_NAME */
 		a = PyString_FromStringAndSize(argv0, n);
 		if (a == NULL)
 			Py_FatalError("no mem for sys.path insertion");
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+		if (argc > 0 && argv0 != NULL)
+			free(argv0);
+#endif /* HAVE_CANONICALIZE_FILE_NAME */
 		if (PyList_Insert(path, 0, a) < 0)
 			Py_FatalError("sys.path.insert(0) failed");
 		Py_DECREF(a);

python-2.6-config.patch:

--- NEW FILE python-2.6-config.patch ---
diff -up Python-2.6/Include/pyexpat.h.rhconfig Python-2.6/Include/pyexpat.h
--- Python-2.6/Include/pyexpat.h.rhconfig	2006-06-19 19:21:25.000000000 -0400
+++ Python-2.6/Include/pyexpat.h	2008-11-24 02:00:47.000000000 -0500
@@ -5,6 +5,19 @@
 
 #define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.0"
 
+#ifdef XML_LARGE_SIZE  /* Use large integers for file/stream positions. */
+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
+typedef __int64 XML_Index; 
+typedef unsigned __int64 XML_Size;
+#else
+typedef long long XML_Index;
+typedef unsigned long long XML_Size;
+#endif
+#else
+typedef long XML_Index;
+typedef unsigned long XML_Size;
+#endif /* XML_LARGE_SIZE */
+
 struct PyExpat_CAPI 
 {
     char* magic; /* set to PyExpat_CAPI_MAGIC */
diff -up Python-2.6/Modules/Setup.dist.rhconfig Python-2.6/Modules/Setup.dist
--- Python-2.6/Modules/Setup.dist.rhconfig	2008-09-21 03:31:52.000000000 -0400
+++ Python-2.6/Modules/Setup.dist	2008-11-24 02:03:41.000000000 -0500
@@ -152,7 +152,7 @@ GLHACK=-Dclear=__GLclear
 # modules are to be built as shared libraries (see above for more
 # detail; also note that *static* reverses this effect):
 
-#*shared*
+*shared*
 
 # GNU readline.  Unlike previous Python incarnations, GNU readline is
 # now incorporated in an optional module, configured in the Setup file
@@ -162,69 +162,69 @@ GLHACK=-Dclear=__GLclear
 # it, depending on your system -- see the GNU readline instructions.
 # It's okay for this to be a shared library, too.
 
-#readline readline.c -lreadline -ltermcap
+readline readline.c -lreadline -ltermcap
 
 
 # Modules that should always be present (non UNIX dependent):
 
-#array arraymodule.c	# array objects
-#cmath cmathmodule.c # -lm # complex math library functions
-#math mathmodule.c # -lm # math library functions, e.g. sin()
-#_struct _struct.c	# binary structure packing/unpacking
-#time timemodule.c # -lm # time operations and variables
-#operator operator.c	# operator.add() and similar goodies
-#_weakref _weakref.c	# basic weak reference support
-#_testcapi _testcapimodule.c    # Python C API test module
-#_random _randommodule.c	# Random number generator
-#_collections _collectionsmodule.c # Container types
-#itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
-#strop stropmodule.c		# String manipulations
+array arraymodule.c	# array objects
+cmath cmathmodule.c # -lm # complex math library functions
+math mathmodule.c # -lm # math library functions, e.g. sin()
+_struct _struct.c	# binary structure packing/unpacking
+time timemodule.c # -lm # time operations and variables
+operator operator.c	# operator.add() and similar goodies
+_weakref _weakref.c	# basic weak reference support
+_testcapi _testcapimodule.c    # Python C API test module
+_random _randommodule.c	# Random number generator
+_collections _collectionsmodule.c # Container types
+itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
+strop stropmodule.c		# String manipulations
 
-#unicodedata unicodedata.c    # static Unicode character database
+unicodedata unicodedata.c    # static Unicode character database
 
 # access to ISO C locale support
-#_locale _localemodule.c  # -lintl
+_locale _localemodule.c  # -lintl
 
 
 # Modules with some UNIX dependencies -- on by default:
 # (If you have a really backward UNIX, select and socket may not be
 # supported...)
 
-#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
-#spwd spwdmodule.c		# spwd(3) 
-#grp grpmodule.c		# grp(3)
-#select selectmodule.c	# select(2); not on ancient System V
+fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
+spwd spwdmodule.c		# spwd(3) 
+grp grpmodule.c		# grp(3)
+select selectmodule.c	# select(2); not on ancient System V
 
 # Memory-mapped files (also works on Win32).
-#mmap mmapmodule.c
+mmap mmapmodule.c
 
 # CSV file helper
-#_csv _csv.c
+_csv _csv.c
 
 # Socket module helper for socket(2)
-#_socket socketmodule.c
+_socket socketmodule.c
 
 # Socket module helper for SSL support; you must comment out the other
 # socket line above, and possibly edit the SSL variable:
 #SSL=/usr/local/ssl
-#_ssl _ssl.c \
-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-#	-L$(SSL)/lib -lssl -lcrypto
+_ssl _ssl.c \
+	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+	-L$(SSL)/lib -lssl -lcrypto
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
+crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
 
 
 # Some more UNIX dependent modules -- off by default, since these
 # are not supported by all UNIX systems:
 
-#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
-#termios termios.c	# Steen Lumholt's termios module
-#resource resource.c	# Jeremy Hylton's rlimit interface
+nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
+termios termios.c	# Steen Lumholt's termios module
+resource resource.c	# Jeremy Hylton's rlimit interface
 
 
 # Multimedia modules -- off by default.
@@ -232,8 +232,8 @@ GLHACK=-Dclear=__GLclear
 # #993173 says audioop works on 64-bit platforms, though.
 # These represent audio samples or images as strings:
 
-#audioop audioop.c	# Operations on audio samples
-#imageop imageop.c	# Operations on images
+audioop audioop.c	# Operations on audio samples
+imageop imageop.c	# Operations on images
 
 
 # Note that the _md5 and _sha modules are normally only built if the
@@ -243,14 +243,14 @@ GLHACK=-Dclear=__GLclear
 # Message-Digest Algorithm, described in RFC 1321.  The necessary files
 # md5.c and md5.h are included here.
 
-#_md5 md5module.c md5.c
+_md5 md5module.c md5.c
 
 
 # The _sha module implements the SHA checksum algorithms.
 # (NIST's Secure Hash Algorithms.)
-#_sha shamodule.c
-#_sha256 sha256module.c
-#_sha512 sha512module.c
+_sha shamodule.c
+_sha256 sha256module.c
+_sha512 sha512module.c
 
 
 # SGI IRIX specific modules -- off by default.
@@ -297,12 +297,12 @@ GLHACK=-Dclear=__GLclear
 # A Linux specific module -- off by default; this may also work on 
 # some *BSDs.
 
-#linuxaudiodev linuxaudiodev.c
+linuxaudiodev linuxaudiodev.c
 
 
 # George Neville-Neil's timing module:
 
-#timing timingmodule.c
+timing timingmodule.c
 
 
 # The _tkinter module.
@@ -317,7 +317,7 @@ GLHACK=-Dclear=__GLclear
 # every system.
 
 # *** Always uncomment this (leave the leading underscore in!):
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
 #	-L/usr/local/lib \
 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
@@ -327,7 +327,7 @@ GLHACK=-Dclear=__GLclear
 # *** Or uncomment this for Solaris:
 #	-I/usr/openwin/include \
 # *** Uncomment and edit for Tix extension only:
-#	-DWITH_TIX -ltix8.1.8.2 \
+	-DWITH_TIX -ltix \
 # *** Uncomment and edit for BLT extension only:
 #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
 # *** Uncomment and edit for PIL (TkImaging) extension only:
@@ -336,7 +336,7 @@ GLHACK=-Dclear=__GLclear
 # *** Uncomment and edit for TOGL extension only:
 #	-DWITH_TOGL togl.c \
 # *** Uncomment and edit to reflect your Tcl/Tk versions:
-#	-ltk8.2 -ltcl8.2 \
+	-ltk -ltcl \
 # *** Uncomment and edit to reflect where your X11 libraries are:
 #	-L/usr/X11R6/lib \
 # *** Or uncomment this for Solaris:
@@ -346,7 +346,7 @@ GLHACK=-Dclear=__GLclear
 # *** Uncomment for AIX:
 #	-lld \
 # *** Always uncomment this; X11 libraries to link with:
-#	-lX11
+	-lX11
 
 # Lance Ellinghaus's syslog module
 #syslog syslogmodule.c		# syslog daemon interface
@@ -358,9 +358,9 @@ GLHACK=-Dclear=__GLclear
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#_curses _cursesmodule.c -lcurses -ltermcap
+_curses _cursesmodule.c -lncursesw
 # Wrapper for the panel library that's part of ncurses and SYSV curses.
-#_curses_panel _curses_panel.c -lpanel -lncurses 
+_curses_panel _curses_panel.c -lpanel -lncursesw 
 
 
 # Generic (SunOS / SVR4) dynamic loading module.
@@ -368,7 +368,7 @@ GLHACK=-Dclear=__GLclear
 # it is a highly experimental and dangerous device for calling
 # *arbitrary* C functions in *arbitrary* shared libraries:
 
-#dl dlmodule.c
+dl dlmodule.c
 
 
 # Modules that provide persistent dictionary-like semantics.  You will
@@ -391,7 +391,7 @@ GLHACK=-Dclear=__GLclear
 #
 # First, look at Setup.config; configure may have set this for you.
 
-#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
+gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
 
 
 # Sleepycat Berkeley DB interface.
@@ -406,11 +406,10 @@ GLHACK=-Dclear=__GLclear
 #
 # Edit the variables DB and DBLIBVERto point to the db top directory
 # and the subdirectory of PORT where you built it.
-#DB=/usr/local/BerkeleyDB.4.0
-#DBLIBVER=4.0
-#DBINC=$(DB)/include
-#DBLIB=$(DB)/lib
-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+DBLIBVER=4.7
+DBINC=/usr/include/db4
+DBLIB=/usr/lib
+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
 
 # Historical Berkeley DB 1.85
 #
@@ -425,14 +424,14 @@ GLHACK=-Dclear=__GLclear
 
 
 # Helper module for various ascii-encoders
-#binascii binascii.c
+binascii binascii.c
 
 # Fred Drake's interface to the Python parser
-#parser parsermodule.c
+parser parsermodule.c
 
 # cStringIO and cPickle
-#cStringIO cStringIO.c
-#cPickle cPickle.c
+cStringIO cStringIO.c
+cPickle cPickle.c
 
 
 # Lee Busby's SIGFPE modules.
@@ -455,7 +454,7 @@ GLHACK=-Dclear=__GLclear
 # Andrew Kuchling's zlib module.
 # This require zlib 1.1.3 (or later).
 # See http://www.gzip.org/zlib/
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 
 # Interface to the Expat XML parser
 #
@@ -469,20 +468,20 @@ GLHACK=-Dclear=__GLclear
 # More information on Expat can be found at www.libexpat.org.
 #
 #EXPAT_DIR=/usr/local/src/expat-1.95.2
-#pyexpat pyexpat.c -DHAVE_EXPAT_H -I$(EXPAT_DIR)/lib -L$(EXPAT_DIR) -lexpat
+pyexpat pyexpat.c -DHAVE_EXPAT_H -lexpat
 
 
 # Hye-Shik Chang's CJKCodecs
 
 # multibytecodec is required for all the other CJK codec modules
-#_multibytecodec cjkcodecs/multibytecodec.c
+_multibytecodec cjkcodecs/multibytecodec.c
 
-#_codecs_cn cjkcodecs/_codecs_cn.c
-#_codecs_hk cjkcodecs/_codecs_hk.c
-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
-#_codecs_jp cjkcodecs/_codecs_jp.c
-#_codecs_kr cjkcodecs/_codecs_kr.c
-#_codecs_tw cjkcodecs/_codecs_tw.c
+_codecs_cn cjkcodecs/_codecs_cn.c
+_codecs_hk cjkcodecs/_codecs_hk.c
+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
+_codecs_jp cjkcodecs/_codecs_jp.c
+_codecs_kr cjkcodecs/_codecs_kr.c
+_codecs_tw cjkcodecs/_codecs_tw.c
 
 # Example -- included for reference only:
 # xx xxmodule.c
diff -up Python-2.6/setup.py.rhconfig Python-2.6/setup.py
--- Python-2.6/setup.py.rhconfig	2008-09-29 20:15:45.000000000 -0400
+++ Python-2.6/setup.py	2008-11-24 02:00:47.000000000 -0500
@@ -1189,7 +1189,6 @@ class PyBuildExt(build_ext):
 
         exts.append(Extension('pyexpat',
                               define_macros = define_macros,
-                              include_dirs = [expatinc],
                               sources = ['pyexpat.c',
                                          'expat/xmlparse.c',
                                          'expat/xmlrole.c',
@@ -1204,7 +1203,6 @@ class PyBuildExt(build_ext):
             define_macros.append(('USE_PYEXPAT_CAPI', None))
             exts.append(Extension('_elementtree',
                                   define_macros = define_macros,
-                                  include_dirs = [expatinc],
                                   sources = ['_elementtree.c'],
                                   ))
         else:

python-2.6-lib64.patch:

--- NEW FILE python-2.6-lib64.patch ---
diff -up Python-2.6/Lib/distutils/command/install.py.lib64 Python-2.6/Lib/distutils/command/install.py
--- Python-2.6/Lib/distutils/command/install.py.lib64	2008-05-06 18:41:46.000000000 -0400
+++ Python-2.6/Lib/distutils/command/install.py	2008-11-24 02:34:04.000000000 -0500
@@ -42,14 +42,14 @@ else:
 INSTALL_SCHEMES = {
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
         'headers': '$base/include/python$py_version_short/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
     'unix_home': {
         'purelib': '$base/lib/python',
-        'platlib': '$base/lib/python',
+        'platlib': '$base/lib64/python',
         'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
diff -up Python-2.6/Lib/distutils/sysconfig.py.lib64 Python-2.6/Lib/distutils/sysconfig.py
--- Python-2.6/Lib/distutils/sysconfig.py.lib64	2008-06-05 08:58:24.000000000 -0400
+++ Python-2.6/Lib/distutils/sysconfig.py	2008-11-24 02:34:04.000000000 -0500
@@ -115,8 +115,12 @@ def get_python_lib(plat_specific=0, stan
         prefix = plat_specific and EXEC_PREFIX or PREFIX
 
     if os.name == "posix":
+        if plat_specific or standard_lib:
+            lib = "lib64"
+        else:
+            lib = "lib"
         libpython = os.path.join(prefix,
-                                 "lib", "python" + get_python_version())
+                                 lib, "python" + get_python_version())
         if standard_lib:
             return libpython
         else:
diff -up Python-2.6/Lib/site.py.lib64 Python-2.6/Lib/site.py
--- Python-2.6/Lib/site.py.lib64	2008-05-10 13:36:24.000000000 -0400
+++ Python-2.6/Lib/site.py	2008-11-24 02:35:51.000000000 -0500
@@ -265,12 +265,16 @@ def addsitepackages(known_paths):
         if sys.platform in ('os2emx', 'riscos'):
             sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
         elif os.sep == '/':
+            sitedirs.append(os.path.join(prefix, "lib64",
+                                        "python" + sys.version[:3],
+                                        "site-packages"))
             sitedirs.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
                                         "site-packages"))
             sitedirs.append(os.path.join(prefix, "lib", "site-python"))
         else:
             sitedirs.append(prefix)
+            sitedirs.append(os.path.join(prefix, "lib64", "site-packages"))
             sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
 
         if sys.platform == "darwin":
diff -up Python-2.6/Makefile.pre.in.lib64 Python-2.6/Makefile.pre.in
--- Python-2.6/Makefile.pre.in.lib64	2008-11-24 02:34:04.000000000 -0500
+++ Python-2.6/Makefile.pre.in	2008-11-24 02:34:04.000000000 -0500
@@ -87,11 +87,11 @@ datarootdir=    @datarootdir@
 
 # Expanded directories
 BINDIR=		$(exec_prefix)/bin
-LIBDIR=		$(exec_prefix)/lib
+LIBDIR=		$(exec_prefix)/lib64
 MANDIR=		@mandir@
 INCLUDEDIR=	@includedir@
 CONFINCLUDEDIR=	$(exec_prefix)/include
-SCRIPTDIR=	$(prefix)/lib
+SCRIPTDIR=	$(prefix)/lib64
 
 # Detailed destination directories
 BINLIBDEST=	$(LIBDIR)/python$(VERSION)
diff -up Python-2.6/Modules/getpath.c.lib64 Python-2.6/Modules/getpath.c
--- Python-2.6/Modules/getpath.c.lib64	2007-03-10 02:38:14.000000000 -0500
+++ Python-2.6/Modules/getpath.c	2008-11-24 02:34:04.000000000 -0500
@@ -117,8 +117,8 @@
 #endif
 
 #ifndef PYTHONPATH
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
+              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
 #endif
 
 #ifndef LANDMARK
@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1];
 static char exec_prefix[MAXPATHLEN+1];
 static char progpath[MAXPATHLEN+1];
 static char *module_search_path = NULL;
-static char lib_python[] = "lib/python" VERSION;
+static char lib_python[] = "lib64/python" VERSION;
 
 static void
 reduce(char *dir)
@@ -524,7 +524,7 @@ calculate_path(void)
     }
     else
         strncpy(zip_path, PREFIX, MAXPATHLEN);
-    joinpath(zip_path, "lib/python00.zip");
+    joinpath(zip_path, "lib64/python00.zip");
     bufsz = strlen(zip_path);	/* Replace "00" with version */
     zip_path[bufsz - 6] = VERSION[0];
     zip_path[bufsz - 5] = VERSION[2];
@@ -534,7 +534,7 @@ calculate_path(void)
             fprintf(stderr,
                 "Could not find platform dependent libraries <exec_prefix>\n");
         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
-        joinpath(exec_prefix, "lib/lib-dynload");
+        joinpath(exec_prefix, "lib64/lib-dynload");
     }
     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
 
diff -up Python-2.6/Modules/Setup.dist.lib64 Python-2.6/Modules/Setup.dist
--- Python-2.6/Modules/Setup.dist.lib64	2008-11-24 02:34:04.000000000 -0500
+++ Python-2.6/Modules/Setup.dist	2008-11-24 02:34:04.000000000 -0500
@@ -408,7 +408,7 @@ gdbm gdbmmodule.c -I/usr/local/include -
 # and the subdirectory of PORT where you built it.
 DBLIBVER=4.7
 DBINC=/usr/include/db4
-DBLIB=/usr/lib
+DBLIB=/usr/lib64
 _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
 
 # Historical Berkeley DB 1.85
@@ -454,7 +454,7 @@ cPickle cPickle.c
 # Andrew Kuchling's zlib module.
 # This require zlib 1.1.3 (or later).
 # See http://www.gzip.org/zlib/
-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
 
 # Interface to the Expat XML parser
 #
diff -up Python-2.6/setup.py.lib64 Python-2.6/setup.py
--- Python-2.6/setup.py.lib64	2008-11-24 02:34:04.000000000 -0500
+++ Python-2.6/setup.py	2008-11-24 02:34:04.000000000 -0500
@@ -310,7 +310,7 @@ class PyBuildExt(build_ext):
 
     def detect_modules(self):
         # Ensure that /usr/local is always used
-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 
         # Add paths specified in the environment variables LDFLAGS and
@@ -583,11 +583,11 @@ class PyBuildExt(build_ext):
             elif self.compiler.find_library_file(lib_dirs, 'curses'):
                 readline_libs.append('curses')
             elif self.compiler.find_library_file(lib_dirs +
-                                               ['/usr/lib/termcap'],
+                                               ['/usr/lib64/termcap'],
                                                'termcap'):
                 readline_libs.append('termcap')
             exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
+                                   library_dirs=['/usr/lib64/termcap'],
                                    extra_link_args=readline_extra_link_args,
                                    libraries=readline_libs) )
         else:
@@ -624,8 +624,8 @@ class PyBuildExt(build_ext):
             if krb5_h:
                 ssl_incs += krb5_h
         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-                                     ['/usr/local/ssl/lib',
-                                      '/usr/contrib/ssl/lib/'
+                                     ['/usr/local/ssl/lib64',
+                                      '/usr/contrib/ssl/lib64/'
                                      ] )
 
         if (ssl_incs is not None and

python-2.6-rpath.patch:

--- NEW FILE python-2.6-rpath.patch ---
diff -up Python-2.6/configure.in.rpath Python-2.6/configure.in
--- Python-2.6/configure.in.rpath	2008-11-24 02:51:06.000000000 -0500
+++ Python-2.6/configure.in	2008-11-24 02:51:21.000000000 -0500
@@ -729,7 +729,7 @@ if test $enable_shared = "yes"; then
 	  ;;
     OSF*)
 	  LDLIBRARY='libpython$(VERSION).so'
-	  BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
+	  BLDLIBRARY='-L. -lpython$(VERSION)'
 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 	  ;;
     atheos*)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	30 Sep 2008 19:36:58 -0000	1.18
+++ .cvsignore	29 Nov 2008 02:03:47 -0000	1.19
@@ -1 +1 @@
-Python-2.5.2.tar.bz2
+Python-2.6.tar.bz2


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- python.spec	30 Sep 2008 19:36:58 -0000	1.137
+++ python.spec	29 Nov 2008 02:03:47 -0000	1.138
@@ -1,8 +1,8 @@
 %{!?__python_ver:%define __python_ver EMPTY}
-#define __python_ver 25
+#define __python_ver 26
 %define unicode ucs4
 
-%define _default_patch_fuzz	2
+%define _default_patch_fuzz 2
 
 %if "%{__python_ver}" != "EMPTY"
 %define main_python 0
@@ -14,14 +14,14 @@
 %define tkinter tkinter
 %endif
 
-%define pybasever 2.5
+%define pybasever 2.6
 %define tools_dir %{_libdir}/python%{pybasever}/Tools
 %define demo_dir %{_libdir}/python%{pybasever}/Demo
 %define doc_tools_dir %{_libdir}/python%{pybasever}/Doc/tools
 
-Summary: An interpreted, interactive, object-oriented programming language.
+Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
-Version: 2.5.2
+Version: 2.6
 Release: 1%{?dist}
 License: Python
 Group: Development/Languages
@@ -29,39 +29,40 @@
 Provides: python(abi) = %{pybasever}
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
 
-Patch0: python-2.5-config.patch
+Patch0: python-2.6-config.patch
 Patch1: Python-2.2.1-pydocnogui.patch
-Patch2: python-2.3.4-pydocnodoc.patch
-Patch3: python-2.4.1-canonicalize.patch
+#Patch2: python-2.3.4-pydocnodoc.patch
+Patch3: python-2.6-canonicalize.patch
 Patch4: python-2.5-cflags.patch
-Patch5: python-2.5.1-ctypes-exec-stack.patch
+#Patch5: python-2.5.1-ctypes-exec-stack.patch
 Patch6: python-2.5.1-plural-fix.patch
 Patch7: python-2.5.1-sqlite-encoding.patch
-Patch8: python-2.5-xmlrpclib-marshal-objects.patch
-Patch9: python-2.5-tkinter.patch
+#Patch8: python-2.5-xmlrpclib-marshal-objects.patch
+#Patch9: python-2.5-tkinter.patch
 Patch10: python-2.5.2-binutils-no-dep.patch
 Patch11: python-2.5.1-codec-ascii-tolower.patch
-Patch12: python-2.5.1-pysqlite.patch
+#Patch12: python-2.5.1-pysqlite.patch
 Patch13: python-2.5.1-socketmodule-constants.patch
 Patch14: python-2.5.1-socketmodule-constants2.patch
-Patch15: python-2.5.1-listdir.patch
+#Patch15: python-2.5.1-listdir.patch
+Patch16: python-2.6-rpath.patch
 
 # upstreamed
 
-Patch50: python-2.5-disable-egginfo.patch
+#Patch50: python-2.5-disable-egginfo.patch
 
 # new db version
-Patch60: python-2.5.2-db47.patch
+#Patch60: python-2.5.2-db47.patch
 
 # lib64 patches
 Patch101: python-2.3.4-lib64-regex.patch
-Patch102: python-2.5-lib64.patch
+Patch102: python-2.6-lib64.patch
 
 # New API from 2.6
-Patch260: python-2.5.2-set_wakeup_fd4.patch
+#Patch260: python-2.5.2-set_wakeup_fd4.patch
 
-Patch999: python-2.5.CVE-2007-4965-int-overflow.patch
-Patch998: python-2.5-CVE-2008-2316.patch
+#Patch999: python-2.5.CVE-2007-4965-int-overflow.patch
+#Patch998: python-2.5-CVE-2008-2316.patch
 
 
 %if %{main_python}
@@ -77,13 +78,13 @@
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: readline-devel, openssl-devel, gmp-devel
-BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
-BuildPrereq: libGL-devel tk tix gcc-c++ libX11-devel glibc-devel
-BuildPrereq: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
-BuildPrereq: tix-devel bzip2-devel sqlite-devel
-BuildPrereq: autoconf
-BuildPrereq: db4-devel >= 4.7
+BuildRequires: readline-devel, openssl-devel, gmp-devel
+BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
+BuildRequires: libGL-devel tk tix gcc-c++ libX11-devel glibc-devel
+BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
+BuildRequires: tix-devel bzip2-devel sqlite-devel
+BuildRequires: autoconf
+BuildRequires: db4-devel >= 4.7
 
 URL: http://www.python.org/
 
@@ -156,7 +157,7 @@
 %package -n %{tkinter}
 Summary: A graphical user interface for the Python scripting language.
 Group: Development/Languages
-BuildPrereq:  tcl, tk
+BuildRequires:  tcl, tk
 Requires: %{name} = %{version}-%{release}
 %if %{main_python}
 Obsoletes: tkinter2
@@ -190,17 +191,17 @@
 
 %patch0 -p1 -b .rhconfig
 %patch1 -p1 -b .no_gui
-%patch2 -p1 -b .no-doc
+#%%patch2 -p1 -b .no-doc
 %patch3 -p1 -b .canonicalize
 %patch4 -p1 -b .cflags
-%patch5 -p1 -b .ctypesexec
+#%%patch5 -p1 -b .ctypesexec
 %patch6 -p1 -b .plural
 %patch7 -p1
-%patch8 -p1 -b .xmlrpc
+#%%patch8 -p1 -b .xmlrpc
 
 # Try not disabling egg-infos, bz#414711
 #patch50 -p1 -b .egginfo
-%patch60 -p1 -b .db47
+#%%patch60 -p1 -b .db47
 
 %if "%{_lib}" == "lib64"
 %patch101 -p1 -b .lib64-regex
@@ -209,20 +210,21 @@
 
 %patch10 -p1 -b .binutils-no-dep
 %patch11 -p1 -b .ascii-tolower
-%patch12 -p1 -b .pysqlite-2.3.3-minimal
+#%%patch12 -p1 -b .pysqlite-2.3.3-minimal
 %patch13 -p1 -b .socketmodule
-%patch14 -p1 -b .socketmodule
-%patch15 -p1 -b .socketmodule
+%patch14 -p1 -b .socketmodule2
+#%%patch15 -p1 -b .listdir
+%patch16 -p1 -b .rpath
 
 %ifarch alpha ia64
 # 64bit, but not lib64 arches need this too...
 %patch101 -p1 -b .lib64-regex
 %endif
 
-%patch260 -p1 -b .set_wakeup_fd
+#%%patch260 -p1 -b .set_wakeup_fd
 
-%patch999 -p1 -b .cve2007-4965
-%patch998 -p0 -b .cve2008-2316
+#%%patch999 -p1 -b .cve2007-4965
+#%%patch998 -p0 -b .cve2008-2316
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -234,8 +236,8 @@
 export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
 export LINKCC="gcc"
 if pkg-config openssl ; then
-	export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-	export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
+  export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
+  export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
 fi
 # Force CC
 export CC=gcc
@@ -330,7 +332,7 @@
 
 # Documentation tools
 install -m755 -d $RPM_BUILD_ROOT%{doc_tools_dir}
-install -m755 Doc/tools/mkhowto $RPM_BUILD_ROOT%{doc_tools_dir}
+#install -m755 Doc/tools/mkhowto $RPM_BUILD_ROOT%{doc_tools_dir}
 
 # Useful demo scripts
 install -m755 -d $RPM_BUILD_ROOT%{demo_dir}
@@ -451,7 +453,10 @@
 %{_libdir}/python%{pybasever}/encodings
 %{_libdir}/python%{pybasever}/hotshot
 %{_libdir}/python%{pybasever}/idlelib
+%dir %{_libdir}/python%{pybasever}/json
+%{_libdir}/python%{pybasever}/json/*.py*
 %{_libdir}/python%{pybasever}/logging
+%{_libdir}/python%{pybasever}/multiprocessing
 %{_libdir}/python%{pybasever}/plat-linux2
 %dir %{_libdir}/python%{pybasever}/sqlite3
 %{_libdir}/python%{pybasever}/sqlite3/*.py*
@@ -482,9 +487,11 @@
 %defattr(-,root,root,755)
 %doc Tools/modulator/README.modulator
 %doc Tools/pynche/README.pynche
+%{_libdir}/python%{pybasever}/lib2to3
 %{_libdir}/python%{pybasever}/site-packages/modulator
 %{_libdir}/python%{pybasever}/site-packages/pynche
 %{_bindir}/smtpd*.py*
+%{_bindir}/2to3*
 %{_bindir}/idle*
 %{_bindir}/modulator*
 %{_bindir}/pynche*
@@ -505,12 +512,16 @@
 %{_libdir}/python%{pybasever}/ctypes/test
 %{_libdir}/python%{pybasever}/distutils/tests
 %{_libdir}/python%{pybasever}/email/test
+%{_libdir}/python%{pybasever}/json/tests
 %{_libdir}/python%{pybasever}/sqlite3/test
 %{_libdir}/python%{pybasever}/test
 %{_libdir}/python%{pybasever}/lib-dynload/_ctypes_test.so
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Fri Nov 28 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.6-1
+- Update to 2.6
+
 * Tue Sep 30 2008 James Antill <katzj at redhat.com> - 2.5.2-1
 - Move to 2.5.2
 - Fix CVE-2008-2316 hashlib overflow.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Sep 2008 19:36:58 -0000	1.18
+++ sources	29 Nov 2008 02:03:47 -0000	1.19
@@ -1 +1 @@
-afb5451049eda91fbde10bd5a4b7fadc  Python-2.5.2.tar.bz2
+837476958702cb386c657b5dba61cdc5  Python-2.6.tar.bz2


--- python-2.3.4-pydocnodoc.patch DELETED ---


--- python-2.4.1-canonicalize.patch DELETED ---


--- python-2.5-CVE-2008-2316.patch DELETED ---


--- python-2.5-config.patch DELETED ---


--- python-2.5-disable-egginfo.patch DELETED ---


--- python-2.5-lib64.patch DELETED ---


--- python-2.5-tkinter.patch DELETED ---


--- python-2.5-xmlrpclib-marshal-objects.patch DELETED ---


--- python-2.5.1-binutils-no-dep.patch DELETED ---


--- python-2.5.1-ctypes-exec-stack.patch DELETED ---


--- python-2.5.1-db46.patch DELETED ---


--- python-2.5.1-db47.patch DELETED ---


--- python-2.5.1-listdir.patch DELETED ---


--- python-2.5.1-pysqlite.patch DELETED ---


--- python-2.5.2-db47.patch DELETED ---


--- python-2.5.2-set_wakeup_fd4.patch DELETED ---


--- python-2.5.CVE-2007-4965-int-overflow.patch DELETED ---


--- python2.6-set_wakeup_fd4.patch DELETED ---


