Attachment #198070 for bug #223568





PORTNAME=	opendkim
PORTVERSION=	2.10.3
PORTREVISION=	11
CATEGORIES=	mail security
MASTER_SITES=	SF/${PORTNAME} \
		SF/${PORTNAME}/Previous%20Releases \

LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BROKEN_SSL=	openssl-devel
BROKEN_SSL_REASON_openssl-devel=	checking for library containing SSL_library_init... no

GNU_CONFIGURE=	yes
NO_OPTIONS_SORT=yes
USES=		autoreconf libtool perl5 pkgconfig shebangfix ssl
USE_PERL5=	run
SHEBANG_FILES=	opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
		reprrd/opendkim-reprrdimport*

.endif

pre-configure:
	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
	    -e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/'		 \
	    -e '/PKG_CONFIG/s/cyrussasl/libsasl2/'			 \
	    ${WRKSRC}/configure.ac

post-patch-LCOV-on:
	${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/




--- configure.ac.orig	2015-05-12 18:43:09 UTC
+++ 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,

Lines 1-6 Link Here

(-)mail/opendkim/files/patch-libopendkim__tests__Makefile.in (-1 / +1 lines)
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 = \

Lines 1-6 Link Here

(-)mail/opendkim/files/patch-libopendkim_dkim-canon.c (-2 / +2 lines)
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 */

Lines 1-6 Link Here

(-)mail/opendkim/files/patch-opendkim__tests__Makefile.in (-1 / +1 lines)
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 = \




--- opendkim/opendkim-crypto.c.orig	2013-02-25 21:02:41 UTC
+++ 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)
 		{

Return to bug 223568

Lines 3-9 Link Here

(-)mail/opendkim/Makefile (-8 / +4 lines)
3		3
4	PORTNAME= opendkim	4	PORTNAME= opendkim
5	PORTVERSION= 2.10.3	5	PORTVERSION= 2.10.3
6	PORTREVISION= 10	6	PORTREVISION= 11
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 20-31 Link Here
20	LICENSE_NAME_SENDMAIL= Sendmail Open Source License	20	LICENSE_NAME_SENDMAIL= Sendmail Open Source License
21	LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	21	LICENSE_PERMS_SENDMAIL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
22		22
23	BROKEN_SSL= openssl-devel
24	BROKEN_SSL_REASON_openssl-devel= checking for library containing SSL_library_init... no
25
26	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
27	NO_OPTIONS_SORT=yes	24	NO_OPTIONS_SORT=yes
28	USES= libtool perl5 pkgconfig shebangfix ssl	25	USES= autoreconf libtool perl5 pkgconfig shebangfix ssl
29	USE_PERL5= run	26	USE_PERL5= run
30	SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \	27	SHEBANG_FILES= opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
31	reprrd/opendkim-reprrdimport*	28	reprrd/opendkim-reprrdimport*
Lines 158-167 Link Here
158	.endif	155	.endif
159		156
160	pre-configure:	157	pre-configure:
161	${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \	158	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
162	-e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/' \
163	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \	159	-e '/PKG_CONFIG/s/cyrussasl/libsasl2/' \
164	${WRKSRC}/configure	160	${WRKSRC}/configure.ac
165		161
166	post-patch-LCOV-on:	162	post-patch-LCOV-on:
167	${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/	163	${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/

Line 0 Link Here

(-)mail/opendkim/files/patch-configure.ac (+50 lines)
	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,

Line 0 Link Here

(-)mail/opendkim/files/patch-opendkim_opendkim-crypto.c (+30 lines)
	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	{