summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-07-25 15:23:33 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-07-25 15:23:33 +1000
commit73df4f723b20643efcfdfa25d6fe235b08f7d095 (patch)
tree45d27295bffafb5f515ffbb382e78e32b348668e
parentea559c8d4c209aa84123b8885e515cba9c3c529f (diff)
downloadopenssh-git-73df4f723b20643efcfdfa25d6fe235b08f7d095.tar.gz
- (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d8b33c3..60c74c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20050725
+ - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096.
+
20050530
- (dtucker) [README] Link to new release notes. Beter late than never...
@@ -2505,4 +2508,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3758.2.4 2005/05/30 00:00:22 dtucker Exp $
+$Id: ChangeLog,v 1.3758.2.5 2005/07/25 05:23:33 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 20c8f158..4cfc911c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.260 2005/04/24 07:52:23 dtucker Exp $
+# $Id: configure.ac,v 1.260.2.1 2005/07/25 05:23:34 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -660,8 +660,8 @@ int main()
if (a == 1 && b == 1 && c >= 4)
exit(0);
- /* 1.2.1.2 and up are OK */
- if (v >= 1020102)
+ /* 1.2.3 and up are OK */
+ if (v >= 1020300)
exit(0);
exit(2);