1 --- Python-2.5.1/Include/pyexpat.h.rhconfig 2006-06-19 19:21:25.000000000 -0400
2 +++ Python-2.5.1/Include/pyexpat.h 2007-06-27 10:12:45.000000000 -0400
5 #define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0"
7 +#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
8 +#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
9 +typedef __int64 XML_Index;
10 +typedef unsigned __int64 XML_Size;
12 +typedef long long XML_Index;
13 +typedef unsigned long long XML_Size;
16 +typedef long XML_Index;
17 +typedef unsigned long XML_Size;
18 +#endif /* XML_LARGE_SIZE */
22 char* magic; /* set to PyExpat_CAPI_MAGIC */
23 --- Python-2.5.1/Modules/Setup.dist.rhconfig 2006-08-06 03:26:21.000000000 -0400
24 +++ Python-2.5.1/Modules/Setup.dist 2007-06-27 10:12:45.000000000 -0400
25 @@ -149,7 +149,7 @@ GLHACK=-Dclear=__GLclear
26 # modules are to be built as shared libraries (see above for more
27 # detail; also note that *static* reverses this effect):
32 # GNU readline. Unlike previous Python incarnations, GNU readline is
33 # now incorporated in an optional module, configured in the Setup file
34 @@ -159,69 +159,69 @@ GLHACK=-Dclear=__GLclear
35 # it, depending on your system -- see the GNU readline instructions.
36 # It's okay for this to be a shared library, too.
38 -#readline readline.c -lreadline -ltermcap
39 +readline readline.c -lreadline -lncursesw
42 # Modules that should always be present (non UNIX dependent):
44 -#array arraymodule.c # array objects
45 -#cmath cmathmodule.c # -lm # complex math library functions
46 -#math mathmodule.c # -lm # math library functions, e.g. sin()
47 -#_struct _struct.c # binary structure packing/unpacking
48 -#time timemodule.c # -lm # time operations and variables
49 -#operator operator.c # operator.add() and similar goodies
50 -#_weakref _weakref.c # basic weak reference support
51 -#_testcapi _testcapimodule.c # Python C API test module
52 -#_random _randommodule.c # Random number generator
53 -#collections collectionsmodule.c # Container types
54 -#itertools itertoolsmodule.c # Functions creating iterators for efficient looping
55 -#strop stropmodule.c # String manipulations
56 +array arraymodule.c # array objects
57 +cmath cmathmodule.c # -lm # complex math library functions
58 +math mathmodule.c # -lm # math library functions, e.g. sin()
59 +_struct _struct.c # binary structure packing/unpacking
60 +time timemodule.c # -lm # time operations and variables
61 +operator operator.c # operator.add() and similar goodies
62 +_weakref _weakref.c # basic weak reference support
63 +_testcapi _testcapimodule.c # Python C API test module
64 +_random _randommodule.c # Random number generator
65 +collections collectionsmodule.c # Container types
66 +itertools itertoolsmodule.c # Functions creating iterators for efficient looping
67 +strop stropmodule.c # String manipulations
69 -#unicodedata unicodedata.c # static Unicode character database
70 +unicodedata unicodedata.c # static Unicode character database
72 # access to ISO C locale support
73 -#_locale _localemodule.c # -lintl
74 +_locale _localemodule.c # -lintl
77 # Modules with some UNIX dependencies -- on by default:
78 # (If you have a really backward UNIX, select and socket may not be
81 -#fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
82 -#spwd spwdmodule.c # spwd(3)
83 -#grp grpmodule.c # grp(3)
84 -#select selectmodule.c # select(2); not on ancient System V
85 +fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
86 +spwd spwdmodule.c # spwd(3)
87 +grp grpmodule.c # grp(3)
88 +select selectmodule.c # select(2); not on ancient System V
90 # Memory-mapped files (also works on Win32).
98 # Socket module helper for socket(2)
99 -#_socket socketmodule.c
100 +_socket socketmodule.c
102 # Socket module helper for SSL support; you must comment out the other
103 # socket line above, and possibly edit the SSL variable:
106 -# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
107 -# -L$(SSL)/lib -lssl -lcrypto
109 + -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
110 + -L$(SSL)/lib -lssl -lcrypto
112 # The crypt module is now disabled by default because it breaks builds
113 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
115 # First, look at Setup.config; configure may have set this for you.
117 -#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
118 +crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
121 # Some more UNIX dependent modules -- off by default, since these
122 # are not supported by all UNIX systems:
124 -#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
125 -#termios termios.c # Steen Lumholt's termios module
126 -#resource resource.c # Jeremy Hylton's rlimit interface
127 +nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
128 +termios termios.c # Steen Lumholt's termios module
129 +resource resource.c # Jeremy Hylton's rlimit interface
132 # Multimedia modules -- off by default.
133 @@ -229,9 +229,9 @@ GLHACK=-Dclear=__GLclear
134 # #993173 says audioop works on 64-bit platforms, though.
135 # These represent audio samples or images as strings:
137 -#audioop audioop.c # Operations on audio samples
138 -#imageop imageop.c # Operations on images
139 -#rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably)
140 +audioop audioop.c # Operations on audio samples
141 +imageop imageop.c # Operations on images
142 +rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably)
145 # Note that the _md5 and _sha modules are normally only built if the
146 @@ -241,12 +241,12 @@ GLHACK=-Dclear=__GLclear
147 # Message-Digest Algorithm, described in RFC 1321. The necessary files
148 # md5.c and md5.h are included here.
150 -#_md5 md5module.c md5.c
151 +_md5 md5module.c md5.c
154 # The _sha module implements the SHA checksum algorithm.
155 # (NIST's Secure Hash Algorithm.)
160 # SGI IRIX specific modules -- off by default.
161 @@ -293,12 +293,12 @@ GLHACK=-Dclear=__GLclear
162 # A Linux specific module -- off by default; this may also work on
165 -#linuxaudiodev linuxaudiodev.c
166 +linuxaudiodev linuxaudiodev.c
169 # George Neville-Neil's timing module:
171 -#timing timingmodule.c
172 +timing timingmodule.c
175 # The _tkinter module.
176 @@ -313,7 +313,7 @@ GLHACK=-Dclear=__GLclear
179 # *** Always uncomment this (leave the leading underscore in!):
180 -# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
181 +_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
182 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
184 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
185 @@ -323,7 +323,7 @@ GLHACK=-Dclear=__GLclear
186 # *** Or uncomment this for Solaris:
187 # -I/usr/openwin/include \
188 # *** Uncomment and edit for Tix extension only:
189 -# -DWITH_TIX -ltix8.1.8.2 \
191 # *** Uncomment and edit for BLT extension only:
192 # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
193 # *** Uncomment and edit for PIL (TkImaging) extension only:
194 @@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear
195 # *** Uncomment and edit for TOGL extension only:
196 # -DWITH_TOGL togl.c \
197 # *** Uncomment and edit to reflect your Tcl/Tk versions:
198 -# -ltk8.2 -ltcl8.2 \
200 # *** Uncomment and edit to reflect where your X11 libraries are:
202 # *** Or uncomment this for Solaris:
203 @@ -342,7 +342,7 @@ GLHACK=-Dclear=__GLclear
204 # *** Uncomment for AIX:
206 # *** Always uncomment this; X11 libraries to link with:
210 # Lance Ellinghaus's syslog module
211 #syslog syslogmodule.c # syslog daemon interface
212 @@ -354,9 +354,9 @@ GLHACK=-Dclear=__GLclear
214 # First, look at Setup.config; configure may have set this for you.
216 -#_curses _cursesmodule.c -lcurses -ltermcap
217 +_curses _cursesmodule.c -lncursesw
218 # Wrapper for the panel library that's part of ncurses and SYSV curses.
219 -#_curses_panel _curses_panel.c -lpanel -lncurses
220 +_curses_panel _curses_panel.c -lpanel -lncursesw
223 # Generic (SunOS / SVR4) dynamic loading module.
224 @@ -364,7 +364,7 @@ GLHACK=-Dclear=__GLclear
225 # it is a highly experimental and dangerous device for calling
226 # *arbitrary* C functions in *arbitrary* shared libraries:
232 # Modules that provide persistent dictionary-like semantics. You will
233 @@ -387,7 +387,7 @@ GLHACK=-Dclear=__GLclear
235 # First, look at Setup.config; configure may have set this for you.
237 -#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
238 +gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
241 # Sleepycat Berkeley DB interface.
242 @@ -402,11 +402,10 @@ GLHACK=-Dclear=__GLclear
244 # Edit the variables DB and DBLIBVERto point to the db top directory
245 # and the subdirectory of PORT where you built it.
246 -#DB=/usr/local/BerkeleyDB.4.0
248 -#DBINC=$(DB)/include
250 -#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
252 +DBINC=/usr/include/db4
254 +_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
256 # Historical Berkeley DB 1.85
258 @@ -421,14 +420,14 @@ GLHACK=-Dclear=__GLclear
261 # Helper module for various ascii-encoders
262 -#binascii binascii.c
265 # Fred Drake's interface to the Python parser
266 -#parser parsermodule.c
267 +parser parsermodule.c
269 # cStringIO and cPickle
270 -#cStringIO cStringIO.c
272 +cStringIO cStringIO.c
276 # Lee Busby's SIGFPE modules.
277 @@ -451,7 +450,7 @@ GLHACK=-Dclear=__GLclear
278 # Andrew Kuchling's zlib module.
279 # This require zlib 1.1.3 (or later).
280 # See http://www.gzip.org/zlib/
281 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
282 +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
284 # Interface to the Expat XML parser
286 @@ -465,20 +464,20 @@ GLHACK=-Dclear=__GLclear
287 # More information on Expat can be found at www.libexpat.org.
289 #EXPAT_DIR=/usr/local/src/expat-1.95.2
290 -#pyexpat pyexpat.c -DHAVE_EXPAT_H -I$(EXPAT_DIR)/lib -L$(EXPAT_DIR) -lexpat
291 +pyexpat pyexpat.c -DHAVE_EXPAT_H -lexpat
294 # Hye-Shik Chang's CJKCodecs
296 # multibytecodec is required for all the other CJK codec modules
297 -#_multibytecodec cjkcodecs/multibytecodec.c
298 +_multibytecodec cjkcodecs/multibytecodec.c
300 -#_codecs_cn cjkcodecs/_codecs_cn.c
301 -#_codecs_hk cjkcodecs/_codecs_hk.c
302 -#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
303 -#_codecs_jp cjkcodecs/_codecs_jp.c
304 -#_codecs_kr cjkcodecs/_codecs_kr.c
305 -#_codecs_tw cjkcodecs/_codecs_tw.c
306 +_codecs_cn cjkcodecs/_codecs_cn.c
307 +_codecs_hk cjkcodecs/_codecs_hk.c
308 +_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
309 +_codecs_jp cjkcodecs/_codecs_jp.c
310 +_codecs_kr cjkcodecs/_codecs_kr.c
311 +_codecs_tw cjkcodecs/_codecs_tw.c
313 # Example -- included for reference only:
315 --- Python-2.5.1/setup.py.rhconfig 2007-06-27 10:26:41.000000000 -0400
316 +++ Python-2.5.1/setup.py 2007-06-27 10:26:51.000000000 -0400
317 @@ -998,7 +998,6 @@ class PyBuildExt(build_ext):
319 exts.append(Extension('pyexpat',
320 define_macros = define_macros,
321 - include_dirs = [expatinc],
322 sources = ['pyexpat.c',
325 @@ -1013,7 +1012,6 @@ class PyBuildExt(build_ext):
326 define_macros.append(('USE_PYEXPAT_CAPI', None))
327 exts.append(Extension('_elementtree',
328 define_macros = define_macros,
329 - include_dirs = [expatinc],
330 sources = ['_elementtree.c'],