Date: Sat, 20 Oct 2018 21:55:41 +1100 From: Kubilay Kocak <koobs@FreeBSD.org> To: Matthias Fechner <mfechner@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r482484 - head/mail/opendkim/files Message-ID: <101b22e2-14ad-fab4-da14-ac6dcef4eaca@FreeBSD.org> In-Reply-To: <201810201051.w9KApUNW089133@repo.freebsd.org> References: <201810201051.w9KApUNW089133@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 20/10/2018 9:51 pm, Matthias Fechner wrote: > Author: mfechner > Date: Sat Oct 20 10:51:30 2018 > New Revision: 482484 > URL: https://svnweb.freebsd.org/changeset/ports/482484 > > Log: > Update devel/py-pygit2 to version 0.27.2. > > Changelog: https://github.com/libgit2/pygit2/blob/v0.27.2/CHANGELOG.rst > > Reported by: PORTSCOUT > Approved by: mentors (implicit) > > Added: > head/mail/opendkim/files/patch-configure.ac (contents, props changed) > head/mail/opendkim/files/patch-opendkim_opendkim-crypto.c (contents, props changed) Was this the correct log message but with the different files, or the right files, but a different log message? > Added: head/mail/opendkim/files/patch-configure.ac > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/mail/opendkim/files/patch-configure.ac Sat Oct 20 10:51:30 2018 (r482484) > @@ -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, > > Added: head/mail/opendkim/files/patch-opendkim_opendkim-crypto.c > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/mail/opendkim/files/patch-opendkim_opendkim-crypto.c Sat Oct 20 10:51:30 2018 (r482484) > @@ -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) > + { >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?101b22e2-14ad-fab4-da14-ac6dcef4eaca>