Date: Wed, 22 Mar 2017 11:12:46 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436687 - in branches/2017Q1/devel/git: . files Message-ID: <201703221112.v2MBCkc7068094@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Wed Mar 22 11:12:46 2017 New Revision: 436687 URL: https://svnweb.freebsd.org/changeset/ports/436687 Log: MFH: r431794 r433740 r433768 r436592 Remove dependency of DEPRECATED mail/p5-Net-SMTP-SSL from devel/git PR: 214335 Obtained from: git development mailing list Sponsored by: Rubicon Communications (Netgate) Update devel/git to 2.11.1 Sponsored by: Rubicon Communications (Netgate) Fix devel/git PLIST when HTMLDOCS is on Reported by: dankm on IRC - Update devel/git to 2.12.1 - Replace git-send-email patch by a version that works [1] PR: 214335 [1] Submitted by: OlivierW <olivierw1+bugzilla-freebsd@hotmail.com> [1] Sponsored by: Rubicon Communications (Netgate) Approved by: ports-secteam (junovitch) Added: branches/2017Q1/devel/git/files/patch-git-send-email.perl - copied, changed from r431794, head/devel/git/files/patch-git-send-email.perl Modified: branches/2017Q1/devel/git/Makefile branches/2017Q1/devel/git/distinfo branches/2017Q1/devel/git/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/git/Makefile ============================================================================== --- branches/2017Q1/devel/git/Makefile Wed Mar 22 11:11:53 2017 (r436686) +++ branches/2017Q1/devel/git/Makefile Wed Mar 22 11:12:46 2017 (r436687) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.11.0 -PORTREVISION= 3 +DISTVERSION= 2.12.1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -71,8 +70,7 @@ PCRE_LIB_DEPENDS= libpcre.so:devel/pcre 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 Modified: branches/2017Q1/devel/git/distinfo ============================================================================== --- branches/2017Q1/devel/git/distinfo Wed Mar 22 11:11:53 2017 (r436686) +++ branches/2017Q1/devel/git/distinfo Wed Mar 22 11:12:46 2017 (r436687) @@ -1,7 +1,7 @@ -TIMESTAMP = 1480520106 -SHA256 (git-2.11.0.tar.xz) = 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b -SIZE (git-2.11.0.tar.xz) = 4197984 -SHA256 (git-manpages-2.11.0.tar.xz) = b3d3e78829c0b69b727aaca407ecfe239a46db3f354f16189f7a7c10af9528d8 -SIZE (git-manpages-2.11.0.tar.xz) = 399992 -SHA256 (git-htmldocs-2.11.0.tar.xz) = 3975399f1be3d959edf0fded03eab8fbf94787bfd0318b7644c77cf61e4a7b48 -SIZE (git-htmldocs-2.11.0.tar.xz) = 1080584 +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 Copied and modified: branches/2017Q1/devel/git/files/patch-git-send-email.perl (from r431794, head/devel/git/files/patch-git-send-email.perl) ============================================================================== --- head/devel/git/files/patch-git-send-email.perl Wed Jan 18 12:40:53 2017 (r431794, copy source) +++ branches/2017Q1/devel/git/files/patch-git-send-email.perl Wed Mar 22 11:12:46 2017 (r436687) @@ -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. - # 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); + } } - } - Modified: branches/2017Q1/devel/git/pkg-plist ============================================================================== --- branches/2017Q1/devel/git/pkg-plist Wed Mar 22 11:11:53 2017 (r436686) +++ branches/2017Q1/devel/git/pkg-plist Wed Mar 22 11:12:46 2017 (r436687) @@ -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 @@ -626,7 +624,11 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.2.txt +%%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 @@ -905,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 @@ -1123,8 +1123,6 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt -%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.html -%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt @@ -1186,6 +1184,7 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/technical/signature-format.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.html %%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.txt +%%HTMLDOCS%%%%DOCSDIR%%/transfer-data-leaks.txt %%HTMLDOCS%%%%DOCSDIR%%/urls-remotes.txt %%HTMLDOCS%%%%DOCSDIR%%/urls.txt %%HTMLDOCS%%%%DOCSDIR%%/user-manual.html @@ -1210,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 @@ -1220,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 @@ -1254,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 @@ -1285,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 @@ -1363,6 +1360,8 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/svn-fe/svnrdump_sim.py %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh +%%CONTRIB%%share/git-core/contrib/update-unicode/README +%%CONTRIB%%share/git-core/contrib/update-unicode/update_unicode.sh %%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir share/git-core/templates/description share/git-core/templates/hooks/applypatch-msg.sample @@ -1411,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 @@ -1440,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703221112.v2MBCkc7068094>