Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22004/languages
Modified Files:
python27.info python27.patch python31.info python31.patch
Removed Files:
python27-10.6.info python27-10.6.patch python31-10.6.info
python31-10.6.patch
Log Message:
Move to stable.
--- python27-10.6.patch DELETED ---
Index: python27.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python27.patch 14 Oct 2010 05:16:31 -0000 1.1
+++ python27.patch 10 Jan 2011 22:49:00 -0000 1.2
@@ -1,23 +1,25 @@
-diff -ru Python-2.7.orig/Lib/platform.py Python-2.7/Lib/platform.py
---- Python-2.7.orig/Lib/platform.py 2010-05-05 22:54:44.000000000 -0400
-+++ Python-2.7/Lib/platform.py 2010-07-06 11:58:12.000000000 -0400
-@@ -748,6 +748,13 @@
- import gestalt
- import MacOS
- except ImportError:
-+ import posix
-+ major,minor,patch=string.split(posix.uname()[2],'.')
-+ release = '%s.%s.%s' %('10',int(major)-4, minor)
-+ if posix.uname()[4]=='Power Macintosh':
-+ machine='PowerPC'
-+ else:
-+ machine='i386'
- return release,versioninfo,machine
- # Get the infos
- sysv,sysa = _mac_ver_lookup(('sysv','sysa'))
-diff -ru Python-2.7.orig/Makefile.pre.in Python-2.7/Makefile.pre.in
---- Python-2.7.orig/Makefile.pre.in 2010-04-11 20:10:46.000000000 -0400
-+++ Python-2.7/Makefile.pre.in 2010-07-06 12:03:41.000000000 -0400
+diff -ru Python-2.7.1.orig/Lib/platform.py Python-2.7.1/Lib/platform.py
+--- Python-2.7.1.orig/Lib/platform.py 2010-08-03 03:44:35.000000000 -0400
++++ Python-2.7.1/Lib/platform.py 2010-11-29 08:14:10.000000000 -0500
+@@ -810,6 +810,15 @@
+ if info is not None:
+ return info
+
++ # If that doesn't work fall back to posix.uname
++ import posix
++ major,minor,patch=string.split(posix.uname()[2],'.')
++ release = '%s.%s.%s' %('10',int(major)-4, minor)
++ if posix.uname()[4]=='Power Macintosh':
++ machine='PowerPC'
++ else:
++ machine='i386'
++
+ # If that also doesn't work return the default values
+ return release,versioninfo,machine
+
+diff -ru Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
+--- Python-2.7.1.orig/Makefile.pre.in 2010-10-14 07:37:30.000000000 -0400
++++ Python-2.7.1/Makefile.pre.in 2010-11-29 08:14:10.000000000 -0500
@@ -429,8 +429,7 @@
fi
@@ -27,7 +29,7 @@
+ $(CC) -dynamiclib -Wl,-single_module @LIBTOOL_CRUFT@ -o $@
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LDLAST)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
- $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS)
$(LIBC) $(LIBM) $(LDLAST)
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
$(LDLAST)
@@ -787,7 +786,7 @@
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
@@ -58,9 +60,9 @@
fi \
fi; \
else true; \
-diff -ru Python-2.7.orig/Misc/python-config.in Python-2.7/Misc/python-config.in
---- Python-2.7.orig/Misc/python-config.in 2010-03-18 20:08:44.000000000
-0400
-+++ Python-2.7/Misc/python-config.in 2010-07-06 12:09:09.000000000 -0400
+diff -ru Python-2.7.1.orig/Misc/python-config.in
Python-2.7.1/Misc/python-config.in
+--- Python-2.7.1.orig/Misc/python-config.in 2010-03-18 20:08:44.000000000
-0400
++++ Python-2.7.1/Misc/python-config.in 2010-11-29 08:14:10.000000000 -0500
@@ -46,11 +46,10 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
@@ -76,9 +78,9 @@
libs.extend(getvar('LINKFORSHARED').split())
print ' '.join(libs)
-diff -ru Python-2.7.orig/Misc/python.pc.in Python-2.7/Misc/python.pc.in
---- Python-2.7.orig/Misc/python.pc.in 2009-05-24 16:23:57.000000000 -0400
-+++ Python-2.7/Misc/python.pc.in 2010-07-06 13:49:02.000000000 -0400
+diff -ru Python-2.7.1.orig/Misc/python.pc.in Python-2.7.1/Misc/python.pc.in
+--- Python-2.7.1.orig/Misc/python.pc.in 2009-05-24 16:23:57.000000000
-0400
++++ Python-2.7.1/Misc/python.pc.in 2010-11-29 08:14:10.000000000 -0500
@@ -1,6 +1,6 @@
pref...@prefix@
exec_pref...@exec_prefix@
@@ -87,9 +89,38 @@
included...@includedir@
Name: Python
-diff -ru Python-2.7.orig/Modules/posixmodule.c Python-2.7/Modules/posixmodule.c
---- Python-2.7.orig/Modules/posixmodule.c 2010-06-17 12:38:34.000000000
-0400
-+++ Python-2.7/Modules/posixmodule.c 2010-07-06 12:27:55.000000000 -0400
+diff -ru Python-2.7.1.orig/Modules/_bsddb.c Python-2.7.1/Modules/_bsddb.c
+--- Python-2.7.1.orig/Modules/_bsddb.c 2010-11-08 07:57:59.000000000 -0500
++++ Python-2.7.1/Modules/_bsddb.c 2010-11-29 08:14:10.000000000 -0500
+@@ -9766,7 +9766,13 @@
+ ADD_INT(d, DB_REP_PERMANENT);
+
+ #if (DBVER >= 44)
++#if (DBVER >= 50)
++ ADD_INT(d, DB_REP_CONF_AUTOINIT);
++#else
+ ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
++#endif /* 5.0 */
++#endif /* 4.4 */
++#if (DBVER >= 44)
+ ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
+ ADD_INT(d, DB_REP_CONF_BULK);
+ ADD_INT(d, DB_REP_CONF_NOWAIT);
+diff -ru Python-2.7.1.orig/Modules/dbmmodule.c Python-2.7.1/Modules/dbmmodule.c
+--- Python-2.7.1.orig/Modules/dbmmodule.c 2010-05-09 10:46:46.000000000
-0400
++++ Python-2.7.1/Modules/dbmmodule.c 2010-11-29 08:15:20.000000000 -0500
+@@ -19,7 +19,7 @@
+ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
+ #endif
+ #elif defined(HAVE_GDBM_NDBM_H)
+-#include <gdbm/ndbm.h>
++#include <ndbm.h>
+ static char *which_dbm = "GNU gdbm";
+ #elif defined(HAVE_GDBM_DASH_NDBM_H)
+ #include <gdbm-ndbm.h>
+diff -ru Python-2.7.1.orig/Modules/posixmodule.c
Python-2.7.1/Modules/posixmodule.c
+--- Python-2.7.1.orig/Modules/posixmodule.c 2010-11-26 12:35:50.000000000
-0500
++++ Python-2.7.1/Modules/posixmodule.c 2010-11-29 08:14:10.000000000 -0500
@@ -455,7 +455,7 @@
#endif
@@ -108,9 +139,9 @@
if (environ == NULL)
environ = *_NSGetEnviron();
#endif
-diff -ru Python-2.7.orig/configure Python-2.7/configure
---- Python-2.7.orig/configure 2010-05-28 11:28:47.000000000 -0400
-+++ Python-2.7/configure 2010-07-06 13:31:48.000000000 -0400
+diff -ru Python-2.7.1.orig/configure Python-2.7.1/configure
+--- Python-2.7.1.orig/configure 2010-10-31 21:47:19.000000000 -0400
++++ Python-2.7.1/configure 2010-11-29 08:14:10.000000000 -0500
@@ -4947,7 +4947,7 @@
;;
Darwin*)
@@ -119,8 +150,8 @@
+ BLDLIBRARY="$LDLIBRARY"
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
-
-@@ -7436,8 +7436,8 @@
+ AIX*)
+@@ -7443,8 +7443,8 @@
#ARCH_RUN_32BIT="true"
fi
@@ -131,7 +162,7 @@
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION)
-current_version $(VERSION)';;
esac
-@@ -7584,18 +7584,6 @@
+@@ -7591,18 +7591,6 @@
LDCXXSHARED="$LDCXXSHARED "'-bundle_loader
$(BINDIR)/python$(VERSION)$(EXE)'
fi ;;
Darwin/*)
@@ -150,7 +181,7 @@
LDSHARED='$(CC) $(LDFLAGS) -bundle'
LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
-@@ -7605,11 +7593,10 @@
+@@ -7612,11 +7600,10 @@
LDCXXSHARED="$LDCXXSHARED
"'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as
bundle-loader
@@ -165,7 +196,7 @@
;;
Linux*|GNU*|QNX*)
LDSHARED='$(CC) -shared'
-@@ -13578,7 +13565,7 @@
+@@ -13658,7 +13645,7 @@
if test $ac_sys_system = Darwin
then
@@ -174,9 +205,9 @@
fi
-diff -ru Python-2.7.orig/setup.py Python-2.7/setup.py
---- Python-2.7.orig/setup.py 2010-06-27 08:36:16.000000000 -0400
-+++ Python-2.7/setup.py 2010-07-06 13:30:58.000000000 -0400
+diff -ru Python-2.7.1.orig/setup.py Python-2.7.1/setup.py
+--- Python-2.7.1.orig/setup.py 2010-10-31 12:40:21.000000000 -0400
++++ Python-2.7.1/setup.py 2010-11-29 08:16:11.000000000 -0500
@@ -250,13 +250,17 @@
longest, g)
@@ -215,7 +246,7 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -669,10 +673,9 @@
+@@ -680,10 +684,9 @@
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@@ -228,7 +259,7 @@
search_for_ssl_incs_in
)
if ssl_incs is not None:
-@@ -680,9 +683,8 @@
+@@ -691,9 +694,8 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
@@ -240,7 +271,7 @@
] )
if (ssl_incs is not None and
-@@ -702,7 +704,7 @@
+@@ -713,7 +715,7 @@
# look for the openssl version header on the compiler search path.
opensslv_h = find_file('openssl/opensslv.h', [],
@@ -249,7 +280,16 @@
if opensslv_h:
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
if sys.platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -801,50 +803,8 @@
+@@ -776,7 +778,7 @@
+ # a release. Most open source OSes come with one or more
+ # versions of BerkeleyDB already installed.
+
+- max_db_ver = (4, 8)
++ max_db_ver = (5, 1)
+ min_db_ver = (4, 1)
+ db_setup_debug = False # verbose debug prints from this script?
+
+@@ -812,50 +814,8 @@
# construct a list of paths to look for the header file in on
# top of the normal inc_dirs.
db_inc_paths = [
@@ -301,7 +341,7 @@
db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
db_ver_inc_map = {}
-@@ -970,12 +930,7 @@
+@@ -981,12 +941,7 @@
# We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8
sqlite_incdir = sqlite_libdir = None
@@ -315,7 +355,7 @@
]
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
MIN_SQLITE_VERSION = ".".join([str(x)
-@@ -987,7 +942,7 @@
+@@ -998,7 +953,7 @@
if sys.platform == 'darwin':
sysroot = macosx_sdk_root()
@@ -324,7 +364,7 @@
f = os.path.join(d, "sqlite3.h")
if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-@@ -1019,11 +974,9 @@
+@@ -1030,11 +985,9 @@
sqlite_dirs_to_check = [
os.path.join(sqlite_incdir, '..', 'lib64'),
os.path.join(sqlite_incdir, '..', 'lib'),
@@ -337,7 +377,16 @@
if sqlite_libfile:
sqlite_libdir =
[os.path.abspath(os.path.dirname(sqlite_libfile))]
-@@ -1218,6 +1171,7 @@
+@@ -1151,7 +1104,7 @@
+ if self.compiler.find_library_file(lib_dirs,
+ 'gdbm_compat'):
+ gdbm_libs.append('gdbm_compat')
+- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
++ if find_file("ndbm.h", inc_dirs, []) is not None:
+ print "building dbm using gdbm"
+ dbmext = Extension(
+ 'dbm', ['dbmmodule.c'],
+@@ -1229,6 +1182,7 @@
panel_library = 'panelw'
curses_libs = [curses_library]
exts.append( Extension('_curses', ['_cursesmodule.c'],
@@ -345,7 +394,7 @@
libraries = curses_libs) )
elif curses_library == 'curses' and platform != 'darwin':
# OSX has an old Berkeley curses, not good enough for
-@@ -1238,6 +1192,7 @@
+@@ -1249,6 +1203,7 @@
if (module_enabled(exts, '_curses') and
self.compiler.find_library_file(lib_dirs, panel_library)):
exts.append( Extension('_curses_panel', ['_curses_panel.c'],
@@ -353,7 +402,7 @@
libraries = [panel_library] + curses_libs)
)
else:
missing.append('_curses_panel')
-@@ -1668,16 +1623,12 @@
+@@ -1679,16 +1634,12 @@
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
platform = self.get_platform()
Index: python31.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python31.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python31.patch 22 Oct 2010 21:09:56 -0000 1.1
+++ python31.patch 10 Jan 2011 22:49:00 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ru Python-3.1.2.orig/Makefile.pre.in Python-3.1.2/Makefile.pre.in
---- Python-3.1.2.orig/Makefile.pre.in 2010-03-18 19:01:29.000000000 -0400
-+++ Python-3.1.2/Makefile.pre.in 2010-07-06 14:11:41.000000000 -0400
+diff -ru Python-3.1.3.orig/Makefile.pre.in Python-3.1.3/Makefile.pre.in
+--- Python-3.1.3.orig/Makefile.pre.in 2010-10-14 07:35:17.000000000 -0400
++++ Python-3.1.3/Makefile.pre.in 2010-11-29 07:52:00.000000000 -0500
@@ -442,8 +442,7 @@
fi
@@ -41,9 +41,9 @@
-rm -f $(DESTDIR)$(BINDIR)/python3-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config
python3-config)
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
-diff -ru Python-3.1.2.orig/Misc/python-config.in
Python-3.1.2/Misc/python-config.in
---- Python-3.1.2.orig/Misc/python-config.in 2007-09-01 03:27:37.000000000
-0400
-+++ Python-3.1.2/Misc/python-config.in 2010-07-06 14:11:41.000000000 -0400
+diff -ru Python-3.1.3.orig/Misc/python-config.in
Python-3.1.3/Misc/python-config.in
+--- Python-3.1.3.orig/Misc/python-config.in 2007-09-01 03:27:37.000000000
-0400
++++ Python-3.1.3/Misc/python-config.in 2010-11-29 07:52:00.000000000 -0500
@@ -45,9 +45,9 @@
elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
@@ -57,9 +57,9 @@
libs.insert(0, '-L' + getvar('LIBPL'))
print(' '.join(libs))
-diff -ru Python-3.1.2.orig/Misc/python.pc.in Python-3.1.2/Misc/python.pc.in
---- Python-3.1.2.orig/Misc/python.pc.in 2009-05-24 16:39:11.000000000
-0400
-+++ Python-3.1.2/Misc/python.pc.in 2010-07-06 14:12:06.000000000 -0400
+diff -ru Python-3.1.3.orig/Misc/python.pc.in Python-3.1.3/Misc/python.pc.in
+--- Python-3.1.3.orig/Misc/python.pc.in 2009-05-24 16:39:11.000000000
-0400
++++ Python-3.1.3/Misc/python.pc.in 2010-11-29 07:52:00.000000000 -0500
@@ -1,6 +1,6 @@
pref...@prefix@
exec_pref...@exec_prefix@
@@ -68,9 +68,21 @@
included...@includedir@
Name: Python
-diff -ru Python-3.1.2.orig/Modules/posixmodule.c
Python-3.1.2/Modules/posixmodule.c
---- Python-3.1.2.orig/Modules/posixmodule.c 2010-03-01 00:56:53.000000000
-0500
-+++ Python-3.1.2/Modules/posixmodule.c 2010-07-06 14:11:41.000000000 -0400
+diff -ru Python-3.1.3.orig/Modules/_dbmmodule.c
Python-3.1.3/Modules/_dbmmodule.c
+--- Python-3.1.3.orig/Modules/_dbmmodule.c 2010-05-09 12:14:21.000000000
-0400
++++ Python-3.1.3/Modules/_dbmmodule.c 2010-11-29 07:53:30.000000000 -0500
+@@ -20,7 +20,7 @@
+ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
+ #endif
+ #elif defined(HAVE_GDBM_NDBM_H)
+-#include <gdbm/ndbm.h>
++#include <ndbm.h>
+ static char *which_dbm = "GNU gdbm";
+ #elif defined(HAVE_GDBM_DASH_NDBM_H)
+ #include <gdbm-ndbm.h>
+diff -ru Python-3.1.3.orig/Modules/posixmodule.c
Python-3.1.3/Modules/posixmodule.c
+--- Python-3.1.3.orig/Modules/posixmodule.c 2010-11-26 12:04:40.000000000
-0500
++++ Python-3.1.3/Modules/posixmodule.c 2010-11-29 07:52:00.000000000 -0500
@@ -443,7 +443,7 @@
#endif
@@ -80,19 +92,19 @@
/* On Darwin/MacOSX a shared library or framework has no access to
** environ directly, we must obtain it with _NSGetEnviron().
*/
-@@ -465,7 +465,7 @@
- d = PyDict_New();
- if (d == NULL)
- return NULL;
+@@ -470,7 +470,7 @@
+ d = PyDict_New();
+ if (d == NULL)
+ return NULL;
-#ifdef WITH_NEXT_FRAMEWORK
+#ifdef __APPLE__
- if (environ == NULL)
- environ = *_NSGetEnviron();
+ if (environ == NULL)
+ environ = *_NSGetEnviron();
#endif
-diff -ru Python-3.1.2.orig/configure Python-3.1.2/configure
---- Python-3.1.2.orig/configure 2010-03-10 17:28:52.000000000 -0500
-+++ Python-3.1.2/configure 2010-07-06 14:11:41.000000000 -0400
-@@ -4150,7 +4150,7 @@
+diff -ru Python-3.1.3.orig/configure Python-3.1.3/configure
+--- Python-3.1.3.orig/configure 2010-11-25 12:05:57.000000000 -0500
++++ Python-3.1.3/configure 2010-11-29 07:52:00.000000000 -0500
+@@ -4868,7 +4868,7 @@
;;
Darwin*)
LDLIBRARY='libpython$(VERSION).dylib'
@@ -100,8 +112,8 @@
+ BLDLIBRARY="$LDLIBRARY"
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
;;
-
-@@ -13405,8 +13405,8 @@
+ AIX*)
+@@ -7386,8 +7386,8 @@
#ARCH_RUN_32BIT="true"
fi
@@ -112,7 +124,7 @@
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION)
-current_version $(VERSION)';;
esac
-@@ -13546,14 +13546,6 @@
+@@ -7521,14 +7521,6 @@
# Use -undefined dynamic_lookup whenever possible (10.3 and
later).
# This allows an extension to be used in any Python
@@ -127,7 +139,7 @@
LDSHARED='$(CC) $(LDFLAGS) -bundle'
if test "$enable_framework" ; then
# Link against the framework. All externals
should be defined.
-@@ -13561,10 +13553,9 @@
+@@ -7536,10 +7528,9 @@
LDSHARED="$LDSHARED
"'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as
bundle-loader
@@ -140,7 +152,7 @@
;;
Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
BSD/OS*/4*) LDSHARED="gcc -shared";;
-@@ -25823,7 +25814,7 @@
+@@ -13363,7 +13354,7 @@
if test $ac_sys_system = Darwin
then
@@ -149,10 +161,11 @@
fi
-diff -ru Python-3.1.2.orig/setup.py Python-3.1.2/setup.py
---- Python-3.1.2.orig/setup.py 2010-01-01 11:29:51.000000000 -0500
-+++ Python-3.1.2/setup.py 2010-07-06 14:11:41.000000000 -0400
-@@ -192,13 +192,17 @@
+Only in Python-3.1.3: configure.orig
+diff -ru Python-3.1.3.orig/setup.py Python-3.1.3/setup.py
+--- Python-3.1.3.orig/setup.py 2010-11-26 06:56:26.000000000 -0500
++++ Python-3.1.3/setup.py 2010-11-29 07:54:10.000000000 -0500
+@@ -238,13 +238,17 @@
longest, g))
if missing:
@@ -170,7 +183,7 @@
if self.failed:
failed = self.failed[:]
-@@ -206,6 +210,7 @@
+@@ -252,6 +256,7 @@
print("Failed to build these modules:")
print_three_column(failed)
print()
@@ -178,7 +191,7 @@
def build_extension(self, ext):
-@@ -294,9 +299,8 @@
+@@ -340,9 +345,8 @@
return sys.platform
def detect_modules(self):
@@ -190,7 +203,7 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -551,10 +555,9 @@
+@@ -639,10 +643,9 @@
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
@@ -203,7 +216,7 @@
search_for_ssl_incs_in
)
if ssl_incs is not None:
-@@ -562,9 +565,8 @@
+@@ -650,9 +653,8 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
@@ -215,16 +228,16 @@
] )
if (ssl_incs is not None and
-@@ -581,7 +583,7 @@
- openssl_ver = 0
- openssl_ver_re = re.compile(
- '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
-- for ssl_inc_dir in inc_dirs + search_for_ssl_incs_in:
-+ for ssl_inc_dir in search_for_ssl_incs_in:
- name = os.path.join(ssl_inc_dir, 'openssl', 'opensslv.h')
- if os.path.isfile(name):
- try:
-@@ -804,12 +806,7 @@
+@@ -672,7 +674,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):
+@@ -915,12 +917,7 @@
# We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8
sqlite_incdir = sqlite_libdir = None
@@ -238,16 +251,16 @@
]
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
MIN_SQLITE_VERSION = ".".join([str(x)
-@@ -818,7 +815,7 @@
- # Scan the default include directories before the SQLite specific
- # ones. This allows one to override the copy of sqlite on OSX,
- # where /usr/include contains an old version of sqlite.
+@@ -932,7 +929,7 @@
+ if sys.platform == 'darwin':
+ sysroot = macosx_sdk_root()
+
- for d in inc_dirs + sqlite_inc_paths:
+ for d in sqlite_inc_paths:
f = os.path.join(d, "sqlite3.h")
- if os.path.exists(f):
- if sqlite_setup_debug: print("sqlite: found %s"%f)
-@@ -846,11 +843,9 @@
+
+ if sys.platform == 'darwin' and is_macosx_sdk_path(d):
+@@ -964,11 +961,9 @@
sqlite_dirs_to_check = [
os.path.join(sqlite_incdir, '..', 'lib64'),
os.path.join(sqlite_incdir, '..', 'lib'),
@@ -260,15 +273,24 @@
if sqlite_libfile:
sqlite_libdir =
[os.path.abspath(os.path.dirname(sqlite_libfile))]
-@@ -1003,6 +998,7 @@
- # _curses_panel.so must link with panelw.
- panel_library = 'panelw'
+@@ -1044,7 +1039,7 @@
+ gdbm_libs = ['gdbm']
+ if self.compiler.find_library_file(lib_dirs,
'gdbm_compat'):
+ gdbm_libs.append('gdbm_compat')
+- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
++ if find_file("ndbm.h", inc_dirs, []) is not None:
+ print("building dbm using gdbm")
+ dbmext = Extension(
+ '_dbm', ['_dbmmodule.c'],
+@@ -1122,6 +1117,7 @@
+ panel_library = 'panelw'
+ curses_libs = [curses_library]
exts.append( Extension('_curses', ['_cursesmodule.c'],
+ include_dirs=["@PREFIX@/include/ncursesw"],
libraries = curses_libs) )
- elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
- curses_libs = ['ncurses']
-@@ -1028,6 +1024,7 @@
+ elif curses_library == 'curses' and platform != 'darwin':
+ # OSX has an old Berkeley curses, not good enough for
+@@ -1142,6 +1138,7 @@
if (module_enabled(exts, '_curses') and
self.compiler.find_library_file(lib_dirs, panel_library)):
exts.append( Extension('_curses_panel', ['_curses_panel.c'],
@@ -276,7 +298,7 @@
libraries = [panel_library] + curses_libs)
)
else:
missing.append('_curses_panel')
-@@ -1315,16 +1312,12 @@
+@@ -1447,16 +1444,12 @@
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
platform = self.get_platform()
@@ -288,8 +310,8 @@
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
-- for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
-- '82', '8.1', '81', '8.0', '80']:
+- for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
+- '8.2', '82', '8.1', '81', '8.0', '80']:
+ for version in ['8.4']:
tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' +
version)
--- python31-10.6.patch DELETED ---
Index: python31.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python31.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python31.info 22 Oct 2010 21:09:56 -0000 1.1
+++ python31.info 10 Jan 2011 22:49:00 -0000 1.2
@@ -1,8 +1,7 @@
Info2: <<
Package: python%type_pkg[python]
-Version: 3.1.2
+Version: 3.1.3
Revision: 2
-Distribution: 10.4, 10.5
Type: python 3.1
Maintainer: Daniel Johnson <[email protected]>
Depends: <<
@@ -13,7 +12,7 @@
libgettext8-shlibs,
libncursesw5-shlibs,
readline5-shlibs,
- sqlite3-shlibs (>= 3.2.8-1001),
+ sqlite3-shlibs (>= 3.7.2-2),
tcltk (>= 8.4.1-1),
x11
<<
@@ -28,21 +27,20 @@
libgettext8-dev,
libncursesw5,
readline5,
- sqlite3-dev (>= 3.2.8-1001),
+ sqlite3-dev (>= 3.7.2-2),
system-openssl-dev,
tcltk-dev (>= 8.4.1-1),
x11-dev
<<
Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
-Source-MD5: 45350b51b58a46b029fb06c61257e350
+Source-MD5: ad5e5f1c07e829321e0a015f8cafe245
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
-Source2-MD5: c9ccf8e9fc4d046c168af313706f159b
+Source2-MD5: 2a662052eae95322919c1232cd308d05
PatchFile: %n.patch
-PatchFile-MD5: 41b8c7b49f7a9d8e889e234d99697e8b
+PatchFile-MD5: f031885cecf19521acc1be8422a95309
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SetLDFLAGS: -L%p/lib/system-openssl/lib
-ConfigureParams: --enable-shared
-#GCC: 4.0
+ConfigureParams: --enable-shared --with-dbmliborder=gdbm
CompileScript: <<
#!/bin/sh -ex
if [ "%m" = "x86_64" ]; then
@@ -52,13 +50,15 @@
fi
%{default_script}
<<
-InfoTest: TestScript: ./runtests.sh || exit 2
+
+InfoTest: TestScript: make test EXTRATESTOPTS='-w -x test_distutils
test_cmd_line'
+
InstallScript: <<
#!/bin/sh -ex
make install DESTDIR=%d
# don't propagate our hackery
- perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python%type_raw[python]/config/Makefile
+ perl -pi -e 's|-L%p/lib/system-openssl/lib||; s|-lintl ||'
%i/lib/python%type_raw[python]/config/Makefile
# fix all main things to be python-versioned filenames with
# unversioned symlinks to them
@@ -160,6 +160,10 @@
bsddb is gone so drop db* patch and dep.
Patch setup.py to find ncursesw headers and drop libncurses5 dep.
Ensure $(LDFLAGS) is used linking libpython or else it can't find
libintl.
+ Fink's gdbm3 installs %p/include/ndbm.h but python expects
+ %p/include/gdbm/ndbm.h so python ends up using /usr/include/ndbm.h
+ but the lib from gdbm3 which is, shall we say, bad. Force it to find
+ %p/include/ndbm.h instead.
<<
License: OSI-Approved
Homepage: http://www.python.org
--- python31-10.6.info DELETED ---
--- python27-10.6.info DELETED ---
Index: python27.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python27.info 14 Oct 2010 05:16:31 -0000 1.1
+++ python27.info 10 Jan 2011 22:49:00 -0000 1.2
@@ -1,21 +1,20 @@
Info2: <<
Package: python%type_pkg[python]
-Version: 2.7
+Version: 2.7.1
Revision: 1
Epoch: 1
-Distribution: 10.4, 10.5
Type: python 2.7
Maintainer: Daniel Johnson <[email protected]>
Depends: <<
%N-shlibs (= %e:%v-%r),
blt-shlibs,
bzip2-shlibs,
- db48-aes-shlibs | db48-shlibs,
+ db51-aes-shlibs | db51-shlibs,
gdbm3-shlibs,
libgettext8-shlibs,
libncursesw5-shlibs,
readline5-shlibs,
- sqlite3-shlibs (>= 3.2.8-1001),
+ sqlite3-shlibs (>= 3.7.2-2),
tcltk (>= 8.4.1-1),
x11
<<
@@ -23,7 +22,7 @@
BuildDepends: <<
blt-dev (>= 2.4z-15),
bzip2-dev,
- db48-aes | db48,
+ db51-aes | db51,
fink (>= 0.24.12-1),
gdbm3,
gettext-bin,
@@ -31,23 +30,21 @@
libgettext8-dev,
libncursesw5,
readline5,
- sqlite3-dev (>= 3.2.8-1001),
+ sqlite3-dev (>= 3.7.2-2),
system-openssl-dev,
tcltk-dev (>= 8.4.1-1),
x11-dev
<<
-# Uncomment the following line for the next update.
-#Provides: argparse-py%type_pkg[python]
+Provides: argparse-py%type_pkg[python]
Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
-Source-MD5: 0e8c9ec32abf5b732bea7d91b38c3339
+Source-MD5: aa27bc25725137ba155910bd8e5ddc4f
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
-Source2-MD5: 16b736789e923bbefe74e7a2219031c6
+Source2-MD5: 312d4da0c1d8adbfb27f4f0e09f2cffe
PatchFile: %n.patch
-PatchFile-MD5: d51ce2b21e4bfe3be6cef3afedc5872b
+PatchFile-MD5: 0330209992930fd92fd17a651ed95be2
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SetLDFLAGS: -L%p/lib/system-openssl/lib
-ConfigureParams: --enable-shared
-#GCC: 4.0
+ConfigureParams: --enable-shared --with-dbmliborder=gdbm
CompileScript: <<
#!/bin/sh -ex
if [ "%m" = "x86_64" ]; then
@@ -61,6 +58,9 @@
fi
make
<<
+
+InfoTest: TestScript: make test EXTRATESTOPTS='-w -x test_distutils'
+
InstallScript: <<
#!/bin/sh -ex
make install DESTDIR=%d
@@ -145,8 +145,6 @@
all symbols resolved at compile-time to avoid packager
mistakes and user runtime surprises.
- Should use --with-pth (fink's pth package)?
-
Play lots of games to make sure we get expected support
libraries. Also make sure -L/sw/lib/system-openssl is passed
before -L/sw (build system seems to confuse standard meanings
@@ -167,10 +165,12 @@
DescPort: <<
Patch setup.py to find ncursesw headers and drop libncurses5 dep.
- platform.mac_ver fails on 64bit (returns blanks) because it
- requires uses the MacOS module when reading gestalt and MacOS
- is not available on 64bit. Add fallback implementation using
- posix.uname.
+ platform.mac_ver now works on 64 bit, but leave our posix.uname
+ fallback in just in case.
+ Fink's gdbm3 installs %p/include/ndbm.h but python expects
+ %p/include/gdbm/ndbm.h so python ends up using /usr/include/ndbm.h
+ but the lib from gdbm3 which is, shall we say, bad. Force it to find
+ %p/include/ndbm.h instead.
<<
License: OSI-Approved
Homepage: http://www.python.org
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs