Look for "EVP_des_cbc" instead of "des_set_key" in libcrypto.so to

decide if it's actually libcrypto.so from the OpenSSL distribution.

Samba looks to see if libkrb5.so needs it to link when samba is
configured to build ADS support.  However, newer versions of heimdal
don't need the old DES API, and newer versions of OpenSSL don't even
provide the old des_* symbol names in the library, so "des_set_key"
is a poor choice to use to detect libcrypto.so.  The only place in
the samba sources where the old DES API is even used is in the AFS
fake kaserver support, which pkgsrc does not (ever) intend to support.

This fixes PR pkg/24456.

3 files changed, 77 insertions, 13 deletions

diff --git a/net/samba/distinfo b/net/samba/distinfo
index 5d972f94df3..51ebac8f642 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2005/06/05 14:17:53 taca Exp $
+$NetBSD: distinfo,v 1.45 2005/06/08 20:15:20 jlam Exp $
 
 SHA1 (samba-3.0.14a.tar.gz) = 978ff392d575c717069c66e918f6bbbf815b84b1
 RMD160 (samba-3.0.14a.tar.gz) = 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f
@@ -9,5 +9,5 @@ SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644
 SHA1 (patch-ad) = 8a99e5f898eb3c466b07b5bbb9f0c7e28e385ea0
 SHA1 (patch-af) = bc0cead8f8350001e5291443821e875bab540fc3
 SHA1 (patch-ag) = cce908577cf4007bb00b15f6dd7eee7d549ac5b0
-SHA1 (patch-at) = 13e27003bb00f9fc14494075970f52f1ca91e12b
-SHA1 (patch-au) = 001d33683c0d0e0122a864cc2b374d37eef7f2f6
+SHA1 (patch-at) = faeb2c7d26bb6d7b17b13253bb567e33df90a74b
+SHA1 (patch-au) = 1ed1be0ea34d28eb7387316ca4dd1eb7a18c7012
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index 51d121e5353..10f66df6c50 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.1 2005/06/05 14:17:53 taca Exp $
+$NetBSD: patch-at,v 1.2 2005/06/08 20:15:20 jlam Exp $
 
---- configure.orig	2005-06-02 23:09:21.000000000 +0200
+--- configure.orig	2005-04-14 02:23:50.000000000 -0400
 +++ configure
-@@ -3991,7 +3991,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -4794,7 +4794,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.1 2005/06/05 14:17:53 taca Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define FREEBSD 1
-@@ -21611,7 +21611,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -22517,7 +22517,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
  			;;
@@ -20,7 +20,62 @@ $NetBSD: patch-at,v 1.1 2005/06/05 14:17:53 taca Exp $
  			BLDSHARED="true"
  			LDSHFLAGS="-shared"
  			DYNEXP="-Wl,--export-dynamic"
-@@ -37195,7 +37195,7 @@ echo "${ECHO_T}no" >&6;
+@@ -29701,9 +29701,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+ 
+ 
+ 
+-        echo "$as_me:$LINENO: checking for des_set_key in -lcrypto" >&5
+-echo $ECHO_N "checking for des_set_key in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then
++        echo "$as_me:$LINENO: checking for EVP_des_cbc in -lcrypto" >&5
++echo $ECHO_N "checking for EVP_des_cbc in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_ext_crypto_EVP_des_cbc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -29719,11 +29719,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char des_set_key ();
++char EVP_des_cbc ();
+ int
+ main ()
+ {
+-des_set_key ();
++EVP_des_cbc ();
+   ;
+   return 0;
+ }
+@@ -29750,22 +29750,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_ext_crypto_des_set_key=yes;
++  ac_cv_lib_ext_crypto_EVP_des_cbc=yes;
+ 		  ac_cv_lib_ext_crypto=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ext_crypto_des_set_key=no;
++ac_cv_lib_ext_crypto_EVP_des_cbc=no;
+ 		  ac_cv_lib_ext_crypto=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_des_set_key" >&5
+-echo "${ECHO_T}$ac_cv_lib_ext_crypto_des_set_key" >&6
+-    if test $ac_cv_lib_ext_crypto_des_set_key = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_ext_crypto_EVP_des_cbc" >&5
++echo "${ECHO_T}$ac_cv_lib_ext_crypto_EVP_des_cbc" >&6
++    if test $ac_cv_lib_ext_crypto_EVP_des_cbc = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DES_SET_KEY 1
+ _ACEOF
+@@ -38099,7 +38099,7 @@ echo "${ECHO_T}no" >&6;
  	fi
  
  	;;
diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au
index c9b7b1c005b..5a1ec470288 100644
--- a/net/samba/patches/patch-au
+++ b/net/samba/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.1 2005/06/05 14:17:53 taca Exp $
+$NetBSD: patch-au,v 1.2 2005/06/08 20:15:20 jlam Exp $
 
---- configure.in.orig	2005-06-02 23:10:03.000000000 +0200
+--- configure.in.orig	2005-04-14 02:14:26.000000000 -0400
 +++ configure.in
-@@ -514,7 +514,7 @@ case "$host_os" in
+@@ -533,7 +533,7 @@ case "$host_os" in
  	*irix*)
  		AC_DEFINE(SYSV, 1, [Whether to enable System V compatibility])
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-au,v 1.1 2005/06/05 14:17:53 taca Exp $
  		AC_DEFINE(FREEBSD, 1, [Whether the host os is FreeBSD])
  		;;
  #
-@@ -1203,7 +1203,7 @@ if test "$enable_shared" = "yes"; then
+@@ -1223,7 +1223,7 @@ if test "$enable_shared" = "yes"; then
  			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
  			AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
  			;;
@@ -20,7 +20,16 @@ $NetBSD: patch-au,v 1.1 2005/06/05 14:17:53 taca Exp $
  			BLDSHARED="true"
  			LDSHFLAGS="-shared"
  			DYNEXP="-Wl,--export-dynamic"
-@@ -4090,7 +4090,7 @@ samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes,
+@@ -2788,7 +2788,7 @@ if test x"$with_ads_support" != x"no"; t
+   AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
+ 
+   # Heimdal checks.
+-  AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key)
++  AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, EVP_des_cbc)
+   AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
+   AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
+ 
+@@ -4108,7 +4108,7 @@ samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes,
  	fi
  
  	;;