Attachment 178490 Details for Bug 214335 – Patch

[patch] Patch

git-without-Net_SMTP_SSL.diff (text/plain), 3.70 KB, created by Renato Botelho on 2017-01-03 21:32:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2017-01-03 21:32:34 UTC

Size: 3.70 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 430519)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	git
> DISTVERSION=	2.11.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel
> MASTER_SITES=	KERNEL_ORG/software/scm/git
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>@@ -71,8 +71,7 @@
> PCRE_CONFIGURE_WITH=	libpcre
> 
> SEND_EMAIL_IMPLIES=	PERL
>-SEND_EMAIL_RUN_DEPENDS=	p5-Net-SMTP-SSL>=0:mail/p5-Net-SMTP-SSL \
>-			p5-Authen-SASL>=0:security/p5-Authen-SASL
>+SEND_EMAIL_RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
> 
> ICONV_USES=		iconv
> ICONV_MAKE_ARGS_OFF=	NO_ICONV=1
>Index: files/patch-git-send-email.perl
>===================================================================
>--- files/patch-git-send-email.perl	(nonexistent)
>+++ files/patch-git-send-email.perl	(working copy)
>@@ -0,0 +1,82 @@
>+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.orig	2016-11-29 21:06:51 UTC
>++++ git-send-email.perl
>+@@ -1335,10 +1335,13 @@ Message-Id: $message_id
>+ 			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 +1350,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;
>+ 			}
>+ 		}
>+ 
>
>Property changes on: files/patch-git-send-email.perl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 214335: 178490 | 179994