Attachment 198070 Details for Bug 223568 – fix builds with openssl 1.1

[patch] fix builds with openssl 1.1

20181012-opendkim.diff (text/plain), 6.31 KB, created by Daniel Austin on 2018-10-12 17:24:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2018-10-12 17:24:55 UTC

Size: 6.31 KB

patch

obsolete

>diff -ruN mail/opendkim.orig/Makefile mail/opendkim/Makefile
>--- mail/opendkim.orig/Makefile	2018-10-12 16:30:35.000000000 +0100
>+++ mail/opendkim/Makefile	2018-10-12 18:20:04.264899000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	opendkim
> PORTVERSION=	2.10.3
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	mail security
> MASTER_SITES=	SF/${PORTNAME} \
> 		SF/${PORTNAME}/Previous%20Releases \
>@@ -20,12 +20,9 @@
> 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=		libtool perl5 pkgconfig shebangfix ssl
>+USES=		autoreconf libtool perl5 pkgconfig shebangfix ssl
> USE_PERL5=	run
> SHEBANG_FILES=	opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
> 		reprrd/opendkim-reprrdimport*
>@@ -158,10 +155,9 @@
> .endif
> 
> pre-configure:
>-	${REINPLACE_CMD} -e '/LIBLUA_LIBS/s/lua5\.[0-9]/lua-${LUA_VER}/' \
>-	    -e '/PKG_CONFIG/s/lua5\.[0-9]/lua-${LUA_VER}/'		 \
>+	${REINPLACE_CMD} -e '/PKG_CHECK_MODULES/s/lua5\.[0-9]/lua-${LUA_VER}/' \
> 	    -e '/PKG_CONFIG/s/cyrussasl/libsasl2/'			 \
>-	    ${WRKSRC}/configure
>+	    ${WRKSRC}/configure.ac
> 
> post-patch-LCOV-on:
> 	${CP} ${FILESDIR}/lcov-helper.sh ${WRKSRC}/libopendkim/tests/
>diff -ruN mail/opendkim.orig/files/patch-configure.ac mail/opendkim/files/patch-configure.ac
>--- mail/opendkim.orig/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>+++ mail/opendkim/files/patch-configure.ac	2018-10-12 17:15:24.203698000 +0100
>@@ -0,0 +1,50 @@
>+--- 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,
>diff -ruN mail/opendkim.orig/files/patch-libopendkim__tests__Makefile.in mail/opendkim/files/patch-libopendkim__tests__Makefile.in
>--- mail/opendkim.orig/files/patch-libopendkim__tests__Makefile.in	2015-08-06 23:36:08.000000000 +0100
>+++ mail/opendkim/files/patch-libopendkim__tests__Makefile.in	2018-10-12 17:15:24.204213000 +0100
>@@ -1,6 +1,6 @@
> --- libopendkim/tests/Makefile.in.orig	2015-05-12 18:43:48 UTC
> +++ libopendkim/tests/Makefile.in
>-@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_set
>+@@ -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 = \
>diff -ruN mail/opendkim.orig/files/patch-libopendkim_dkim-canon.c mail/opendkim/files/patch-libopendkim_dkim-canon.c
>--- mail/opendkim.orig/files/patch-libopendkim_dkim-canon.c	2015-08-28 10:23:53.000000000 +0100
>+++ mail/opendkim/files/patch-libopendkim_dkim-canon.c	2018-10-12 17:15:24.204677000 +0100
>@@ -1,6 +1,6 @@
>---- libopendkim/dkim-canon.c.orig	2015-08-26 08:37:01 UTC
>+--- libopendkim/dkim-canon.c.orig	2015-05-11 03:56:13 UTC
> +++ libopendkim/dkim-canon.c
>-@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dst
>+@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dstring *dstr, dk
>  		}
>  
>  		/* skip all spaces before first word */
>diff -ruN mail/opendkim.orig/files/patch-opendkim__tests__Makefile.in mail/opendkim/files/patch-opendkim__tests__Makefile.in
>--- mail/opendkim.orig/files/patch-opendkim__tests__Makefile.in	2015-08-06 23:36:08.000000000 +0100
>+++ mail/opendkim/files/patch-opendkim__tests__Makefile.in	2018-10-12 17:15:24.205073000 +0100
>@@ -1,6 +1,6 @@
> --- opendkim/tests/Makefile.in.orig	2015-05-12 18:43:49 UTC
> +++ opendkim/tests/Makefile.in
>-@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_set
>+@@ -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 = \
>diff -ruN mail/opendkim.orig/files/patch-opendkim_opendkim-crypto.c mail/opendkim/files/patch-opendkim_opendkim-crypto.c
>--- mail/opendkim.orig/files/patch-opendkim_opendkim-crypto.c	1970-01-01 01:00:00.000000000 +0100
>+++ mail/opendkim/files/patch-opendkim_opendkim-crypto.c	2018-10-12 17:15:24.205727000 +0100
>@@ -0,0 +1,30 @@
>+--- 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)
>+ 		{

Flags:

freebsd-ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 223568: 187883 | 198070 | 200171