[Python-checkins] python/dist/src setup.py,1.105,1.106

2002年8月13日 13:09:29 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv1772
Modified Files:
	setup.py 
Log Message:
Regress Guido's change of 2002年08月06日 to check for the zlib version
1.1.4. Redhat hasn't upgraded but does provide a patched 1.1.3
package, so checking for 1.1.4 just makes life difficult.
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** setup.py	6 Aug 2002 17:28:30 -0000	1.105
--- setup.py	13 Aug 2002 20:09:26 -0000	1.106
***************
*** 653,664 ****
 
 
! # Andrew Kuchling's zlib module.
! # This requires zlib 1.1.4 (1.1.3 has a security problem).
! # See http://www.gzip.org/zlib/
 zlib_inc = find_file('zlib.h', [], inc_dirs)
 if zlib_inc is not None:
 zlib_h = zlib_inc[0] + '/zlib.h'
 version = '"0.0.0"'
! version_req = '"1.1.4"'
 fp = open(zlib_h)
 while 1:
--- 653,673 ----
 
 
! # Andrew Kuchling's zlib module. Note that some versions of zlib
! # 1.1.3 have security problems. See CERT Advisory CA-2002-07:
! # http://www.cert.org/advisories/CA-2002-07.html
! #
! # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
! # patch its zlib 1.1.3 package instead of upgrading to 1.1.4. For
! # now, we still accept 1.1.3, because we think it's difficult to
! # exploit this in Python, and we'd rather make it RedHat's problem
! # than our problem <wink>.
! #
! # You can upgrade zlib to version 1.1.4 yourself by going to
! # http://www.gzip.org/zlib/
 zlib_inc = find_file('zlib.h', [], inc_dirs)
 if zlib_inc is not None:
 zlib_h = zlib_inc[0] + '/zlib.h'
 version = '"0.0.0"'
! version_req = '"1.1.3"'
 fp = open(zlib_h)
 while 1: