- (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or

   1.2.1.2 or higher.  With tim@, ok djm@

diff --git a/ChangeLog b/ChangeLog
index d5606f2821393e2c495ea280b009b90bb65336ee..4cee87a4f14ea80506f338472c57131af792a95a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050424
+ - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or
+   1.2.1.2 or higher.  With tim@, ok djm@
+
 20050423
  - (tim) [config.guess] Add support for OpenServer 6.
 
@@ -5,6 +9,10 @@
  - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if
    UseLogin is set as PAM is not used to establish credentials in that
    case.  Found by Michael Selvesteen, ok djm@
+ - (dtucker) [auth-pam.c] Since people don't seem to be getting the message,
+   USE_POSIX_THREADS is now known as UNSUPPORTED_POSIX_THREADS_HACK.
+   USE_POSIX_THREADS will now generate an error so we don't silently change
+   behaviour.  ok djm@
 
 20050419
  - (dtucker) [INSTALL] Reference README.privsep for the privilege separation

diff --git a/INSTALL b/INSTALL
index 7661b3d157d0e176207fb323ad3422ddbbf19c7e..9def158d2ca4f224f5f07a642b6f501179276e8c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -3,7 +3,7 @@
 
 You will need working installations of Zlib and OpenSSL.
 
-Zlib 1.1.4 or greater:
+Zlib 1.1.4 or 1.2.1.2 or greater (ealier 1.2.x versions have problems):
 http://www.gzip.org/zlib/
 
 OpenSSL 0.9.6 or greater:

diff --git a/configure.ac b/configure.ac
index 3edf75a22ca4ceb1d465b51092218327673120c7..3a96fd3f9f91a9585e51e8fa73df3af40bb35977 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -643,29 +643,40 @@ AC_ARG_WITH(zlib-version-check,
        ]
 )
 
-AC_MSG_CHECKING(for zlib 1.1.4 or greater)
+AC_MSG_CHECKING(for possibly buggy zlib)
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include <zlib.h>
 int main()
 {
-       int a, b, c, v;
-       if (sscanf(ZLIB_VERSION, "%d.%d.%d", &a, &b, &c) != 3)
+       int a=0, b=0, c=0, d=0, n, v;
+       n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
+       if (n != 3 && n != 4)
                exit(1);
-       v = a*1000000 + b*1000 + c;
-       if (v >= 1001004)
+       v = a*1000000 + b*10000 + c*100 + d;
+       fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
+
+       /* 1.1.4 is OK */
+       if (a == 1 && b == 1 && c >= 4)
+               exit(0);
+
+       /* 1.2.1.2 and up are OK */
+       if (v >= 1020102)
                exit(0);
+
        exit(2);
 }
        ]])],
-       AC_MSG_RESULT(yes),
-       [ AC_MSG_RESULT(no)
+       AC_MSG_RESULT(no),
+       [ AC_MSG_RESULT(yes)
          if test -z "$zlib_check_nonfatal" ; then
                AC_MSG_ERROR([*** zlib too old - check config.log ***
 Your reported zlib version has known security problems.  It's possible your
 vendor has fixed these problems without changing the version number.  If you
 are sure this is the case, you can disable the check by running
 "./configure --without-zlib-version-check".
-If you are in doubt, upgrade zlib to version 1.1.4 or greater.])
+If you are in doubt, upgrade zlib to version 1.2.1.2 or greater.
+See http://www.gzip.org/zlib/ for details.])
          else
                AC_MSG_WARN([zlib version may have security problems])
          fi