diff options
| author | unknown <joerg@mysql.com> | 2005-07-28 18:25:58 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-07-28 18:25:58 +0200 |
| commit | 5cbfa1586edce87e1840f7a640605cf895986cda (patch) | |
| tree | febd495472cf300e0a89db7ce88ed9310680ccac | |
| parent | 701d93a420cb9289e4c2a3b1f5715c1fa64d07ae (diff) | |
| download | mariadb-git-mysql-4.1.13a.tar.gz | |
Combining zlib security fixes for version 4.1.13a:mysql-4.1.13a
Fix for CAN-2005-1849 from zlib-1.2.3
(originally: 2005/07/27 14:55:08+02:00 lenz@mysql.com )
Ensure static linking takes the bundled libraries
(originally: 2005/07/27 16:42:13+02:00 lenz@mysql.com )
Version number change.
configure.in:
Update the version number.
support-files/mysql.spec.sh:
- build against the bundled zlib, when linking statically
(originally: 2005/07/27 16:42:08+02:00 lenz@mysql.com +1 -0 )
zlib/inftrees.h:
- 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@mysql.com +5 -5 )
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 1 | ||||
| -rw-r--r-- | zlib/inftrees.h | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 0889e9a3257..e86baf9d0df 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 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 diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 7dc04c39225..e4cd3027b8a 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -348,6 +348,7 @@ BuildMySQL "--disable-shared \ %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)\" \ diff --git a/zlib/inftrees.h b/zlib/inftrees.h index 82d365a7e90..b1104c87e76 100644 --- a/zlib/inftrees.h +++ b/zlib/inftrees.h @@ -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 @@ typedef struct { */ /* 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 { |