diff options
| author | tnn <tnn@pkgsrc.org> | 2018-03-17 09:14:35 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2018-03-17 09:14:35 +0000 |
| commit | 7f2f0330a352fa5dfa9abc65bde4e80a9bdf174e (patch) | |
| tree | f54225b023e5db8068ce6352251688af5f398a66 /mail/spamassassin | |
| parent | 7309b991167e8ed4fdef8a00dfedb04a94d56df3 (diff) | |
| download | pkgsrc-7f2f0330a352fa5dfa9abc65bde4e80a9bdf174e.tar.gz | |
spamassassin: use TLS instead of SSLv3. Fixes build with current openssl.
Diffstat (limited to 'mail/spamassassin')
| -rw-r--r-- | mail/spamassassin/Makefile | 8 | ||||
| -rw-r--r-- | mail/spamassassin/distinfo | 3 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-spamc_libspamc.c | 29 |
3 files changed, 37 insertions, 3 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 4e95db95cff..c2b3595e48f 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.129 2017/07/09 22:12:12 schmonz Exp $ +# $NetBSD: Makefile,v 1.130 2018/03/17 09:14:35 tnn Exp $ DISTNAME= Mail-SpamAssassin-3.4.1 PKGNAME= spamassassin-3.4.1 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -67,6 +67,10 @@ PERL5_PACKLIST= auto/Mail/SpamAssassin/.packlist GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_DIRS= spamc +# Fix openssl detection. These methods are deprecated and removed, but +# still the configure scripts looks for them. +CONFIGURE_ENV+= ac_cv_lib_ssl_SSL_CTX_free=yes +CONFIGURE_ENV+= ac_cv_lib_crypto_CRYPTO_lock=yes BUILD_DIRS= . # build at the top-level directory, not in "spamc" PERL5_CONFIGURE= NO # we need the default "do-configure" target PERL5_CONFIGURE_DIRS= ${WRKSRC} diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index bdfc26db5cb..ec3a822e269 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.70 2017/07/09 22:12:12 schmonz Exp $ +$NetBSD: distinfo,v 1.71 2018/03/17 09:14:35 tnn Exp $ SHA1 (Mail-SpamAssassin-3.4.1.tar.gz) = e7b342d30f4983f70f4234480b489ccc7d2aa615 RMD160 (Mail-SpamAssassin-3.4.1.tar.gz) = 4b7d6a6def068eb015e8d4699db410ade76b28f3 @@ -15,4 +15,5 @@ SHA1 (patch-lib_Mail_SpamAssassin_DnsResolver.pm) = 129386c70010f6005ff93d4c237c SHA1 (patch-lib_Mail_SpamAssassin_PerMsgStatus.pm) = 414255bf5ffb2083029950bb38309716616803ce SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b SHA1 (patch-sa-update) = 59cba1287051042fc7f510f5e5ef462e2ee8d034 +SHA1 (patch-spamc_libspamc.c) = 9175012a0e06faaf6a425da65438ba8e2c29f1f1 SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4 diff --git a/mail/spamassassin/patches/patch-spamc_libspamc.c b/mail/spamassassin/patches/patch-spamc_libspamc.c new file mode 100644 index 00000000000..f8b27d2aa08 --- /dev/null +++ b/mail/spamassassin/patches/patch-spamc_libspamc.c @@ -0,0 +1,29 @@ +$NetBSD: patch-spamc_libspamc.c,v 1.1 2018/03/17 09:14:35 tnn Exp $ + +Set the client protocol to TLS instead of SSLv3. +Fixes build with current openssl. + +--- spamc/libspamc.c.orig 2015-04-28 19:56:59.000000000 +0000 ++++ spamc/libspamc.c +@@ -1213,11 +1213,7 @@ int message_filter(struct transport *tp, + if (flags & SPAMC_USE_SSL) { + #ifdef SPAMC_SSL + SSLeay_add_ssl_algorithms(); +- if (flags & SPAMC_TLSV1) { +- meth = TLSv1_client_method(); +- } else { +- meth = SSLv3_client_method(); /* default */ +- } ++ meth = TLSv1_client_method(); + SSL_load_error_strings(); + ctx = SSL_CTX_new(meth); + #else +@@ -1604,7 +1600,7 @@ int message_tell(struct transport *tp, c + if (flags & SPAMC_USE_SSL) { + #ifdef SPAMC_SSL + SSLeay_add_ssl_algorithms(); +- meth = SSLv3_client_method(); ++ meth = TLSv1_client_method(); + SSL_load_error_strings(); + ctx = SSL_CTX_new(meth); + #else |