[people/stevee/ipfire-3.x.git] / python / patches / python-2.7.1-config.patch

diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dist
--- Python-2.7.1/Modules/Setup.dist.rhconfig	2010-08-21 07:40:30.000000000 -0400
+++ Python-2.7.1/Modules/Setup.dist	2010-12-23 15:47:12.111059967 -0500
@@ -153,7 +153,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
@@ -163,73 +163,73 @@ 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 _math.c # -lm # complex math library functions
-#math mathmodule.c _math.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
-#_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
-#_functools _functoolsmodule.c	# Tools for working with functions and callable objects
+array arraymodule.c	# array objects
+cmath cmathmodule.c _math.c # -lm # complex math library functions
+math mathmodule.c _math.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
+_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
+_functools _functoolsmodule.c	# Tools for working with functions and callable objects
 #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
 #_pickle _pickle.c	# pickle accelerator
 #datetime datetimemodule.c	# date/time type
-#_bisect _bisectmodule.c	# Bisection algorithms
+_bisect _bisectmodule.c	# Bisection algorithms
 
-#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.
@@ -237,8 +237,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
@@ -248,14 +248,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.
@@ -302,12 +302,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.
@@ -373,7 +373,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
@@ -411,11 +411,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
 #
@@ -430,14 +429,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.
@@ -460,7 +459,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
 #
@@ -479,14 +478,14 @@ GLHACK=-Dclear=__GLclear
 # 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
Commit	Line	Data
99e69167 MT	1	diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dist
	2	--- Python-2.7.1/Modules/Setup.dist.rhconfig 2010-08-21 07:40:30.000000000 -0400
	3	+++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:47:12.111059967 -0500
	4	@@ -153,7 +153,7 @@ GLHACK=-Dclear=__GLclear
	5	# modules are to be built as shared libraries (see above for more
	6	# detail; also note that static reverses this effect):
	7
	8	-#shared
	9	+shared
	10
	11	# GNU readline. Unlike previous Python incarnations, GNU readline is
	12	# now incorporated in an optional module, configured in the Setup file
	13	@@ -163,73 +163,73 @@ GLHACK=-Dclear=__GLclear
	14	# it, depending on your system -- see the GNU readline instructions.
	15	# It's okay for this to be a shared library, too.
	16
	17	-#readline readline.c -lreadline -ltermcap
	18	+readline readline.c -lreadline -ltermcap
	19
	20
	21	# Modules that should always be present (non UNIX dependent):
	22
	23	-#array arraymodule.c # array objects
	24	-#cmath cmathmodule.c _math.c # -lm # complex math library functions
	25	-#math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
	26	-#_struct _struct.c # binary structure packing/unpacking
	27	-#time timemodule.c # -lm # time operations and variables
	28	-#operator operator.c # operator.add() and similar goodies
	29	-#_testcapi _testcapimodule.c # Python C API test module
	30	-#_random _randommodule.c # Random number generator
	31	-#_collections _collectionsmodule.c # Container types
	32	-#itertools itertoolsmodule.c # Functions creating iterators for efficient looping
	33	-#strop stropmodule.c # String manipulations
	34	-#_functools _functoolsmodule.c # Tools for working with functions and callable objects
	35	+array arraymodule.c # array objects
	36	+cmath cmathmodule.c _math.c # -lm # complex math library functions
	37	+math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
	38	+_struct _struct.c # binary structure packing/unpacking
	39	+time timemodule.c # -lm # time operations and variables
	40	+operator operator.c # operator.add() and similar goodies
	41	+_testcapi _testcapimodule.c # Python C API test module
	42	+_random _randommodule.c # Random number generator
	43	+_collections _collectionsmodule.c # Container types
	44	+itertools itertoolsmodule.c # Functions creating iterators for efficient looping
	45	+strop stropmodule.c # String manipulations
	46	+_functools _functoolsmodule.c # Tools for working with functions and callable objects
	47	#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator
	48	#_pickle _pickle.c # pickle accelerator
	49	#datetime datetimemodule.c # date/time type
	50	-#_bisect _bisectmodule.c # Bisection algorithms
	51	+_bisect _bisectmodule.c # Bisection algorithms
	52
	53	-#unicodedata unicodedata.c # static Unicode character database
	54	+unicodedata unicodedata.c # static Unicode character database
	55
	56	# access to ISO C locale support
	57	-#_locale _localemodule.c # -lintl
	58	+_locale _localemodule.c # -lintl
	59
	60
	61	# Modules with some UNIX dependencies -- on by default:
	62	# (If you have a really backward UNIX, select and socket may not be
	63	# supported...)
	64
