From: David F. <fa...@us...> - 2013-01-31 17:32:39
|
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6828 Modified Files: python26.info python26.patch python27.info python27.patch Log Message: sync. w/ 10.!4/stable, validated on powerpc-darwin8 Index: python26.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python26.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- python26.patch 31 Jan 2013 03:55:28 -0000 1.1 +++ python26.patch 31 Jan 2013 17:32:35 -0000 1.2 @@ -1,6 +1,6 @@ -diff -Nurd -x'*~' Python-2.6.6.orig/Lib/bsddb/test/test_basics.py Python-2.6.6/Lib/bsddb/test/test_basics.py ---- Python-2.6.6.orig/Lib/bsddb/test/test_basics.py 2010-08-02 16:19:21.000000000 -0400 -+++ Python-2.6.6/Lib/bsddb/test/test_basics.py 2010-10-10 14:06:05.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/Lib/bsddb/test/test_basics.py Python-2.6.7/Lib/bsddb/test/test_basics.py +--- Python-2.6.7.orig/Lib/bsddb/test/test_basics.py 2010-08-02 16:19:21.000000000 -0400 ++++ Python-2.6.7/Lib/bsddb/test/test_basics.py 2011-06-29 13:25:48.000000000 -0400 @@ -1000,11 +1000,12 @@ # # See http://bugs.python.org/issue3307 # self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535) @@ -19,9 +19,9 @@ #---------------------------------------------------------------------- -diff -Nurd -x'*~' Python-2.6.6.orig/Lib/bsddb/test/test_distributed_transactions.py Python-2.6.6/Lib/bsddb/test/test_distributed_transactions.py ---- Python-2.6.6.orig/Lib/bsddb/test/test_distributed_transactions.py 2008-08-31 10:00:51.000000000 -0400 -+++ Python-2.6.6/Lib/bsddb/test/test_distributed_transactions.py 2010-10-10 14:06:05.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/Lib/bsddb/test/test_distributed_transactions.py Python-2.6.7/Lib/bsddb/test/test_distributed_transactions.py +--- Python-2.6.7.orig/Lib/bsddb/test/test_distributed_transactions.py 2008-08-31 10:00:51.000000000 -0400 ++++ Python-2.6.7/Lib/bsddb/test/test_distributed_transactions.py 2011-06-29 13:25:48.000000000 -0400 @@ -35,7 +35,7 @@ db.DB_INIT_TXN | db.DB_INIT_LOG | db.DB_INIT_MPOOL | db.DB_INIT_LOCK, 0666) @@ -40,9 +40,9 @@ gid = adapt(gid %i) self.db.put(i, gid, txn=txn, flags=db.DB_APPEND) txns.add(gid) -diff -Nurd -x'*~' Python-2.6.6.orig/Lib/ctypes/macholib/dyld.py Python-2.6.6/Lib/ctypes/macholib/dyld.py ---- Python-2.6.6.orig/Lib/ctypes/macholib/dyld.py 2008-02-21 13:52:20.000000000 -0500 -+++ Python-2.6.6/Lib/ctypes/macholib/dyld.py 2012-01-02 14:38:39.000000000 -0500 +diff -Nurd -x'*~' Python-2.6.7.orig/Lib/ctypes/macholib/dyld.py Python-2.6.7/Lib/ctypes/macholib/dyld.py +--- Python-2.6.7.orig/Lib/ctypes/macholib/dyld.py 2008-02-21 13:52:20.000000000 -0500 ++++ Python-2.6.7/Lib/ctypes/macholib/dyld.py 2012-01-02 14:40:32.000000000 -0500 @@ -26,6 +26,7 @@ DEFAULT_LIBRARY_FALLBACK = [ @@ -51,9 +51,9 @@ "/usr/local/lib", "/lib", "/usr/lib", -diff -Nurd -x'*~' Python-2.6.6.orig/Lib/locale.py Python-2.6.6/Lib/locale.py ---- Python-2.6.6.orig/Lib/locale.py 2009-05-06 09:21:17.000000000 -0400 -+++ Python-2.6.6/Lib/locale.py 2010-12-31 16:01:06.000000000 -0500 +diff -Nurd -x'*~' Python-2.6.7.orig/Lib/locale.py Python-2.6.7/Lib/locale.py +--- Python-2.6.7.orig/Lib/locale.py 2009-05-06 09:21:17.000000000 -0400 ++++ Python-2.6.7/Lib/locale.py 2011-06-29 13:25:48.000000000 -0400 @@ -522,7 +522,7 @@ """ _setlocale(category, _build_localename(getdefaultlocale())) @@ -63,9 +63,9 @@ # On Win32, this will return the ANSI code page # On the Mac, it should return the system encoding; # it might return "ascii" instead -diff -Nurd -x'*~' Python-2.6.6.orig/Lib/platform.py Python-2.6.6/Lib/platform.py ---- Python-2.6.6.orig/Lib/platform.py 2010-08-03 04:09:15.000000000 -0400 -+++ Python-2.6.6/Lib/platform.py 2010-10-10 14:22:01.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/Lib/platform.py Python-2.6.7/Lib/platform.py +--- Python-2.6.7.orig/Lib/platform.py 2010-08-03 04:09:15.000000000 -0400 ++++ Python-2.6.7/Lib/platform.py 2011-06-29 13:25:48.000000000 -0400 @@ -730,7 +730,14 @@ import gestalt import MacOS @@ -82,9 +82,9 @@ # Get the infos sysv,sysa = _mac_ver_lookup(('sysv','sysa')) # Decode the infos -diff -Nurd -x'*~' Python-2.6.6.orig/Makefile.pre.in Python-2.6.6/Makefile.pre.in ---- Python-2.6.6.orig/Makefile.pre.in 2010-08-01 18:05:31.000000000 -0400 -+++ Python-2.6.6/Makefile.pre.in 2010-10-10 14:06:05.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/Makefile.pre.in Python-2.6.7/Makefile.pre.in +--- Python-2.6.7.orig/Makefile.pre.in 2010-08-01 18:05:31.000000000 -0400 ++++ Python-2.6.7/Makefile.pre.in 2011-06-29 13:25:48.000000000 -0400 @@ -419,8 +419,7 @@ fi @@ -124,9 +124,9 @@ fi \ fi; \ else true; \ -diff -Nurd -x'*~' Python-2.6.6.orig/Misc/python-config.in Python-2.6.6/Misc/python-config.in ---- Python-2.6.6.orig/Misc/python-config.in 2007-03-31 14:56:11.000000000 -0400 -+++ Python-2.6.6/Misc/python-config.in 2010-10-10 14:06:05.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/Misc/python-config.in Python-2.6.7/Misc/python-config.in +--- Python-2.6.7.orig/Misc/python-config.in 2007-03-31 14:56:11.000000000 -0400 ++++ Python-2.6.7/Misc/python-config.in 2011-06-29 13:25:48.000000000 -0400 @@ -45,9 +45,9 @@ elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() @@ -140,9 +140,9 @@ libs.insert(0, '-L' + getvar('LIBPL')) print ' '.join(libs) -diff -Nurd -x'*~' Python-2.6.6.orig/Modules/_bsddb.c Python-2.6.6/Modules/_bsddb.c ---- Python-2.6.6.orig/Modules/_bsddb.c 2010-05-09 11:15:40.000000000 -0400 -+++ Python-2.6.6/Modules/_bsddb.c 2010-10-10 14:06:05.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/Modules/_bsddb.c Python-2.6.7/Modules/_bsddb.c +--- Python-2.6.7.orig/Modules/_bsddb.c 2010-05-09 11:15:40.000000000 -0400 ++++ Python-2.6.7/Modules/_bsddb.c 2011-06-29 13:25:48.000000000 -0400 @@ -215,6 +215,10 @@ #define DB_BUFFER_SMALL ENOMEM #endif @@ -248,9 +248,9 @@ ADD_INT(d, DB_RECOVER); ADD_INT(d, DB_RECOVER_FATAL); -diff -Nurd -x'*~' Python-2.6.6.orig/Modules/_localemodule.c Python-2.6.6/Modules/_localemodule.c ---- Python-2.6.6.orig/Modules/_localemodule.c 2010-05-09 11:15:40.000000000 -0400 -+++ Python-2.6.6/Modules/_localemodule.c 2010-12-31 16:01:06.000000000 -0500 +diff -Nurd -x'*~' Python-2.6.7.orig/Modules/_localemodule.c Python-2.6.7/Modules/_localemodule.c +--- Python-2.6.7.orig/Modules/_localemodule.c 2010-05-09 11:15:40.000000000 -0400 ++++ Python-2.6.7/Modules/_localemodule.c 2011-06-29 13:25:48.000000000 -0400 @@ -32,7 +32,7 @@ #include <wchar.h> #endif @@ -278,9 +278,9 @@ {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS}, #endif #ifdef HAVE_LANGINFO_H -diff -Nurd -x'*~' Python-2.6.6.orig/Modules/posixmodule.c Python-2.6.6/Modules/posixmodule.c ---- Python-2.6.6.orig/Modules/posixmodule.c 2010-07-24 06:05:19.000000000 -0400 -+++ Python-2.6.6/Modules/posixmodule.c 2010-10-10 14:18:05.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/Modules/posixmodule.c Python-2.6.7/Modules/posixmodule.c +--- Python-2.6.7.orig/Modules/posixmodule.c 2010-07-24 06:05:19.000000000 -0400 ++++ Python-2.6.7/Modules/posixmodule.c 2011-06-29 13:25:48.000000000 -0400 @@ -361,7 +361,7 @@ #endif @@ -299,9 +299,9 @@ if (environ == NULL) environ = *_NSGetEnviron(); #endif -diff -Nurd -x'*~' Python-2.6.6.orig/configure Python-2.6.6/configure ---- Python-2.6.6.orig/configure 2010-05-24 22:27:03.000000000 -0400 -+++ Python-2.6.6/configure 2010-10-10 14:06:05.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/configure Python-2.6.7/configure +--- Python-2.6.7.orig/configure 2010-05-24 22:27:03.000000000 -0400 ++++ Python-2.6.7/configure 2011-06-29 13:25:48.000000000 -0400 @@ -4771,7 +4771,7 @@ ;; Darwin*) @@ -358,9 +358,9 @@ fi -diff -Nurd -x'*~' Python-2.6.6.orig/setup.py Python-2.6.6/setup.py ---- Python-2.6.6.orig/setup.py 2010-07-17 08:31:09.000000000 -0400 -+++ Python-2.6.6/setup.py 2010-10-10 14:24:51.000000000 -0400 +diff -Nurd -x'*~' Python-2.6.7.orig/setup.py Python-2.6.7/setup.py +--- Python-2.6.7.orig/setup.py 2010-07-17 08:31:09.000000000 -0400 ++++ Python-2.6.7/setup.py 2011-06-29 13:25:48.000000000 -0400 @@ -260,12 +260,16 @@ longest, g) Index: python27.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python27.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- python27.patch 5 Jan 2012 17:27:17 -0000 1.3 +++ python27.patch 31 Jan 2013 17:32:35 -0000 1.4 @@ -41,15 +41,6 @@ libpython$(VERSION).sl: $(LIBRARY_OBJS) $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) -@@ -792,7 +791,7 @@ - then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ - else true; \ - fi -- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)) -+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON)) - -rm -f $(DESTDIR)$(BINDIR)/python-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) - -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) @@ -802,7 +801,7 @@ # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix) @@ -261,40 +252,6 @@ # Add paths specified in the environment variables LDFLAGS and # CPPFLAGS for header and library files. -@@ -703,10 +707,9 @@ - depends = ['socketmodule.h']) ) - # Detect SSL support for the socket module (via _ssl) - search_for_ssl_incs_in = [ -- '/usr/local/ssl/include', -- '/usr/contrib/ssl/include/' -+ '@PREFIX@/lib/system-openssl/include' - ] -- ssl_incs = find_file('openssl/ssl.h', inc_dirs, -+ ssl_incs = find_file('openssl/ssl.h', [], - search_for_ssl_incs_in - ) - if ssl_incs is not None: -@@ -714,9 +717,8 @@ - ['/usr/kerberos/include']) - 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/' -+ ssl_libs = find_library_file(self.compiler, 'ssl',[], -+ ['@PREFIX@/lib/system-openssl/lib' - ] ) - - if (ssl_incs is not None and -@@ -736,7 +738,7 @@ - - # look for the openssl version header on the compiler search path. - opensslv_h = find_file('openssl/opensslv.h', [], -- inc_dirs + search_for_ssl_incs_in) -+ search_for_ssl_incs_in) - if opensslv_h: - name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') - if sys.platform == 'darwin' and is_macosx_sdk_path(name): @@ -799,7 +801,7 @@ # a release. Most open source OSes come with one or more # versions of BerkeleyDB already installed. @@ -445,3 +402,57 @@ self.extensions.extend([ext, ext_test]) if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): +diff --git a/Modules/_math.c b/Modules/_math.c +--- a/Modules/_math.c ++++ b/Modules/_math.c +@@ -189,6 +189,27 @@ double + significant loss of precision th |