Ready to ship.

svn path=/trunk/; revision=3491

diff --git a/Makefile.in b/Makefile.in
index fe3e14c2c65933969b94ff7f7279bc714ceb11e2..5226e45b2d67b94efd0b37565ab6f41ce3042c6d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # So just uncomment all the lines marked QNX.
 
 PACKAGE = fetchmail
-VERSION = 5.9.1
+VERSION = 5.9.2
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@

diff --git a/NEWS b/NEWS
index 287398590fac453031b6b62412d5451c80cc9645..3cbb5e97bd805789a43efa8057d6c98caec2798c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* Enable code to build on Solaris again (long options won't work).
+* Move Hesiod lookups to just before DNS lookups.
+* Make sure the SICHLD handler is called when we run detached.
+* Make kerberos5 in OpenBSD (Federico Schwindt <fgsch@olimpo.com.br>).
+* Added FAQ item X8 on why mail sometimes gets an extra ) appended.
+
 fetchmail-5.9.1 (Mon Sep 24 19:01:57 EDT 2001), 21120 lines:
 
 * Make -D short option for --smtpaddress active again.

diff --git a/configure.in b/configure.in
index e893585bc0c9604971ba0d514908fc8d9bc70168..710a93fc8efb4e14fdc4fe04d1d2eb8c96853882 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -389,6 +389,15 @@ directory],
 [
 if test "$with_kerberos5" != "no"
 then
+# Check for a OpenBSD special case
+if test "$with_kerberos5" = "yes" && ( test `uname` = "OpenBSD" )
+then
+  AC_CHECKING([kerberosV for OpenBSD])
+  AC_DEFINE(HEIMDAL)
+  AC_DEFINE(KERBEROS_V5)
+  CEFLAGS="$CEFLAGS -I/usr/include/kerberosV"
+  LIBS="$LIBS -lasn1 -lkrb5 -lcom_err"
+else
   if test "$with_kerberos5" != "yes" 
   then
       LDEFLAGS="$LDEFLAGS -L${with_kerberos5}/lib"
@@ -446,6 +455,7 @@ then
      AC_ERROR([Kerberos 5 libraries not found])
   fi
 fi
+fi
 ]) dnl --with-kerberos5=DIR
 
 ###    use option --with-kerberos=DIR to point at a Kerberos 4 directory

diff --git a/fetchmail.c b/fetchmail.c
index 2e8cd94f4a25a50f0111e96a09035349b242633a..89984e25b911b48382c6b65e20165870014955a5 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1035,11 +1035,13 @@ static int load_params(int argc, char **argv, int optind)
            DEFAULT(ctl->sslcertck, FALSE);
 #endif
            DEFAULT(ctl->server.checkalias, FALSE);
+#ifndef SSL_ENABLE
            if (ctl->use_ssl) 
            {
                report(stderr, GT_("SSL support is not compiled in.\n"));
                exit(PS_SYNTAX);
            }
+#endif /* SSL_ENABLE */
 #undef DEFAULT
 
            /*

diff --git a/options.c b/options.c
index cfe74bbd4fd4bfa54c8bfe1e37e57c3fc5f1fa82..c51e9d7257a45dab86901cb7e186a29d5d74e8b4 100644 (file)
--- a/options.c
+++ b/options.c
@@ -276,9 +276,13 @@ struct query *ctl; /* option record to be initialized */
     ctl->smtp_socket = -1;
 
     while (!errflag && 
+#ifdef HAVE_GETOPTLONG
           (c = getopt_long(argc,argv,shortoptions,
-                           longoptions,&option_index)) != -1) {
-
+                           longoptions, &option_index)) != -1)
+#else
+          (c = getopt(argc, argv, shortoptions)) != -1)
+#endif
+    {
        switch (c) {
        case 'V':
        case LA_VERSION: