|
 |
d2f56c3 |
diff -Nur Mail-SpamAssassin-3.4.1.orig/spamc/configure Mail-SpamAssassin-3.4.1/spamc/configure
|
|
|
d2f56c3 |
--- Mail-SpamAssassin-3.4.1.orig/spamc/configure 2015-04-28 13:56:59.000000000 -0600
|
|
|
d2f56c3 |
+++ Mail-SpamAssassin-3.4.1/spamc/configure 2016-11-06 14:36:54.722342568 -0700
|
|
|
d2f56c3 |
@@ -3666,9 +3666,9 @@
|
|
|
d2f56c3 |
SSLLIBS=""
|
|
|
d2f56c3 |
SSLCFLAGS=""
|
|
|
d2f56c3 |
if test yes = "$sa_ssl_enabled"; then
|
|
|
d2f56c3 |
- echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
|
|
|
d2f56c3 |
-echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
|
|
|
d2f56c3 |
-if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
|
|
|
d2f56c3 |
+ echo "$as_me:$LINENO: checking for CRYPTO_malloc in -lcrypto" >&5
|
|
|
d2f56c3 |
+echo $ECHO_N "checking for CRYPTO_malloc in -lcrypto... $ECHO_C" >&6
|
|
|
d2f56c3 |
+if test "${ac_cv_lib_crypto_CRYPTO_malloc+set}" = set; then
|
|
|
d2f56c3 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
d2f56c3 |
else
|
|
|
d2f56c3 |
ac_check_lib_save_LIBS=$LIBS
|
|
|
d2f56c3 |
@@ -3686,11 +3686,11 @@
|
|
|
d2f56c3 |
#endif
|
|
|
d2f56c3 |
/* We use char because int might match the return type of a gcc2
|
|
|
d2f56c3 |
builtin and then its argument prototype would still apply. */
|
|
|
d2f56c3 |
-char CRYPTO_lock ();
|
|
|
d2f56c3 |
+char CRYPTO_malloc ();
|
|
|
d2f56c3 |
int
|
|
|
d2f56c3 |
main ()
|
|
|
d2f56c3 |
{
|
|
|
d2f56c3 |
-CRYPTO_lock ();
|
|
|
d2f56c3 |
+CRYPTO_malloc ();
|
|
|
d2f56c3 |
;
|
|
|
d2f56c3 |
return 0;
|
|
|
d2f56c3 |
}
|
|
|
d2f56c3 |
@@ -3716,20 +3716,20 @@
|
|
|
d2f56c3 |
ac_status=$?
|
|
|
d2f56c3 |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
d2f56c3 |
(exit $ac_status); }; }; then
|
|
|
d2f56c3 |
- ac_cv_lib_crypto_CRYPTO_lock=yes
|
|
|
d2f56c3 |
+ ac_cv_lib_crypto_CRYPTO_malloc=yes
|
|
|
d2f56c3 |
else
|
|
|
d2f56c3 |
echo "$as_me: failed program was:" >&5
|
|
|
d2f56c3 |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
d2f56c3 |
|
|
|
d2f56c3 |
-ac_cv_lib_crypto_CRYPTO_lock=no
|
|
|
d2f56c3 |
+ac_cv_lib_crypto_CRYPTO_malloc=no
|
|
|
d2f56c3 |
fi
|
|
|
d2f56c3 |
rm -f conftest.err conftest.$ac_objext \
|
|
|
d2f56c3 |
conftest$ac_exeext conftest.$ac_ext
|
|
|
d2f56c3 |
LIBS=$ac_check_lib_save_LIBS
|
|
|
d2f56c3 |
fi
|
|
|
d2f56c3 |
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
|
|
|
d2f56c3 |
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
|
|
|
d2f56c3 |
-if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
|
|
|
d2f56c3 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_malloc" >&5
|
|
|
d2f56c3 |
+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_malloc" >&6
|
|
|
d2f56c3 |
+if test $ac_cv_lib_crypto_CRYPTO_malloc = yes; then
|
|
|
d2f56c3 |
SSLLIBS="-lcrypto $SSLLIBS"
|
|
|
d2f56c3 |
fi
|
|
|
d2f56c3 |
|
|
|
d2f56c3 |
@@ -3804,7 +3804,7 @@
|
|
|
d2f56c3 |
# before defining SPAMC_SSL check that all its requirements are
|
|
|
d2f56c3 |
# actually available
|
|
|
d2f56c3 |
if test yes = "$ac_cv_header_openssl_crypto_h" && \
|
|
|
d2f56c3 |
- test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
|
|
|
d2f56c3 |
+ test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
|
|
|
d2f56c3 |
test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
|
|
|
d2f56c3 |
SSLCFLAGS="-DSPAMC_SSL"
|
|
|
d2f56c3 |
else
|
|
|
d2f56c3 |
diff -Nur Mail-SpamAssassin-3.4.1.orig/spamc/configure.in Mail-SpamAssassin-3.4.1/spamc/configure.in
|
|
|
d2f56c3 |
--- Mail-SpamAssassin-3.4.1.orig/spamc/configure.in 2015-04-28 13:56:59.000000000 -0600
|
|
|
d2f56c3 |
+++ Mail-SpamAssassin-3.4.1/spamc/configure.in 2016-11-06 14:36:54.724342587 -0700
|
|
|
d2f56c3 |
@@ -64,13 +64,13 @@
|
|
|
d2f56c3 |
SSLLIBS=""
|
|
|
d2f56c3 |
SSLCFLAGS=""
|
|
|
d2f56c3 |
if test yes = "$sa_ssl_enabled"; then
|
|
|
d2f56c3 |
- AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"])
|
|
|
d2f56c3 |
+ AC_CHECK_LIB(crypto, CRYPTO_malloc,[SSLLIBS="-lcrypto $SSLLIBS"])
|
|
|
d2f56c3 |
AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
|
|
|
d2f56c3 |
|
|
|
d2f56c3 |
# before defining SPAMC_SSL check that all its requirements are
|
|
|
d2f56c3 |
# actually available
|
|
|
d2f56c3 |
if test yes = "$ac_cv_header_openssl_crypto_h" && \
|
|
|
d2f56c3 |
- test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
|
|
|
d2f56c3 |
+ test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
|
|
|
d2f56c3 |
test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
|
|
|
d2f56c3 |
SSLCFLAGS="-DSPAMC_SSL"
|
|
|
d2f56c3 |
else
|