control: tags -1 patch
On 2016-06-26 12:24:10 [+0200], Kurt Roeckx wrote:
> There is a libssl-dev package available in experimental that contains a recent
> snapshot, I suggest you try building against that to see if everything works.
builds.
> If you have problems making things work, feel free to contact us.
>
>
> Kurt
Sebastian
From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
Date: Thu, 22 Sep 2016 11:19:42 +0000
Subject: [PATCH] spamassassin: get it compiled against openssl 1.1.0
CRYPTO_lock was part of the old locking API which got removed. I picked
a different symbol.
Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
---
spamc/configure | 22 +++++++++++-----------
spamc/configure.in | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/spamc/configure b/spamc/configure
index 48d29fa..0685c91 100755
--- a/spamc/configure
+++ b/spamc/configure
@@ -3666,9 +3666,9 @@ fi
SSLLIBS=""
SSLCFLAGS=""
if test yes = "$sa_ssl_enabled"; then
- echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
+ echo "$as_me:$LINENO: checking for CRYPTO_zalloc in -lcrypto" >&5
+echo $ECHO_N "checking for CRYPTO_zalloc in -lcrypto... $ECHO_C" >&6
+if test "${ac_cv_lib_crypto_CRYPTO_zalloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -3686,11 +3686,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 CRYPTO_lock ();
+char CRYPTO_zalloc ();
int
main ()
{
-CRYPTO_lock ();
+CRYPTO_zalloc ();
;
return 0;
}
@@ -3716,20 +3716,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_crypto_CRYPTO_lock=yes
+ ac_cv_lib_crypto_CRYPTO_zalloc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_crypto_CRYPTO_lock=no
+ac_cv_lib_crypto_CRYPTO_zalloc=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
-if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_zalloc" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_zalloc" >&6
+if test $ac_cv_lib_crypto_CRYPTO_zalloc = yes; then
SSLLIBS="-lcrypto $SSLLIBS"
fi
@@ -3804,7 +3804,7 @@ fi
# before defining SPAMC_SSL check that all its requirements are
# actually available
if test yes = "$ac_cv_header_openssl_crypto_h" && \
- test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
+ test yes = "$ac_cv_lib_crypto_CRYPTO_zalloc" && \
test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
SSLCFLAGS="-DSPAMC_SSL"
else
diff --git a/spamc/configure.in b/spamc/configure.in
index 246c4fa..c8710ae 100644
--- a/spamc/configure.in
+++ b/spamc/configure.in
@@ -64,7 +64,7 @@ AC_CHECK_LIB(socket, socket)
SSLLIBS=""
SSLCFLAGS=""
if test yes = "$sa_ssl_enabled"; then
- AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"])
+ AC_CHECK_LIB(crypto, CRYPTO_zalloc,[SSLLIBS="-lcrypto $SSLLIBS"])
AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
# before defining SPAMC_SSL check that all its requirements are
--
2.9.3
