- rel 3; revert, current hwclock versions are smart enough to know what to do based...

[packages/ntp.git] / ntp-openssl_check.patch

diff --git a/ntp-openssl_check.patch b/ntp-openssl_check.patch
index 255c60565bc52ce453455d926e111e8731a29f2a..98dccd16335d7759c2f9735940ef677b85df2b46 100644 (file)
--- a/ntp-openssl_check.patch
+++ b/ntp-openssl_check.patch
@@ -1,18 +1,20 @@
-diff -dur ntp-4.2.0.orig/configure.in ntp-4.2.0/configure.in
---- ntp-4.2.0.orig/configure.in        2004-11-19 21:00:04.000000000 +0100
-+++ ntp-4.2.0/configure.in     2004-11-19 21:53:20.876855603 +0100
-@@ -2576,44 +2576,19 @@
+diff -dur -x '*.orig' ntp-4.2.6p1.orig/configure.ac ntp-4.2.6p1/configure.ac
+--- ntp-4.2.6p1.orig/configure.ac      2010-05-24 20:26:21.000000000 +0200
++++ ntp-4.2.6p1/configure.ac   2010-05-24 20:32:57.000000000 +0200
+@@ -3247,7 +3247,6 @@
+ AC_SUBST(OPENSSL_INC)
+ AC_SUBST(OPENSSL_LIB)
  
- AC_SUBST(MAKE_NTP_KEYGEN)
- 
--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], [ans=yes])
+ [ans=$withval],
+@@ -3257,39 +3256,14 @@
+ esac])
  case "$ans" in
   no) ;;
 - yes) # Look in:
--    ans="/usr/lib /usr/lib/openssl /usr/local/lib /usr/local/ssl/lib"
+-    ans="/usr/lib /usr/lib/openssl /usr/sfw/lib /usr/local/lib /usr/local/ssl/lib /lib"
 -    ;;
 - *) # Look where they said
 -    ;;
@@ -27,6 +29,7 @@ diff -dur ntp-4.2.0.orig/configure.in ntp-4.2.0/configure.in
 -          test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
 -          ;;
 -       *)
+-          test -f $i/libcrypto.so -a -f $i/libssl.so && break
 -          test -f $i/libcrypto.a -a -f $i/libssl.a && break
 -          ;;
 -      esac
@@ -42,31 +45,51 @@ diff -dur ntp-4.2.0.orig/configure.in ntp-4.2.0/configure.in
 -    esac
 -    ;;
 + *)
-+   if test "$ans" != "yes" ; then
-+       LDFLAGS="$LDFLAGS -L$ans"
-+   fi
-+   AC_CHECK_LIB([crypto],[DES_crypt],[AC_SUBST(LCRYPTO,[-lcrypto])])
-+   AC_CHECK_LIB([ssl],[SSL_CTX_new],[AC_SUBST(LSSL,[-lssl])])
-+   ;;
++  if test "$ans" != "yes" ; then
++      LDFLAGS="$LDFLAGS -L$ans"
++  fi
++  AC_CHECK_LIB([crypto],[DES_crypt],[AC_SUBST(LCRYPTO,[-lcrypto])])
++  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,
-@@ -2653,15 +2628,13 @@
+@@ -3301,14 +3275,6 @@
+ esac])
  case "$ans" in
   no) ;;
+- yes) # look in:
+-    ans="/usr/include /usr/sfw/include /usr/local/include /usr/local/ssl/include"
+-    ;;
+- *) # Look where they said
+-    ;;
+-esac
+-case "$ans" in
+- no) ;;
+  *) # look for openssl/opensslconf.h:
+     for i in $ans no
+     do
+@@ -3335,7 +3301,7 @@
+  no)
+     ;;
   yes|openssl)
 -    if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INC"
 +    if test -z "$LCRYPTO" -o -z "$OPENSSL_INC"
      then
        ans=no
      else
-       # We have OpenSSL inc/lib - use them.
-       ans=openssl
-       CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
--      LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
--      AC_SUBST(LCRYPTO, [-lcrypto])
-       MAKE_NTP_KEYGEN=ntp-keygen
-       AC_DEFINE(OPENSSL, , [Use OpenSSL?])
-       AC_CHECK_FUNCS(EVP_md2 EVP_mdc2)
+@@ -3349,11 +3315,9 @@
+  yes)
+     # We have OpenSSL inc/lib - use them.
+     CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
+-    LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
+     case "$need_dash_r" in
+      1) LDFLAGS="$LDFLAGS -R$OPENSSL_LIB"
+     esac
+-    AC_SUBST(LCRYPTO, [-lcrypto])
+     AC_DEFINE(OPENSSL, , [Use OpenSSL?])
+ esac
+ 
+Only in ntp-4.2.6p1: configure.ac~