From owner-svn-ports-all@freebsd.org Sun Dec 30 14:04:20 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AAF881429317; Sun, 30 Dec 2018 14:04:20 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DA318678E; Sun, 30 Dec 2018 14:04:20 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3989724045; Sun, 30 Dec 2018 14:04:20 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBUE4KRS095252; Sun, 30 Dec 2018 14:04:20 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBUE4Jt0095249; Sun, 30 Dec 2018 14:04:19 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201812301404.wBUE4Jt0095249@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sun, 30 Dec 2018 14:04:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488717 - in head/mail/sendmail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/mail/sendmail: . files X-SVN-Commit-Revision: 488717 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4DA318678E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2018 14:04:21 -0000 Author: dinoex Date: Sun Dec 30 14:04:19 2018 New Revision: 488717 URL: https://svnweb.freebsd.org/changeset/ports/488717 Log: - extend blacklisting - cleanup rsa glue Modified: head/mail/sendmail/Makefile head/mail/sendmail/files/patch-srvrsmtp.c head/mail/sendmail/files/patch-tls.c Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Sun Dec 30 14:00:46 2018 (r488716) +++ head/mail/sendmail/Makefile Sun Dec 30 14:04:19 2018 (r488717) @@ -2,7 +2,7 @@ PORTNAME= sendmail PORTVERSION= 8.15.2 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} Modified: head/mail/sendmail/files/patch-srvrsmtp.c ============================================================================== --- head/mail/sendmail/files/patch-srvrsmtp.c Sun Dec 30 14:00:46 2018 (r488716) +++ head/mail/sendmail/files/patch-srvrsmtp.c Sun Dec 30 14:04:19 2018 (r488717) @@ -20,7 +20,17 @@ if (LogLevel > 9) sm_syslog(LOG_WARNING, e->e_id, "AUTH failure (%s): %s (%d) %s, relay=%.100s", -@@ -3523,7 +3527,10 @@ doquit: +@@ -1867,6 +1871,9 @@ smtp(nullserver, d_flags, e) + DELAY_CONN("AUTH"); + if (!sasl_ok || n_mechs <= 0) + { ++ int fd; ++ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL); ++ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, "AUTH LOGIN FAIL"); + message("503 5.3.3 AUTH not available"); + break; + } +@@ -3523,7 +3530,10 @@ doquit: #if MAXBADCOMMANDS > 0 if (++n_badcmds > MAXBADCOMMANDS) { Modified: head/mail/sendmail/files/patch-tls.c ============================================================================== --- head/mail/sendmail/files/patch-tls.c Sun Dec 30 14:00:46 2018 (r488716) +++ head/mail/sendmail/files/patch-tls.c Sun Dec 30 14:04:19 2018 (r488717) @@ -94,10 +94,10 @@ + int rc; + + bn_rsa_r4 = BN_new(); -+ rc = BN_set_word(bn_rsa_r4, RSA_F4); -+ if ((bn_rsa_r4 != NULL) && BN_set_word(bn_rsa_r4, RSA_F4) && (rsa = RSA_new()) != NULL) ++ rc = BN_set_word(bn_rsa_r4, e); ++ if ((bn_rsa_r4 != NULL) && BN_set_word(bn_rsa_r4, e) && (rsa = RSA_new()) != NULL) + { -+ if (!RSA_generate_key_ex(rsa, RSA_KEYLENGTH, bn_rsa_r4, NULL)) ++ if (!RSA_generate_key_ex(rsa, num, bn_rsa_r4, NULL)) + { + RSA_free(rsa); + rsa = NULL;