65	-#fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
66	-#spwd spwdmodule.c # spwd(3)
67	-#grp grpmodule.c # grp(3)
68	-#select selectmodule.c # select(2); not on ancient System V
69	+fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
70	+spwd spwdmodule.c # spwd(3)
71	+grp grpmodule.c # grp(3)
72	+select selectmodule.c # select(2); not on ancient System V
73
74	# Memory-mapped files (also works on Win32).
75	-#mmap mmapmodule.c
76	+mmap mmapmodule.c
77
78	# CSV file helper
79	-#_csv _csv.c
80	+_csv _csv.c
81
82	# Socket module helper for socket(2)
83	-#_socket socketmodule.c
84	+_socket socketmodule.c
85
86	# Socket module helper for SSL support; you must comment out the other
87	# socket line above, and possibly edit the SSL variable:
88	#SSL=/usr/local/ssl
89	-#_ssl _ssl.c \
90	-# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
91	-# -L$(SSL)/lib -lssl -lcrypto
92	+_ssl _ssl.c \
93	+ -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
94	+ -L$(SSL)/lib -lssl -lcrypto
95
96	# The crypt module is now disabled by default because it breaks builds
97	# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
98	#
99	# First, look at Setup.config; configure may have set this for you.
100
101	-#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
102	+crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
103
104
105	# Some more UNIX dependent modules -- off by default, since these
106	# are not supported by all UNIX systems:
107
108	-#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
109	-#termios termios.c # Steen Lumholt's termios module
110	-#resource resource.c # Jeremy Hylton's rlimit interface
111	+nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
112	+termios termios.c # Steen Lumholt's termios module
113	+resource resource.c # Jeremy Hylton's rlimit interface
114
115
116	# Multimedia modules -- off by default.
117	@@ -237,8 +237,8 @@ GLHACK=-Dclear=__GLclear
118	# #993173 says audioop works on 64-bit platforms, though.
119	# These represent audio samples or images as strings:
120
121	-#audioop audioop.c # Operations on audio samples
122	-#imageop imageop.c # Operations on images
123	+audioop audioop.c # Operations on audio samples
124	+imageop imageop.c # Operations on images
125
126
127	# Note that the _md5 and _sha modules are normally only built if the
128	@@ -248,14 +248,14 @@ GLHACK=-Dclear=__GLclear
129	# Message-Digest Algorithm, described in RFC 1321. The necessary files
130	# md5.c and md5.h are included here.
131
132	-#_md5 md5module.c md5.c
133	+_md5 md5module.c md5.c
134
135
136	# The _sha module implements the SHA checksum algorithms.
137	# (NIST's Secure Hash Algorithms.)
138	-#_sha shamodule.c
139	-#_sha256 sha256module.c
140	-#_sha512 sha512module.c
141	+_sha shamodule.c
142	+_sha256 sha256module.c
143	+_sha512 sha512module.c
144
145
146	# SGI IRIX specific modules -- off by default.
147	@@ -302,12 +302,12 @@ GLHACK=-Dclear=__GLclear
148	# A Linux specific module -- off by default; this may also work on
149	# some *BSDs.
150
151	-#linuxaudiodev linuxaudiodev.c
152	+linuxaudiodev linuxaudiodev.c
153
154
155	# George Neville-Neil's timing module:
156
157	-#timing timingmodule.c
158	+timing timingmodule.c
159
160
161	# The _tkinter module.
99e69167 MT	162	@@ -373,7 +373,7 @@ GLHACK=-Dclear=__GLclear
	163	# it is a highly experimental and dangerous device for calling
	164	# arbitrary C functions in arbitrary shared libraries:
	165
	166	-#dl dlmodule.c
	167	+dl dlmodule.c
	168
	169
	170	# Modules that provide persistent dictionary-like semantics. You will
99e69167 MT	171	@@ -411,11 +411,10 @@ GLHACK=-Dclear=__GLclear
	172	#
	173	# Edit the variables DB and DBLIBVERto point to the db top directory
	174	# and the subdirectory of PORT where you built it.
	175	-#DB=/usr/local/BerkeleyDB.4.0
	176	-#DBLIBVER=4.0
	177	-#DBINC=$(DB)/include
	178	-#DBLIB=$(DB)/lib
	179	-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
	180	+DBLIBVER=4.7
	181	+DBINC=/usr/include/db4
	182	+DBLIB=/usr/lib
	183	+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
	184
	185	# Historical Berkeley DB 1.85
	186	#
	187	@@ -430,14 +429,14 @@ GLHACK=-Dclear=__GLclear
	188
	189
	190	# Helper module for various ascii-encoders
	191	-#binascii binascii.c
	192	+binascii binascii.c
	193
	194	# Fred Drake's interface to the Python parser
	195	-#parser parsermodule.c
	196	+parser parsermodule.c
	197
	198	# cStringIO and cPickle
	199	-#cStringIO cStringIO.c
	200	-#cPickle cPickle.c
	201	+cStringIO cStringIO.c
	202	+cPickle cPickle.c
	203
	204
	205	# Lee Busby's SIGFPE modules.
	206	@@ -460,7 +459,7 @@ GLHACK=-Dclear=__GLclear
	207	# Andrew Kuchling's zlib module.
	208	# This require zlib 1.1.3 (or later).
	209	# See http://www.gzip.org/zlib/
	210	-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
	211	+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
	212
	213	# Interface to the Expat XML parser
	214	#
	215	@@ -479,14 +478,14 @@ GLHACK=-Dclear=__GLclear
	216	# Hye-Shik Chang's CJKCodecs
	217
	218	# multibytecodec is required for all the other CJK codec modules
	219	-#_multibytecodec cjkcodecs/multibytecodec.c
	220	+_multibytecodec cjkcodecs/multibytecodec.c
	221
	222	-#_codecs_cn cjkcodecs/_codecs_cn.c
	223	-#_codecs_hk cjkcodecs/_codecs_hk.c
	224	-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
	225	-#_codecs_jp cjkcodecs/_codecs_jp.c
	226	-#_codecs_kr cjkcodecs/_codecs_kr.c
	227	-#_codecs_tw cjkcodecs/_codecs_tw.c
	228	+_codecs_cn cjkcodecs/_codecs_cn.c
	229	+_codecs_hk cjkcodecs/_codecs_hk.c
	230	+_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
	231	+_codecs_jp cjkcodecs/_codecs_jp.c
	232	+_codecs_kr cjkcodecs/_codecs_kr.c
	233	+_codecs_tw cjkcodecs/_codecs_tw.c
	234
235	# Example -- included for reference only:
236	# xx xxmodule.c