bk commit into 4.1 tree (joerg:1.2353)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2353 05/07/28 18:25:58 joerg@stripped +3 -0
  Combining zlib security fixes for version 4.1.13a:
  
  Fix for CAN-2005-1849 from zlib-1.2.3
     (originally:  2005/07/27 14:55:08+02:00 lenz@stripped )
  Ensure static linking takes the bundled libraries
     (originally:  2005/07/27 16:42:13+02:00 lenz@stripped )
  Version number change.

  zlib/inftrees.h
    1.3 05/07/28 18:25:55 joerg@stripped +5 -5
    - applied another security fix to resolve CAN-2005-1849, taken from the 1.2.3 zlib sources
    (CAN-2005-1849)
    (originally:  2005/07/27 14:54:58+02:00 lenz@stripped +5 -5 )

  support-files/mysql.spec.sh
    1.99 05/07/28 18:25:55 joerg@stripped +1 -0
    - build against the bundled zlib, when linking statically
    (originally:  2005/07/27 16:42:08+02:00 lenz@stripped +1 -0 )

  configure.in
    1.383 05/07/28 18:25:55 joerg@stripped +1 -1
    Update the version number.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M41/clone-4.1.13

--- 1.382/configure.in	2005-07-04 16:05:15 +02:00
+++ 1.383/configure.in	2005-07-28 18:25:55 +02:00
@@ -5,7 +5,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 4.1.13)
+AM_INIT_AUTOMAKE(mysql, 4.1.13a)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

--- 1.98/support-files/mysql.spec.sh	2005-07-15 09:07:27 +02:00
+++ 1.99/support-files/mysql.spec.sh	2005-07-28 18:25:55 +02:00
@@ -348,6 +348,7 @@
 %if %{STATIC_BUILD}
 		--with-mysqld-ldflags='-all-static' \
 		--with-client-ldflags='-all-static' \
+		--with-zlib-dir=bundled \
 		$USE_OTHER_LIBC_DIR \
 %endif
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \

--- 1.2/zlib/inftrees.h	2004-07-22 02:36:06 +02:00
+++ 1.3/zlib/inftrees.h	2005-07-28 18:25:55 +02:00
@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -36,12 +36,12 @@
  */
 
 /* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 code structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
+   exhaustive search was 1444 code structures (852 for length/literals
+   and 592 for distances, the latter actually the result of an
    exhaustive search).  The true maximum is not known, but the value
    below is more than safe. */
-#define ENOUGH 1440
-#define MAXD 154
+#define ENOUGH 2048
+#define MAXD 592
 
 /* Type of code to build for inftable() */
 typedef enum {