You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
171 lines
5.8 KiB
171 lines
5.8 KiB
From FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223568
|
|
--- a/configure.ac 2015-05-12 18:43:09 UTC
|
|
+++ b/configure.ac
|
|
@@ -860,26 +860,28 @@ then
|
|
AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
|
|
AC_MSG_ERROR([libcrypto not found]))
|
|
|
|
- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
|
|
- [
|
|
- if test x"$enable_shared" = x"yes"
|
|
- then
|
|
- AC_MSG_ERROR([Cannot build shared opendkim
|
|
- against static openssl libraries.
|
|
- Configure with --disable-shared
|
|
- to get this working or obtain a
|
|
- shared libssl library for
|
|
- opendkim to use.])
|
|
- fi
|
|
|
|
- # avoid caching issue - last result of SSL_library_init
|
|
- # shouldn't be cached for this next check
|
|
- unset ac_cv_search_SSL_library_init
|
|
- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
|
|
- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
|
|
- AC_MSG_ERROR([libssl not found]), [-ldl])
|
|
- ]
|
|
- )
|
|
+ AC_LINK_IFELSE(
|
|
+ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
|
|
+ [[SSL_library_init();]])],
|
|
+ [od_have_ossl="yes";],
|
|
+ [od_have_ossl="no";])
|
|
+ if test x"$od_have_ossl" = x"no"
|
|
+ then
|
|
+ if test x"$enable_shared" = x"yes"
|
|
+ then
|
|
+ AC_MSG_ERROR([Cannot build shared opendkim
|
|
+ against static openssl libraries.
|
|
+ Configure with --disable-shared
|
|
+ to get this working or obtain a
|
|
+ shared libssl library for
|
|
+ opendkim to use.])
|
|
+ fi
|
|
+
|
|
+ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
|
|
+ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
|
|
+ AC_MSG_ERROR([libssl not found]), [-ldl])
|
|
+ fi
|
|
|
|
AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
|
|
AC_DEFINE([HAVE_SHA256], 1,
|
|
--- a/libopendkim/tests/Makefile.in 2015-05-12 18:43:48 UTC
|
|
+++ b/libopendkim/tests/Makefile.in
|
|
@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
|
|
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
END { for (dir in files) print dir, files[dir] }'
|
|
am__base_list = \
|
|
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\
|
|
+/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\
|
|
+/ /g'
|
|
am__uninstall_files_from_dir = { \
|
|
test -z "$$files" \
|
|
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
|
|
@@ -4131,16 +4133,19 @@ uninstall-am: uninstall-dist_docDATA
|
|
@LCOV_TRUE@description.txt: $(check_PROGRAMS) $(check_SCRIPTS)
|
|
@LCOV_TRUE@ rm -f $@
|
|
@LCOV_TRUE@ for i in $(check_PROGRAMS); do \
|
|
-@LCOV_TRUE@ testname=$${i/t-}; \
|
|
-@LCOV_TRUE@ testname=$${testname//-/_}; \
|
|
+@LCOV_TRUE@ testname=$${i#t-}; \
|
|
+@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
|
|
@LCOV_TRUE@ fgrep '***' $$i.c | tail -n 1 | \
|
|
-@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\n.*/\t\1\n/g' ) >> $@; \
|
|
+@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\
|
|
+@LCOV_TRUE@.*/ \1\
|
|
+@LCOV_TRUE@/g' ) >> $@; \
|
|
@LCOV_TRUE@ done
|
|
@LCOV_TRUE@ for i in $(check_SCRIPTS); do \
|
|
-@LCOV_TRUE@ testname=$${i/t-}; \
|
|
-@LCOV_TRUE@ testname=$${testname//-/_}; \
|
|
+@LCOV_TRUE@ testname=$${i#t-}; \
|
|
+@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
|
|
@LCOV_TRUE@ grep '^#' $$i | tail -n 1 | \
|
|
-@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/\t\1\n/g' ) >> $@; \
|
|
+@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/ \1\
|
|
+@LCOV_TRUE@/g' ) >> $@; \
|
|
@LCOV_TRUE@ done
|
|
|
|
@LCOV_TRUE@description.html: description.txt
|
|
--- a/libopendkim/dkim-canon.c 2015-05-11 03:56:13 UTC
|
|
+++ b/libopendkim/dkim-canon.c
|
|
@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dstring *dstr, dk
|
|
}
|
|
|
|
/* skip all spaces before first word */
|
|
- while (*p != '\0' && DKIM_ISWSP(*p))
|
|
+ while (*p != '\0' && DKIM_ISLWSP(*p))
|
|
p++;
|
|
|
|
space = FALSE; /* just saw a space */
|
|
--- a/opendkim/tests/Makefile.in 2015-05-12 18:43:49 UTC
|
|
+++ b/opendkim/tests/Makefile.in
|
|
@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
|
|
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
|
|
END { for (dir in files) print dir, files[dir] }'
|
|
am__base_list = \
|
|
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
|
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\
|
|
+/ /g' | \
|
|
+ sed '$$!N;$$!N;$$!N;$$!N;s/\
|
|
+/ /g'
|
|
am__uninstall_files_from_dir = { \
|
|
test -z "$$files" \
|
|
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
|
|
@@ -1298,14 +1300,16 @@ uninstall-am: uninstall-dist_docDATA
|
|
@LCOV_TRUE@description.txt: $(check_SCRIPTS)
|
|
@LCOV_TRUE@ rm -f $@
|
|
@LCOV_TRUE@ for test in $? ; do \
|
|
-@LCOV_TRUE@ testname=$${test/t-}; \
|
|
-@LCOV_TRUE@ testname=$${testname//-/_}; \
|
|
+@LCOV_TRUE@ testname=$${test#t-}; \
|
|
+@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
|
|
@LCOV_TRUE@ grep ^# $$test | tail -n 1 | \
|
|
-@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\n\t\1\n/g" >> $@; \
|
|
+@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\
|
|
+@LCOV_TRUE@ \1\
|
|
+@LCOV_TRUE@/g" >> $@; \
|
|
@LCOV_TRUE@ done
|
|
|
|
@LCOV_TRUE@description.html: description.txt
|
|
-@LCOV_TRUE@ gendesc --output $@ $<
|
|
+@LCOV_TRUE@ gendesc --output $@ $?
|
|
|
|
@LCOV_TRUE@maintainer-clean-local:
|
|
@LCOV_TRUE@ -rm -rf lcov/[^C]*
|
|
--- a/opendkim/opendkim-crypto.c 2013-02-25 21:02:41 UTC
|
|
+++ b/opendkim/opendkim-crypto.c
|
|
@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
|
|
{
|
|
assert(pthread_setspecific(id_key, ptr) == 0);
|
|
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
|
|
+ OPENSSL_thread_stop();
|
|
+#else
|
|
ERR_remove_state(0);
|
|
+#endif
|
|
|
|
free(ptr);
|
|
|
|
@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
|
|
{
|
|
if (crypto_init_done)
|
|
{
|
|
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
|
|
+ OPENSSL_thread_stop();
|
|
+#else
|
|
CRYPTO_cleanup_all_ex_data();
|
|
CONF_modules_free();
|
|
EVP_cleanup();
|
|
ERR_free_strings();
|
|
ERR_remove_state(0);
|
|
+#endif
|
|
|
|
if (nmutexes > 0)
|
|
{
|
|
|