- updated for 4.2.4p7

Changed files:
    ntp-md5.patch -> 1.5
    ntp-openssl_check.patch -> 1.3

diff --git a/ntp-md5.patch b/ntp-md5.patch
index d3b1ae341802c96dd91bc4f679f9f016265085db..3628b75285f9572e5a90e547d48910b571f1ba6f 100644 (file)
--- a/ntp-md5.patch
+++ b/ntp-md5.patch
@@ -1,16 +1,13 @@
---- ntp-4.2.0/configure.ac     2006-09-13 10:51:32.253439861 +0300
-+++ ntp-4.2.0.ssl/configure.ac 2006-10-02 23:07:07.809947790 +0300
-@@ -330,8 +330,10 @@
- AC_CHECK_FUNC(openlog, , 
-   AC_CHECK_LIB(gen, openlog, , 
-   AC_CHECK_LIB(syslog, openlog, , , $libxnet -lsocket)))
-+AC_CHECK_LIB(crypto, MD5_Init, ,
- AC_CHECK_LIB(md5, MD5Init, , 
-   AC_CHECK_LIB(md, MD5Init))
-+)
+--- ntp-4.2.4p7/configure.ac.orig      2009-05-19 10:44:23.000000000 +0200
++++ ntp-4.2.4p7/configure.ac   2009-05-19 10:46:03.000000000 +0200
+@@ -366,6 +366,7 @@
+ AC_CHECK_FUNC([openlog], , 
+   AC_SEARCH_LIBS([openlog], [gen], , 
+   AC_SEARCH_LIBS([openlog], [syslog], , , [$libxnet -lsocket])))
++AC_SEARCH_LIBS([MD5_Init], [crypto])
+ AC_SEARCH_LIBS([MD5Init], [md5 md])
  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 @@

diff --git a/ntp-openssl_check.patch b/ntp-openssl_check.patch
index ee96ed4a468115989875f53d84558d3b11fa25c2..d9c404aa9cd2cfd5d967757e2802d820980d32f8 100644 (file)
--- a/ntp-openssl_check.patch
+++ b/ntp-openssl_check.patch
@@ -1,15 +1,14 @@
-diff -dur ntp-4.2.0.orig/configure.ac ntp-4.2.0/configure.ac
---- ntp-4.2.0.orig/configure.ac        2004-11-19 21:00:04.000000000 +0100
-+++ ntp-4.2.0/configure.ac     2004-11-19 21:53:20.876855603 +0100
-@@ -3012,7 +3012,6 @@
+--- ntp-4.2.4p7/configure.ac.orig      2009-05-19 10:22:32.000000000 +0200
++++ ntp-4.2.4p7/configure.ac   2009-05-19 10:29:41.000000000 +0200
+@@ -3126,7 +3126,6 @@
  AC_SUBST(OPENSSL_INC)
  AC_SUBST(OPENSSL_LIB)
  
--AC_MSG_CHECKING(for openssl library directory)
+-AC_MSG_CHECKING([for openssl library directory])
  AC_ARG_WITH(openssl-libdir,
        AC_HELP_STRING([--with-openssl-libdir], [+ =/something/reasonable]),
  [ans=$withval],
-@@ -3022,39 +3021,14 @@
+@@ -3136,39 +3135,14 @@
  esac])
  case "$ans" in
   no) ;;
@@ -51,11 +50,11 @@ diff -dur ntp-4.2.0.orig/configure.ac ntp-4.2.0/configure.ac
 +   AC_CHECK_LIB([ssl],[SSL_CTX_new],[AC_SUBST(LSSL,[-lssl])])
      ;;
  esac
--AC_MSG_RESULT($ans)
+-AC_MSG_RESULT([$ans])
  
- AC_MSG_CHECKING(for openssl include directory)
+ AC_MSG_CHECKING([for openssl include directory])
  AC_ARG_WITH(openssl-incdir,
-@@ -3098,19 +3072,17 @@
+@@ -3212,19 +3186,17 @@
  case "$ans" in
   no) ;;
   yes|openssl)
@@ -76,4 +75,3 @@ diff -dur ntp-4.2.0.orig/configure.ac ntp-4.2.0/configure.ac
        AC_DEFINE(OPENSSL, , [Use OpenSSL?])
        AC_CHECK_FUNCS(EVP_md2 EVP_mdc2)
      fi
-