<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f64c54c3fd31db6d2172840dd37ce8701d49f246">https://github.com/macports/macports-ports/commit/f64c54c3fd31db6d2172840dd37ce8701d49f246</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f64c54c git: update to 2.17.1
</span>f64c54c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f64c54c3fd31db6d2172840dd37ce8701d49f246
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed May 30 01:55:52 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> git: update to 2.17.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes CVE-2018-11235
</span>---
devel/git/Portfile | 17 ++++++++++-------
devel/git/files/git-subtree.1.diff | 8 ++++----
devel/git/files/git-subtree.html.diff | 4 ++--
3 files changed, 16 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/Portfile b/devel/git/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1f46fb..44d286a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
name git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.17.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.17.1
</span>
description A fast version control system
long_description Git is a fast, scalable, distributed open source version \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,13 @@ distfiles git-${version}${extract.suffix} \
</span> git-manpages-${version}${extract.suffix}
checksums git-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d419c1d8cb9aaf976853ae088e8b1a72cb5ddd38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8b0e973822ca721d9189ce13b7baf49677f98efb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5015484 \
</span> git-manpages-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0232e6e7f542d3d9ee47f8ff6ec0fe11dfbf0b9a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4bdab1aed88ad7a12a766de8e03047eba5afbba9874c7effa5059e5481943727 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d303f7623c33072d771534049a8e0b99e30313e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 83d54786ea634488458486f262cb5157629a898f9d45f5d86b302aac79ceef54 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 419400
</span>
perl5.require_variant yes
perl5.conflict_variants no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,8 +145,9 @@ variant pcre {
</span> variant doc description {Install HTML and plaintext documentation} {
distfiles-append git-htmldocs-${version}${extract.suffix}
checksums-append git-htmldocs-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 75325862f74abd9989d9225da82637d1e6fd9ad7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 66d055e15c2f0034379b4a8c5280762a5dff5b4fc99daefa43404dab2f8fc308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 14eff1d06307f49230e1c46d3193ba86b92a1be1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 945b1c8c8761e7c17ca39ce0fc5af94d2b238da37f8d2b1823c65302cfa4d275 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1173296
</span>
patchfiles-append git-subtree.html.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/git-subtree.1.diff b/devel/git/files/git-subtree.1.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e7d7d1..8013918 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/git-subtree.1.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/git-subtree.1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,12 @@
</span> +.\" Title: git-subtree
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\" Date: 10/30/2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.\" Date: 05/29/2018
</span> +.\" Manual: Git Manual
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\" Source: Git 2.17.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.\" Source: Git 2.17.1
</span> +.\" Language: English
+.\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.TH "GIT\-SUBTREE" "1" "10/30/2017" "Git 2\&.17\&.0" "Git Manual"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.TH "GIT\-SUBTREE" "1" "05/29/2018" "Git 2\&.17\&.1" "Git Manual"
</span> +.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@
</span> +.sp
+For example, you could include the source code for a library as a subdirectory of your application\&.
+.sp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+Subtrees are not to be confused with submodules, which are meant for the same task\&. Unlike submodules, subtrees do not need any special constructions (like \&.gitmodule files or gitlinks) be present in your repository, and do not force end\-users of your repository to do anything special or to understand how subtrees work\&. A subtree is just a subdirectory that can be committed to, branched, and merged along with your project in any way you want\&.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Subtrees are not to be confused with submodules, which are meant for the same task\&. Unlike submodules, subtrees do not need any special constructions (like \&.gitmodules files or gitlinks) be present in your repository, and do not force end\-users of your repository to do anything special or to understand how subtrees work\&. A subtree is just a subdirectory that can be committed to, branched, and merged along with your project in any way you want\&.
</span> +.sp
+They are also not to be confused with using the subtree merge strategy\&. The main difference is that, besides merging the other project as a subdirectory, you can also extract the entire history of a subdirectory from your project and make it into a standalone project\&. Unlike the subtree merge strategy you can alternate back and forth between these two operations\&. If the standalone library gets updated, you can automatically merge the changes into your project; if you update the li [...]
+.sp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/git-subtree.html.diff b/devel/git/files/git-subtree.html.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 01c59be..07d7f6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/git-subtree.html.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/git-subtree.html.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -771,7 +771,7 @@
</span> +as a subdirectory of your application.</p></div>
+<div class="paragraph"><p>Subtrees are not to be confused with submodules, which are meant for
+the same task. Unlike submodules, subtrees do not need any special
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+constructions (like .gitmodule files or gitlinks) be present in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++constructions (like .gitmodules files or gitlinks) be present in
</span> +your repository, and do not force end-users of your
+repository to do anything special or to understand how subtrees
+work. A subtree is just a subdirectory that can be
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1201,7 +1201,7 @@
</span> +<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+Last updated 2017-10-30 05:56:17 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Last updated 2018-05-29 08:14:06 UTC
</span> +</div>
+</div>
+</body>
</pre><pre style='margin:0'>
</pre>