diff options
| author | roy <roy@pkgsrc.org> | 2018-10-12 12:49:28 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2018-10-12 12:49:28 +0000 |
| commit | a61c4846e905ca3cc55c735ef5dbe13b8ac62e2c (patch) | |
| tree | 624fa0424cd8f1f9e7d2f9efadf1e981041a0694 /mail/rspamd | |
| parent | 16978c0d5a553f783215ba111a3737a7b780a227 (diff) | |
| download | pkgsrc-a61c4846e905ca3cc55c735ef5dbe13b8ac62e2c.tar.gz | |
Avoid calling ERR string init functions as this doesn't work with
OpenSSL-1.1 and should happen automatically with this version.
Diffstat (limited to 'mail/rspamd')
| -rw-r--r-- | mail/rspamd/Makefile | 3 | ||||
| -rw-r--r-- | mail/rspamd/distinfo | 3 | ||||
| -rw-r--r-- | mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 8ac2d18979c..b82bbb6d70d 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.48 2018/10/07 20:10:57 fhajny Exp $ +# $NetBSD: Makefile,v 1.49 2018/10/12 12:49:28 roy Exp $ DISTNAME= rspamd-1.8.0 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index dc972411e50..8ed897e650e 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2018/10/07 20:10:57 fhajny Exp $ +$NetBSD: distinfo,v 1.28 2018/10/12 12:49:28 roy Exp $ SHA1 (rspamd-1.8.0.tar.gz) = 918331a060246d921c89ffc42e99feed0335a89a RMD160 (rspamd-1.8.0.tar.gz) = 2a263670bf68b22792f52e39b2fb44a6c2e42da5 @@ -6,5 +6,6 @@ SHA512 (rspamd-1.8.0.tar.gz) = 6e254abc70da5db1562273a5772ed90bc43a9cfdcb04f45b3 Size (rspamd-1.8.0.tar.gz) = 4261319 bytes SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a +SHA1 (patch-src_libcryptobox_cryptobox.c) = 3173790f26ef713777fdfd3a7fc642d9c1ea6444 SHA1 (patch-test_CMakeLists.txt) = 2e4aafd860f0f120928cce49b0995c739558bf0d SHA1 (patch-test_rspamd__lua__pcall__vs__resume__test.c) = 65e901af64ebcd983310707da9814fa09aa11410 diff --git a/mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c b/mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c new file mode 100644 index 00000000000..556da203b42 --- /dev/null +++ b/mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_libcryptobox_cryptobox.c,v 1.1 2018/10/12 12:49:28 roy Exp $ + +OpenSSL-1.1 automatically loads error strings. +Calling these without an OpenSSL init function can result in an error. + +--- src/libcryptobox/cryptobox.c.orig 2018-09-24 13:53:53.000000000 +0000 ++++ src/libcryptobox/cryptobox.c +@@ -374,7 +374,7 @@ rspamd_cryptobox_init (void) + ctx->blake2_impl = blake2b_load (); + ctx->ed25519_impl = ed25519_load (); + ctx->base64_impl = base64_load (); +-#ifdef HAVE_USABLE_OPENSSL ++#if defined(HAVE_USABLE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_load_EC_strings (); + ERR_load_RAND_strings (); + ERR_load_EVP_strings (); |