CVS commit: pkgsrc/mail/spamassassin

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Mar 17 09:14:35 UTC 2018

Modified Files:
        pkgsrc/mail/spamassassin: Makefile distinfo
Added Files:
        pkgsrc/mail/spamassassin/patches: patch-spamc_libspamc.c

Log Message:
spamassassin: use TLS instead of SSLv3. Fixes build with current openssl.


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/mail/spamassassin/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/mail/spamassassin/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/spamassassin/Makefile
diff -u pkgsrc/mail/spamassassin/Makefile:1.129 pkgsrc/mail/spamassassin/Makefile:1.130
--- pkgsrc/mail/spamassassin/Makefile:1.129     Sun Jul  9 22:12:12 2017
+++ pkgsrc/mail/spamassassin/Makefile   Sat Mar 17 09:14:35 2018
@@ -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/
 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}

Index: pkgsrc/mail/spamassassin/distinfo
diff -u pkgsrc/mail/spamassassin/distinfo:1.70 pkgsrc/mail/spamassassin/distinfo:1.71
--- pkgsrc/mail/spamassassin/distinfo:1.70      Sun Jul  9 22:12:12 2017
+++ pkgsrc/mail/spamassassin/distinfo   Sat Mar 17 09:14:35 2018
@@ -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_DnsRes
 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

Added files:

Index: pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c
diff -u /dev/null pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c:1.1
--- /dev/null   Sat Mar 17 09:14:35 2018
+++ pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c     Sat Mar 17 09:14:35 2018
@@ -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