From: "Mike Fisher" <mfisher@csh.rit.edu> To: git@vger.kernel.org Subject: [PATCH] Remove dependency on deprecated Net::SMTP::SSL Date: Sun, 20 Nov 2016 16:18:16 -0500 Message-ID: <451E4A46-BA43-41A5-9E68-DE0D89BE676A@csh.rit.edu> (raw) Refactor send_message() to remove dependency on deprecated Net::SMTP::SSL: <http://search.cpan.org/~rjbs/Net-SMTP-SSL-1.04/lib/Net/SMTP/SSL.pm#DEPRECATED> Signed-off-by: Mike Fisher <mfisher@csh.rit.edu> --- git-send-email.perl | 54 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index da81be4..fc166c5 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1330,15 +1330,17 @@ Message-Id: $message_id print $sm "$header\n$message"; close $sm or die $!; } else { - if (!defined $smtp_server) { die "The required SMTP server is not properly defined." } + require Net::SMTP; + $smtp_domain ||= maildomain(); + my $smtp_ssl = 0; + if ($smtp_encryption eq 'ssl') { $smtp_server_port ||= 465; # ssmtp - require Net::SMTP::SSL; - $smtp_domain ||= maildomain(); + $smtp_ssl = 1; require IO::Socket::SSL; # Suppress "variable accessed once" warning. @@ -1347,37 +1349,31 @@ Message-Id: $message_id $IO::Socket::SSL::DEBUG = 1; } - # Net::SMTP::SSL->new() does not forward any SSL options IO::Socket::SSL::set_client_defaults( ssl_verify_params()); - $smtp ||= Net::SMTP::SSL->new($smtp_server, - Hello => $smtp_domain, - Port => $smtp_server_port, - Debug => $debug_net_smtp); } else { - require Net::SMTP; - $smtp_domain ||= maildomain(); $smtp_server_port ||= 25; - $smtp ||= Net::SMTP->new($smtp_server, - Hello => $smtp_domain, - Debug => $debug_net_smtp, - Port => $smtp_server_port); - if ($smtp_encryption eq 'tls' && $smtp) { - require Net::SMTP::SSL; - $smtp->command('STARTTLS'); - $smtp->response(); - if ($smtp->code == 220) { - $smtp = Net::SMTP::SSL->start_SSL($smtp, - ssl_verify_params()) - or die "STARTTLS failed! ".IO::Socket::SSL::errstr(); - $smtp_encryption = ''; - # Send EHLO again to receive fresh - # supported commands - $smtp->hello($smtp_domain); - } else { - die "Server does not support STARTTLS! ".$smtp->message; - } + } + + $smtp ||= Net::SMTP->new($smtp_server, + Hello => $smtp_domain, + Port => $smtp_server_port, + Debug => $debug_net_smtp, + SSL => $smtp_ssl); + + if ($smtp_encryption eq 'tls' && $smtp) { + $smtp->command('STARTTLS'); + $smtp->response(); + if ($smtp->code == 220) { + $smtp->starttls(ssl_verify_params()) + or die "STARTTLS failed! ".IO::Socket::SSL::errstr(); + $smtp_encryption = ''; + # Send EHLO again to receive fresh + # supported commands + $smtp->hello($smtp_domain); + } else { + die "Server does not support STARTTLS! ".$smtp->message; } } -- 2.9.3 (Apple Git-75)
next reply other threads:[~2016-11-20 21:25 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-20 21:18 Mike Fisher [this message] 2016-11-20 21:53 ` brian m. carlson 2017-01-13 14:59 ` Renato Botelho 2016-11-21 5:37 ` Torsten Bögershausen 2017-03-18 22:23 ` [PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary Dennis Kaarsemaker 2017-03-18 22:47 ` Ævar Arnfjörð Bjarmason 2017-03-18 23:14 ` Dennis Kaarsemaker 2017-03-24 21:37 ` [PATCH v2] " Dennis Kaarsemaker 2017-05-04 7:01 ` Dennis Kaarsemaker 2017-05-19 20:54 ` Dennis Kaarsemaker 2017-05-20 7:56 ` Ævar Arnfjörð Bjarmason 2017-05-31 22:50 ` Junio C Hamano 2017-06-01 19:42 ` Dennis Kaarsemaker 2017-05-31 21:46 ` Jonathan Nieder 2017-05-31 22:39 ` Junio C Hamano 2017-05-31 22:53 ` Jonathan Nieder
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=451E4A46-BA43-41A5-9E68-DE0D89BE676A@csh.rit.edu \ --to=mfisher@csh.rit.edu \ --cc=git@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git