Re: [Python-Dev] zlib 1.2.3 is just out

2005-07-25 Thread Trent Mick
[Martin v. L?wis wrote]
 Raymond Hettinger wrote:
 I'd guess this belongs in 2.5, with a possible retrofit for 2.4.
  
  
  +1 on backporting, but that is up to Anthony.
 
 Correct me if I'm wrong - but there isn't much porting to this.
 AFAICT, this is only relevant for the Windows build (i.e. which
 version is used in the binaries). For the source distribution, there
 should be no change (except for PCbuild/readme.txt, which should
 reflect the version that is used in the Windows build). FWIW,
 this currently talks about 1.2.1.

Here is a patch to do this (attached) that works on the trunk and
against the Python-2.4.1.tgz source tarball. Shall I check this into the
HEAD and release24-maint?

Trent

-- 
Trent Mick
[EMAIL PROTECTED]
Index: PCbuild/readme.txt
===
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.59
diff -u -r1.59 readme.txt
--- python/PCbuild/readme.txt   6 Jul 2005 19:34:10 -   1.59
+++ python/PCbuild/readme.txt   26 Jul 2005 00:53:17 -
@@ -126,15 +126,15 @@
 
 zlib
 Python wrapper for the zlib compression library.  Get the source code
-for version 1.2.1 from a convenient mirror at:
+for version 1.2.3 from a convenient mirror at:
 http://www.gzip.org/zlib/
-Unpack into dist\zlib-1.2.1.
+Unpack into dist\zlib-1.2.3.
 A custom pre-link step in the zlib project settings should manage to
-build zlib-1.2.1\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
+build zlib-1.2.3\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
 linked in PCbuild\.
 However, the zlib project is not smart enough to remove anything under
-zlib-1.2.1\ when you do a clean, so if you want to rebuild zlib.lib
-you need to clean up zlib-1.2.1\ by hand.
+zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
+you need to clean up zlib-1.2.3\ by hand.
 
 bz2
 Python wrapper for the libbz2 compression library.  Homepage
Index: PCbuild/zlib.vcproj
===
RCS file: /cvsroot/python/python/dist/src/PCbuild/zlib.vcproj,v
retrieving revision 1.6
diff -u -r1.6 zlib.vcproj
--- python/PCbuild/zlib.vcproj  20 Jul 2004 14:37:48 -  1.6
+++ python/PCbuild/zlib.vcproj  26 Jul 2005 00:53:17 -
@@ -21,7 +21,7 @@
Tool
Name=VCCLCompilerTool
Optimization=0
-   
AdditionalIncludeDirectories=..\Include,..\PC,..\..\zlib-1.2.1
+   
AdditionalIncludeDirectories=..\Include,..\PC,..\..\zlib-1.2.3
PreprocessorDefinitions=_DEBUG;WIN32;_WINDOWS
RuntimeLibrary=3
UsePrecompiledHeader=2
@@ -37,7 +37,7 @@
Name=VCCustomBuildTool/
Tool
Name=VCLinkerTool
-   
AdditionalDependencies=..\..\zlib-1.2.1\zlib.lib
+   
AdditionalDependencies=..\..\zlib-1.2.3\zlib.lib
OutputFile=./zlib_d.pyd
LinkIncremental=1
SuppressStartupBanner=TRUE
@@ -63,7 +63,7 @@
Tool
Name=VCPreLinkEventTool
Description=Checking static zlib has been 
built
-   CommandLine=cd ..\..\zlib-1.2.1
+   CommandLine=cd ..\..\zlib-1.2.3
 nmake -nologo -f win32\Makefile.msc zlib.lib
 /
Tool
@@ -92,7 +92,7 @@
Name=VCCLCompilerTool
Optimization=2
InlineFunctionExpansion=1
-   
AdditionalIncludeDirectories=..\Include,..\PC,..\..\zlib-1.2.1
+   
AdditionalIncludeDirectories=..\Include,..\PC,..\..\zlib-1.2.3
PreprocessorDefinitions=NDEBUG;WIN32;_WINDOWS
StringPooling=TRUE
RuntimeLibrary=2
@@ -110,7 +110,7 @@
Name=VCCustomBuildTool/
Tool
Name=VCLinkerTool
-   
AdditionalDependencies=..\..\zlib-1.2.1\zlib.lib
+   
AdditionalDependencies=..\..\zlib-1.2.3\zlib.lib
OutputFile=./zlib.pyd
LinkIncremental=1
SuppressStartupBanner=TRUE
@@ -136,7 +136,7 @@
Tool
Name=VCPreLinkEventTool
Description=Checking static zlib has been 
built
-

Re: [Python-Dev] zlib 1.2.3 is just out

2005-07-25 Thread Tim Peters
[Scott David Daniels]
 I'd guess this belongs in 2.5, with a possible retrofit for 2.4.

[Raymond Hettinger]
 +1 on backporting, but that is up to Anthony.

[Martin v. L?wis wrote]
 Correct me if I'm wrong - but there isn't much porting to this.
 AFAICT, this is only relevant for the Windows build (i.e. which
 version is used in the binaries). For the source distribution, there
 should be no change (except for PCbuild/readme.txt, which should
 reflect the version that is used in the Windows build). FWIW,
 this currently talks about 1.2.1.

