Merge branch 'integration-libpwmd' into next

diff --git a/Makefile.am b/Makefile.am
index 6fbc36b21b1e23614daf9fee230c84c6ae5f9b9a..7213254de50c6acee0f70520c21d452e7faef77a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ libfm_a_SOURCES=      xmalloc.c base64.c rfc822.c report.c rfc2047e.c \
                        libesmtp/gethostbyname.h libesmtp/gethostbyname.c \
                        smbtypes.h fm_getaddrinfo.c tls.c rfc822valid.c \
                        xmalloc.h sdump.h sdump.c x509_name_match.c \
-                       fm_strl.h
+                       fm_strl.h md5c.c
 if NTLM_ENABLE
 libfm_a_SOURCES += ntlmsubr.c
 endif

diff --git a/NEWS b/NEWS
index 28464e47e879ff26d37f771f0e7e93275ccbc484..26010cf8e158b485a4b7fa9ce66c832c4233aea0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -65,7 +65,12 @@ NOTE THIS IS AN ALPHA RELEASE THAT HAS NOT BEEN THOROUGHLY TESTED!
 
 --------------------------------------------------------------------------------
 
-not yet released:
+fetchmail-6.3.20 (not yet released):
+
+# CHANGES
+* fetchmail now always uses its own MD5 implementation.  The library and header
+  variants are too diverse, and we've been bitten before -- and configure
+  complains noisily on Cyrus-SASL's RFC1321 md5.h.
 
 # TRANSLATION UPDATES
   [ja]    Japanese (Takeshi Hamasaki)

diff --git a/configure.ac b/configure.ac
index 0b0121c31fb4a912f36ed40477d1bd2d14d24e3f..64277f165237b6e430a098d7e1b4d23dc3cefb81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,8 +58,7 @@ if test "x$SHELL" = "x" ; then
     AC_MSG_ERROR(no SUS compliant shell found - on Solaris, install SUNWxcu4)
 fi
 
-
-AC_CHECK_HEADERS([arpa/nameser.h md5.h])
+AC_CHECK_HEADERS([arpa/nameser.h])
 
 AC_CHECK_HEADERS([resolv.h],,,[
 #include <sys/types.h>
@@ -110,16 +109,6 @@ AC_CHECK_FUNC(inet_addr,
 
 AC_REPLACE_FUNCS([stpcpy strlcpy strlcat])
 
-have_md5=no
-if test "$ac_cv_header_md5_h" != no ; then
-    AC_SEARCH_LIBS(MD5Init, [md], [have_md5=yes])
-fi
-
-if test "$have_md5" != yes ; then
-    AC_LIBSOURCE(md5c.c)
-    EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"
-fi
-
 AC_CHECK_FUNC(getopt_long, [],
               [AC_LIBSOURCES([getopt.c, getopt1.c])
               EXTRAOBJ="$EXTRAOBJ getopt.\$(OBJEXT) getopt1.\$(OBJEXT)"])

diff --git a/fm_md5.h b/fm_md5.h
index a92a3988260097e58e9aec2695c2d91ea541c7c8..cc1a96878e86b2a67d54df6f92a75d44e0c6805c 100644 (file)
--- a/fm_md5.h
+++ b/fm_md5.h
@@ -23,7 +23,7 @@ struct MD5Context {
 void MD5Init(struct MD5Context *context);
 void MD5Update(struct MD5Context *context, const void *buf, unsigned len);
 void MD5Final(void *digest, struct MD5Context *context);
-void MD5Transform(uint32_t buf[], uint32_t const in[]);
+void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
 
 /*
  * This is needed to make RSAREF happy on some MS-DOS compilers.