aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/git/Makefile2
-rw-r--r--devel/git/distinfo14
-rw-r--r--devel/git/files/patch-git-send-email.perl77
-rw-r--r--devel/git/pkg-plist14
4 files changed, 43 insertions, 64 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index e5bfb72eb519..e6a8b2f97a0f 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= git
-DISTVERSION= 2.11.1
+DISTVERSION= 2.12.1
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 2d26b09dbd70..9be13be8f30d 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -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 = 1490090877
+SHA256 (git-2.12.1.tar.xz) = db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2
+SIZE (git-2.12.1.tar.xz) = 4271828
+SHA256 (git-manpages-2.12.1.tar.xz) = fbf5c34dde4385b04a0266444cda6834a97e6a589fc0a510c220da87f3d2a0ce
+SIZE (git-manpages-2.12.1.tar.xz) = 402644
+SHA256 (git-htmldocs-2.12.1.tar.xz) = 10598f2f2693e066b58e8d269c3d682595a99340f29e8e7a66dda5e226fd181e
+SIZE (git-htmldocs-2.12.1.tar.xz) = 1091792
diff --git a/devel/git/files/patch-git-send-email.perl b/devel/git/files/patch-git-send-email.perl
index 45891cccc6a8..7a81270bd930 100644
--- a/devel/git/files/patch-git-send-email.perl
+++ b/devel/git/files/patch-git-send-email.perl
@@ -1,48 +1,49 @@
-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.orig 2017-03-21 10:10:31 UTC
+++ git-send-email.perl
-@@ -1335,10 +1335,13 @@ Message-Id: $message_id
- die "The required SMTP server is not properly defined."
- }
+@@ -27,6 +27,7 @@ use Term::ANSIColor;
+ use File::Temp qw/ tempdir tempfile /;
+ use File::Spec::Functions qw(catfile);
+ use Error qw(:try);
++use Net::SMTP 2.34;
+ use Git;
+ use Git::I18N;
+
+@@ -1355,7 +1356,6 @@ EOF
-+ 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;
+ $smtp_domain ||= maildomain();
require IO::Socket::SSL;
- # Suppress "variable accessed once" warning.
-@@ -1347,37 +1350,31 @@ Message-Id: $message_id
+@@ -1365,35 +1365,22 @@ EOF
$IO::Socket::SSL::DEBUG = 1;
}
- # Net::SMTP::SSL->new() does not forward any SSL options
- IO::Socket::SSL::set_client_defaults(
- ssl_verify_params());
+- 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);
++ $smtp = Net::SMTP->new($smtp_server,
++ Hello => $smtp_domain,
++ Port => $smtp_server_port,
++ SSL => 1,
++ ssl_verify_params(),
++ 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) {
++ $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();
@@ -55,28 +56,8 @@ Signed-off-by: Mike Fisher <mfisher@csh.rit.edu>
- # 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;
++ $smtp->starttls(ssl_verify_params());
++ if ($smtp->code != 250) {
+ die sprintf(__("Server does not support STARTTLS! %s"), $smtp->message);
+ }
}
- }
-
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 569a39a97365..e48da20b3643 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -133,7 +133,6 @@ libexec/git-core/git-rebase--interactive
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-read-tree.1.gz
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
@@ -629,6 +627,8 @@ man/man7/gitworkflows.7.gz
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.3.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -907,8 +907,6 @@ man/man7/gitworkflows.7.gz
%%HTMLDOCS%%%%DOCSDIR%%/git-receive-pack.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-reflog.html
%%HTMLDOCS%%%%DOCSDIR%%/git-reflog.txt
-%%HTMLDOCS%%%%DOCSDIR%%/git-relink.html
-%%HTMLDOCS%%%%DOCSDIR%%/git-relink.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-remote-ext.html
%%HTMLDOCS%%%%DOCSDIR%%/git-remote-ext.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.html
@@ -1211,6 +1209,7 @@ share/emacs/site-lisp/git/git.el
%%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 @@ share/emacs/site-lisp/git/git.el
%%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 @@ share/emacs/site-lisp/git/git.el
%%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 @@ share/emacs/site-lisp/git/git.el
%%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
@@ -1414,6 +1410,7 @@ share/git-core/templates/info/exclude
%%GUI%%share/git-gui/lib/msgs/ja.msg
%%GUI%%share/git-gui/lib/msgs/nb.msg
%%GUI%%share/git-gui/lib/msgs/pt_br.msg
+%%GUI%%share/git-gui/lib/msgs/pt_pt.msg
%%GUI%%share/git-gui/lib/msgs/ru.msg
%%GUI%%share/git-gui/lib/msgs/sv.msg
%%GUI%%share/git-gui/lib/msgs/vi.msg
@@ -1443,6 +1440,7 @@ share/git-core/templates/info/exclude
%%GUI%%share/gitk/lib/msgs/it.msg
%%GUI%%share/gitk/lib/msgs/ja.msg
%%GUI%%share/gitk/lib/msgs/pt_br.msg
+%%GUI%%share/gitk/lib/msgs/pt_pt.msg
%%GUI%%share/gitk/lib/msgs/ru.msg
%%GUI%%share/gitk/lib/msgs/sv.msg
%%GUI%%share/gitk/lib/msgs/vi.msg
generated by cgit (git 2.34.1) at 2024-12-02 23:34:55 +0800