summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 98788e90d..78a67e6b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120050726
2 - (dtucker) [configure.ac] Update zlib warning message too, pointed out by
3 tim@.
4
120050725 520050725
2 - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. 6 - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
3 7
@@ -2861,4 +2865,4 @@
2861 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2865 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2862 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2866 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2863 2867
2864$Id: ChangeLog,v 1.3854 2005/07/25 05:24:21 dtucker Exp $ 2868$Id: ChangeLog,v 1.3855 2005/07/26 02:00:42 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 2041bf298..df3712dcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.279 2005/07/25 05:24:21 dtucker Exp $ 1# $Id: configure.ac,v 1.280 2005/07/26 02:00:42 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -811,7 +811,7 @@ Your reported zlib version has known security problems. It's possible your
811vendor has fixed these problems without changing the version number. If you 811vendor has fixed these problems without changing the version number. If you
812are sure this is the case, you can disable the check by running 812are sure this is the case, you can disable the check by running
813"./configure --without-zlib-version-check". 813"./configure --without-zlib-version-check".
814If you are in doubt, upgrade zlib to version 1.2.1.2 or greater. 814If you are in doubt, upgrade zlib to version 1.2.3 or greater.
815See http://www.gzip.org/zlib/ for details.]) 815See http://www.gzip.org/zlib/ for details.])
816 else 816 else
817 AC_MSG_WARN([zlib version may have security problems]) 817 AC_MSG_WARN([zlib version may have security problems])