- more hacks to get linked with openssl MD5 rather md5.so from w3c-libwww-devel,...

Changed files:
    ntp-md5.patch -> 1.2

diff --git a/ntp-md5.patch b/ntp-md5.patch
index a129dc965ba0173da2caa05318d234cdc86c5f2d..dc1a8095ef57765011b534f5c092dee26ab17d13 100644 (file)
--- a/ntp-md5.patch
+++ b/ntp-md5.patch
@@ -1,15 +1,31 @@
-prefer MD5Init() from openssl libs (-lcrypto)
-
---- ntp-4.2.0/configure.in~    2006-09-01 01:34:38.431438260 +0300
-+++ ntp-4.2.0/configure.in     2006-09-13 10:51:32.253439861 +0300
+--- ntp-4.2.0/configure.in     2006-09-13 10:51:32.253439861 +0300
++++ ntp-4.2.0.ssl/configure.in 2006-10-02 23:07:07.809947790 +0300
 @@ -205,8 +205,10 @@
  AC_CHECK_FUNC(openlog, , 
    AC_CHECK_LIB(gen, openlog, , 
    AC_CHECK_LIB(syslog, openlog, , , -lsocket)))
-+AC_CHECK_LIB(crypto, MD5Init, , 
++AC_CHECK_LIB(crypto, MD5_Init, , 
  AC_CHECK_LIB(md5, MD5Init, , 
    AC_CHECK_LIB(md, MD5Init))
 +)
  AC_CHECK_FUNCS(MD5Init)
  dnl HMS: What a hack...
  AC_CHECK_HEADERS(readline/history.h readline/readline.h)
+--- ntp-4.2.0/include/ntp_md5.h        2003-07-17 13:27:16.000000000 +0300
++++ ntp-4.2.0.ssl/include/ntp_md5.h    2006-10-02 23:15:24.871129536 +0300
+@@ -2,8 +2,15 @@
+  * ntp_md5.h: deal with md5.h headers
+  */
+ 
++#ifdef HAVE_LIBCRYPTO
++# include <openssl/md5.h>
++#define       MD5Update MD5_Update
++#define       MD5Final MD5_Final
++#define       MD5Init MD5_Init
++#else
+ #ifdef HAVE_MD5_H
+ # include <md5.h>
+ #else
+ # include "rsa_md5.h"
+ #endif
++#endif