View | Details | Raw Unified | Return to bug 223568 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	opendkim
4
PORTNAME=	opendkim
5
PORTVERSION=	2.10.3
5
PORTVERSION=	2.10.3
6
PORTREVISION=	7
6
PORTREVISION=	8
7
CATEGORIES=	mail security
7
CATEGORIES=	mail security
8
MASTER_SITES=	SF/${PORTNAME} \
8
MASTER_SITES=	SF/${PORTNAME} \
9
		SF/${PORTNAME}/Previous%20Releases \
9
		SF/${PORTNAME}/Previous%20Releases \
Lines 22-28 Link Here
22
22
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
NO_OPTIONS_SORT=yes
24
NO_OPTIONS_SORT=yes
25
USES=		libtool perl5 pkgconfig shebangfix ssl
25
USES=		autoreconf libtool perl5 pkgconfig shebangfix ssl
26
USE_PERL5=	run
26
USE_PERL5=	run
27
SHEBANG_FILES=	opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
27
SHEBANG_FILES=	opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
28
		reprrd/opendkim-reprrdimport*
28
		reprrd/opendkim-reprrdimport*
(-)files/patch-configure.ac (+50 lines)
Line 0 Link Here
1
--- configure.ac.orig	2015-05-12 18:43:09 UTC
2
+++ configure.ac
3
@@ -860,26 +860,28 @@ then
4
 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
5
 	               AC_MSG_ERROR([libcrypto not found]))
6
 
7
-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
8
-		[
9
-			if test x"$enable_shared" = x"yes"
10
-			then
11
-				AC_MSG_ERROR([Cannot build shared opendkim
12
-				              against static openssl libraries.
13
-				              Configure with --disable-shared
14
-				              to get this working or obtain a
15
-				              shared libssl library for
16
-				              opendkim to use.])
17
-			fi
18
 
19
-			# avoid caching issue - last result of SSL_library_init
20
-			# shouldn't be cached for this next check
21
-			unset ac_cv_search_SSL_library_init
22
-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
23
-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
24
-			               AC_MSG_ERROR([libssl not found]), [-ldl])
25
-		]
26
-	)
27
+	AC_LINK_IFELSE(
28
+		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
29
+					[[SSL_library_init();]])],
30
+					[od_have_ossl="yes";],
31
+					[od_have_ossl="no";])
32
+	if test x"$od_have_ossl" = x"no"
33
+	then
34
+		if test x"$enable_shared" = x"yes"
35
+		then
36
+			AC_MSG_ERROR([Cannot build shared opendkim
37
+			              against static openssl libraries.
38
+			              Configure with --disable-shared
39
+			              to get this working or obtain a
40
+			              shared libssl library for
41
+			              opendkim to use.])
42
+		fi
43
+
44
+		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
45
+		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
46
+		               AC_MSG_ERROR([libssl not found]), [-ldl])
47
+	fi
48
 
49
 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
50
                       AC_DEFINE([HAVE_SHA256], 1,
(-)files/patch-libopendkim__tests__Makefile.in (-1 / +1 lines)
Lines 1-6 Link Here
1
--- libopendkim/tests/Makefile.in.orig	2015-05-12 18:43:48 UTC
1
--- libopendkim/tests/Makefile.in.orig	2015-05-12 18:43:48 UTC
2
+++ libopendkim/tests/Makefile.in
2
+++ libopendkim/tests/Makefile.in
3
@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_set
3
@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
4
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
4
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5
     END { for (dir in files) print dir, files[dir] }'
5
     END { for (dir in files) print dir, files[dir] }'
6
 am__base_list = \
6
 am__base_list = \
(-)files/patch-libopendkim_dkim-canon.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- libopendkim/dkim-canon.c.orig	2015-08-26 08:37:01 UTC
1
--- libopendkim/dkim-canon.c.orig	2015-05-11 03:56:13 UTC
2
+++ libopendkim/dkim-canon.c
2
+++ libopendkim/dkim-canon.c
3
@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dst
3
@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dstring *dstr, dk
4
 		}
4
 		}
5
 
5
 
6
 		/* skip all spaces before first word */
6
 		/* skip all spaces before first word */
(-)files/patch-opendkim__tests__Makefile.in (-1 / +1 lines)
Lines 1-6 Link Here
1
--- opendkim/tests/Makefile.in.orig	2015-05-12 18:43:49 UTC
1
--- opendkim/tests/Makefile.in.orig	2015-05-12 18:43:49 UTC
2
+++ opendkim/tests/Makefile.in
2
+++ opendkim/tests/Makefile.in
3
@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_set
3
@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
4
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
4
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
5
     END { for (dir in files) print dir, files[dir] }'
5
     END { for (dir in files) print dir, files[dir] }'
6
 am__base_list = \
6
 am__base_list = \
(-)files/patch-opendkim_opendkim-crypto.c (+30 lines)
Line 0 Link Here
1
--- opendkim/opendkim-crypto.c.orig	2013-02-25 21:02:41 UTC
2
+++ opendkim/opendkim-crypto.c
3
@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
4
 	{
5
 		assert(pthread_setspecific(id_key, ptr) == 0);
6
 
7
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
8
+		OPENSSL_thread_stop();
9
+#else
10
 		ERR_remove_state(0);
11
+#endif
12
 
13
 		free(ptr);
14
 
15
@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
16
 {
17
 	if (crypto_init_done)
18
 	{
19
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
20
+		OPENSSL_thread_stop();
21
+#else
22
 		CRYPTO_cleanup_all_ex_data();
23
 		CONF_modules_free();
24
 		EVP_cleanup();
25
 		ERR_free_strings();
26
 		ERR_remove_state(0);
27
+#endif
28
 
29
 		if (nmutexes > 0)
30
 		{

Return to bug 223568