[Trent Mick]
 Here is a patch to do this (attached) that works on the trunk and
 against the Python-2.4.1.tgz source tarball. Shall I check this into the
 HEAD and release24-maint?

Definitely on HEAD, almost certainly on 24 maint.  The slight
uncertainty wrt the latter is due to the slim possibility that they
also made this version of zlib incompatible in some way.  I doubt
that, but I haven't tried it.

BTW, the NEWS files should add a blurb saying Python moved to a new
zlib, under a Windows section.
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] zlib 1.2.3 is just out

2005-07-25 Thread Trent Mick
 [Trent Mick]
  Here is a patch to do this (attached) that works on the trunk and
  against the Python-2.4.1.tgz source tarball. Shall I check this into the
  HEAD and release24-maint?

[Tim Peters wrote]
 Definitely on HEAD, almost certainly on 24 maint.  The slight
 uncertainty wrt the latter is due to the slim possibility that they
 also made this version of zlib incompatible in some way.  I doubt
 that, but I haven't tried it.

Dunno. All tests in test_zlib pass.

 BTW, the NEWS files should add a blurb saying Python moved to a new
 zlib, under a Windows section.

Okay.

Trent


-- 
Trent Mick
[EMAIL PROTECTED]
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] zlib 1.2.3 is just out

2005-07-25 Thread Trent Mick
[Anthony Baxter wrote]
 On Tuesday 26 July 2005 11:39, Trent Mick wrote:
  Here is a patch to do this (attached) that works on the trunk and
  against the Python-2.4.1.tgz source tarball. Shall I check this into the
  HEAD and release24-maint?
 
 Yes.

Okay, done.

Can I say that I've had the pleasure for a long while now at only being
afflicted with Subversion and Perforce. We can't move Python CVS to
subversion soon enough. Then again with a checkin rate hovering belong
one per year... :)

HEAD:
Checking in dist/src/Misc/NEWS;
/cvsroot/python/python/dist/src/Misc/NEWS,v  --  NEWS
new revision: 1.1323; previous revision: 1.1322
done
Checking in dist/src/PCbuild/readme.txt;
/cvsroot/python/python/dist/src/PCbuild/readme.txt,v  --  readme.txt
new revision: 1.60; previous revision: 1.59
done
Checking in dist/src/PCbuild/zlib.vcproj;
/cvsroot/python/python/dist/src/PCbuild/zlib.vcproj,v  --  zlib.vcproj
new revision: 1.7; previous revision: 1.6
done

release24-maint:
Checking in dist/src/Misc/NEWS;
/cvsroot/python/python/dist/src/Misc/NEWS,v  --  NEWS
new revision: 1.1193.2.66; previous revision: 1.1193.2.65
done
Checking in dist/src/PCbuild/readme.txt;
/cvsroot/python/python/dist/src/PCbuild/readme.txt,v  --  readme.txt
new revision: 1.58.2.1; previous revision: 1.58
done
Checking in dist/src/PCbuild/zlib.vcproj;
/cvsroot/python/python/dist/src/PCbuild/zlib.vcproj,v  --  zlib.vcproj
new revision: 1.6.4.1; previous revision: 1.6
done


Trent

-- 
Trent Mick
[EMAIL PROTECTED]
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] zlib 1.2.3 is just out

2005-07-24 Thread Martin v. Löwis
Raymond Hettinger wrote:
I'd guess this belongs in 2.5, with a possible retrofit for 2.4.
 
 
 +1 on backporting, but that is up to Anthony.

Correct me if I'm wrong - but there isn't much porting to this.
AFAICT, this is only relevant for the Windows build (i.e. which
version is used in the binaries). For the source distribution, there
should be no change (except for PCbuild/readme.txt, which should
reflect the version that is used in the Windows build). FWIW,
this currently talks about 1.2.1.

Regards,
Martin
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


[Python-Dev] zlib 1.2.3 is just out

2005-07-23 Thread Scott David Daniels
Note zlib 1.2.3 is just out -- the zlib compression/decompression

 http://www.zlib.net/

 From the page:
 Version 1.2.3 eliminates potential security vulnerabilities in zlib
 1.2.1 and 1.2.2, so all users of those versions should upgrade
 immediately. The following important fixes are provided in
 zlib 1.2.3 over 1.2.1 and 1.2.2:

 * Eliminate a potential security vulnerability when decoding
   invalid compressed data
 * Eliminate a potential security vulnerability when decoding
   specially crafted compressed data
 * Fix a bug when decompressing dynamic blocks with no distance codes
 * Fix crc check bug in gzread() after gzungetc()
 * Do not return an error when using gzread() on an empty file

I'd guess this belongs in 2.5, with a possible retrofit for 2.4.

--Scott David Daniels
[EMAIL PROTECTED]

___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] zlib 1.2.3 is just out

2005-07-23 Thread Raymond Hettinger
 Note zlib 1.2.3 is just out -- the zlib compression/decompression
 . . .

 I'd guess this belongs in 2.5, with a possible retrofit for 2.4.

+1 on backporting, but that is up to Anthony.


Raymond

___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com