Attachment 180699 Details for Bug 217685 – 2.12.0

[patch] 2.12.0

git.patch (text/plain), 6.94 KB, created by Adam Weinberger on 2017-03-10 16:15:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2017-03-10 16:15:09 UTC

Size: 6.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 435832)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	git
>-DISTVERSION=	2.11.1
>+DISTVERSION=	2.12.0
> CATEGORIES=	devel
> MASTER_SITES=	KERNEL_ORG/software/scm/git
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 435832)
>+++ distinfo	(working copy)
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1486116603
>-SHA256 (git-2.11.1.tar.xz) = c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415
>-SIZE (git-2.11.1.tar.xz) = 4208132
>-SHA256 (git-manpages-2.11.1.tar.xz) = 69486ed339ee0591001ae83d43c888aa26351b9680b6ceb59e06b593051bca31
>-SIZE (git-manpages-2.11.1.tar.xz) = 400812
>-SHA256 (git-htmldocs-2.11.1.tar.xz) = 1a5f1e4a5eadad89b0783efa08bb1f7e3802d4a4d0a135bf5f61fd672ea3846e
>-SIZE (git-htmldocs-2.11.1.tar.xz) = 1083264
>+TIMESTAMP = 1489161000
>+SHA256 (git-2.12.0.tar.xz) = 1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027
>+SIZE (git-2.12.0.tar.xz) = 4269944
>+SHA256 (git-manpages-2.12.0.tar.xz) = 8b8356f8d50eff6499c5d05e87c106a7b1b48bd16de1742fa022631909804773
>+SIZE (git-manpages-2.12.0.tar.xz) = 403112
>+SHA256 (git-htmldocs-2.12.0.tar.xz) = bd548faa2c9e63403e528ce4f4e87561e78949a0349a9e2a27e0d6e581d3a8bd
>+SIZE (git-htmldocs-2.12.0.tar.xz) = 1091612
>Index: files/patch-git-send-email.perl
>===================================================================
>--- files/patch-git-send-email.perl	(revision 435832)
>+++ files/patch-git-send-email.perl	(nonexistent)
>@@ -1,82 +0,0 @@
>-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
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 435832)
>+++ pkg-plist	(working copy)
>@@ -133,7 +133,6 @@
> libexec/git-core/git-rebase--merge
> libexec/git-core/git-receive-pack
> libexec/git-core/git-reflog
>-libexec/git-core/git-relink
> libexec/git-core/git-remote
> libexec/git-core/git-remote-ext
> libexec/git-core/git-remote-fd
>@@ -312,7 +311,6 @@
> man/man1/git-rebase.1.gz
> man/man1/git-receive-pack.1.gz
> man/man1/git-reflog.1.gz
>-man/man1/git-relink.1.gz
> man/man1/git-remote-ext.1.gz
> man/man1/git-remote-fd.1.gz
> man/man1/git-remote-testgit.1.gz
>@@ -1211,6 +1209,7 @@
> %%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci
> %%CONTRIB%%share/git-core/contrib/coccinelle/qsort.cocci
> %%CONTRIB%%share/git-core/contrib/coccinelle/strbuf.cocci
>+%%CONTRIB%%share/git-core/contrib/coccinelle/swap.cocci
> %%CONTRIB%%share/git-core/contrib/coccinelle/xstrdup_or_null.cocci
> %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash
> %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
>@@ -1221,8 +1220,6 @@
> %%CONTRIB%%share/git-core/contrib/contacts/git-contacts
> %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
> %%CONTRIB%%share/git-core/contrib/convert-grafts-to-replace-refs.sh
>-%%CONTRIB%%share/git-core/contrib/convert-objects/convert-objects.c
>-%%CONTRIB%%share/git-core/contrib/convert-objects/git-convert-objects.txt
> %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/.gitignore
> %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/Makefile
> %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
>@@ -1255,6 +1252,7 @@
> %%CONTRIB%%share/git-core/contrib/examples/git-clean.sh
> %%CONTRIB%%share/git-core/contrib/examples/git-clone.sh
> %%CONTRIB%%share/git-core/contrib/examples/git-commit.sh
>+%%CONTRIB%%share/git-core/contrib/examples/git-difftool.perl
> %%CONTRIB%%share/git-core/contrib/examples/git-fetch.sh
> %%CONTRIB%%share/git-core/contrib/examples/git-gc.sh
> %%CONTRIB%%share/git-core/contrib/examples/git-log.sh
>@@ -1286,8 +1284,6 @@
> %%CONTRIB%%share/git-core/contrib/git-shell-commands/README
> %%CONTRIB%%share/git-core/contrib/git-shell-commands/help
> %%CONTRIB%%share/git-core/contrib/git-shell-commands/list
>-%%CONTRIB%%share/git-core/contrib/gitview/gitview
>-%%CONTRIB%%share/git-core/contrib/gitview/gitview.txt
> %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
> %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
> %%CONTRIB%%share/git-core/contrib/hooks/multimail/CHANGES

Actions: View | Diff

Attachments on bug 217685: 180699