Received: by mail.netbsd.org (Postfix, from userid 605) id C9BB784D61; Sun, 24 Nov 2019 23:20:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4D57184D51 for ; Sun, 24 Nov 2019 23:20:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 2kqwRBvjTuyk for ; Sun, 24 Nov 2019 23:20:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 945A484CE7 for ; Sun, 24 Nov 2019 23:20:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8DA9EFA97; Sun, 24 Nov 2019 23:20:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157463764067380" MIME-Version: 1.0 Date: Sun, 24 Nov 2019 18:20:40 -0500 From: "Christos Zoulas" Subject: CVS commit: pkgsrc/mail/opendkim To: pkgsrc-changes@NetBSD.org Reply-To: christos@netbsd.org X-Mailer: log_accum Message-Id: <20191124232040.8DA9EFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157463764067380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: christos Date: Sun Nov 24 23:20:40 UTC 2019 Modified Files: pkgsrc/mail/opendkim: Makefile distinfo Added Files: pkgsrc/mail/opendkim/patches: patch-configure.ac patch-opendkim_opendkim-crypto.c Removed Files: pkgsrc/mail/opendkim/patches: patch-configure Log Message: make this work with OpenSSL-1.1 To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/opendkim/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/opendkim/distinfo cvs rdiff -u -r1.2 -r0 pkgsrc/mail/opendkim/patches/patch-configure cvs rdiff -u -r0 -r1.1 pkgsrc/mail/opendkim/patches/patch-configure.ac \ pkgsrc/mail/opendkim/patches/patch-opendkim_opendkim-crypto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157463764067380 Content-Disposition: inline Content-Length: 5307 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/opendkim/Makefile diff -u pkgsrc/mail/opendkim/Makefile:1.29 pkgsrc/mail/opendkim/Makefile:1.30 --- pkgsrc/mail/opendkim/Makefile:1.29 Sun Aug 11 09:21:30 2019 +++ pkgsrc/mail/opendkim/Makefile Sun Nov 24 18:20:40 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2019/08/11 13:21:30 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/24 23:20:40 christos Exp $ DISTNAME= opendkim-2.10.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendkim/} @@ -11,6 +11,7 @@ COMMENT= Open source DKIM library, MTA f LICENSE= sendmail-open-source-license USE_LIBTOOL= yes +USE_TOOLS+= autoconf automake autoreconf USE_TOOLS+= pkg-config perl:run GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -41,6 +42,9 @@ PKGCONFIG_OVERRIDE+= libopendkim/opendki .include "options.mk" +pre-configure: + cd ${WRKSRC} && autoreconf -fiv + PLIST_SRC+= ${PKGDIR}/PLIST BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8 Index: pkgsrc/mail/opendkim/distinfo diff -u pkgsrc/mail/opendkim/distinfo:1.18 pkgsrc/mail/opendkim/distinfo:1.19 --- pkgsrc/mail/opendkim/distinfo:1.18 Fri Mar 18 02:16:18 2016 +++ pkgsrc/mail/opendkim/distinfo Sun Nov 24 18:20:40 2019 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.18 2016/03/18 06:16:18 pettai Exp $ +$NetBSD: distinfo,v 1.19 2019/11/24 23:20:40 christos Exp $ SHA1 (opendkim-2.10.3.tar.gz) = 4e9b966860bcfbca6441ed84a95bbe762fff69f4 RMD160 (opendkim-2.10.3.tar.gz) = c6553757ae9675434e647f3cc1e6357bc60c7d2a SHA512 (opendkim-2.10.3.tar.gz) = 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 Size (opendkim-2.10.3.tar.gz) = 1210224 bytes -SHA1 (patch-configure) = 3e6bc994f72ed146770190a6b8a178abf4ebe4cd +SHA1 (patch-configure.ac) = 17eeb1927fb19ba7f48f9dfd8a9c2f6c44d823ca +SHA1 (patch-opendkim_opendkim-crypto.c) = d7d08fda3dba5bf9cb834123218b1e89b78878e5 Added files: Index: pkgsrc/mail/opendkim/patches/patch-configure.ac diff -u /dev/null pkgsrc/mail/opendkim/patches/patch-configure.ac:1.1 --- /dev/null Sun Nov 24 18:20:40 2019 +++ pkgsrc/mail/opendkim/patches/patch-configure.ac Sun Nov 24 18:20:40 2019 @@ -0,0 +1,55 @@ +$NetBSD: patch-configure.ac,v 1.1 2019/11/24 23:20:40 christos Exp $ + +- compat for OpenSSL 1.1 https://sourceforge.net/p/opendkim/patches/37/ +- fix == bashism + +--- configure.ac.orig 2015-05-12 14:43:09.000000000 -0400 ++++ configure.ac 2019-11-24 18:03:48.650839906 -0500 +@@ -860,26 +860,28 @@ + 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 ]], ++ [[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, Index: pkgsrc/mail/opendkim/patches/patch-opendkim_opendkim-crypto.c diff -u /dev/null pkgsrc/mail/opendkim/patches/patch-opendkim_opendkim-crypto.c:1.1 --- /dev/null Sun Nov 24 18:20:40 2019 +++ pkgsrc/mail/opendkim/patches/patch-opendkim_opendkim-crypto.c Sun Nov 24 18:20:40 2019 @@ -0,0 +1,34 @@ +$NetBSD: patch-opendkim_opendkim-crypto.c,v 1.1 2019/11/24 23:20:40 christos Exp $ + +- OpenSSL 1.1 compat https://sourceforge.net/p/opendkim/patches/37/ + +--- opendkim/opendkim-crypto.c.orig 2013-02-25 16:02:41.000000000 -0500 ++++ opendkim/opendkim-crypto.c 2019-11-24 18:04:07.924299914 -0500 +@@ -222,7 +222,11 @@ + { + 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 @@ + { + 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) + { --_----------=_157463764067380--