<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fcee754e1c8a321a2e147a0b740053c775f9001a">https://github.com/macports/macports-ports/commit/fcee754e1c8a321a2e147a0b740053c775f9001a</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 fcee754e1c8 git: update to 2.46.1
</span>fcee754e1c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fcee754e1c8a321a2e147a0b740053c775f9001a
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sun Sep 15 12:21:01 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> git: update to 2.46.1
</span>---
devel/git/Portfile | 20 ++++++++++----------
.../git/files/patch-Revert-breaking-osxkeychain.diff | 17 ++++++++++-------
2 files changed, 20 insertions(+), 17 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 3e0b260645c..da61e15daf5 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;'>@@ -10,7 +10,7 @@ legacysupport.newest_darwin_requires_legacy 11
</span> name git
# NOTE: Update the DEVEL version first before updating this RELEASE version,
# to verify that the intended version builds on all platforms.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.46.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.46.1
</span> revision 0
description A fast version control system
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,13 +60,13 @@ if {${name} eq ${subport}} {
</span> git-manpages-${version}${extract.suffix}
checksums git-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 700669ddacf7fe2e2bc1acf0df78fb3e93f98841 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7f123462a28b7ca3ebe2607485f7168554c2b10dfc155c7ec46300666ac27f95 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7577180 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5fb81f5cfd0c0c20d0f49bed265a1db8c2e67993 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 888cafb8bd6ab4cbbebc168040a8850eb088f81dc3ac2617195cfc0877f0f543 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7582036 \
</span> git-manpages-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 53fa19cf1132e9caf924f5e1059f27f75248b562 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dc118b1d4036e58d5cc4f4e804d903e1e137dac3e9826a246a7e517afd877bd3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 585072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5b4e72af1c48e9d41642556f6fd8d8786d2b8519 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3c52e4bae0a737e9c8061afdb45f0a6f24ebc6368dac01aec89fdde63c11bf6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 584836
</span>
extract.only git-${version}${extract.suffix} \
git-manpages-${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,9 +279,9 @@ variant doc description {Install HTML and plaintext documentation} {
</span> # RELEASE
distfiles-append git-htmldocs-${version}${extract.suffix}
checksums-append git-htmldocs-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1517778d69ff7da3974675417ab5fa2f0b02ee8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 175d756b9d5eda6656c8067c7f8f80f15bd0cd9f908c3c4995ee6fe8a4182104 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1594172
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 803849335f227e9c25c9f66004bafc8fc5524a42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 35243bb8c7a9b71e598cadb200789c67d7900a17012b93f3c5c2a89c8b90ec75 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1552632
</span>
patchfiles-append patch-git-subtree.html.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/patch-Revert-breaking-osxkeychain.diff b/devel/git/files/patch-Revert-breaking-osxkeychain.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cb6949f63c..1133d309b88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/patch-Revert-breaking-osxkeychain.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/files/patch-Revert-breaking-osxkeychain.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b03bfe5fdf5e7d19b90afd268f6aaf3fee69a845 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ac042352b4910134c4c4d74b68f30061bde145b1 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <barracuda@macos-powerpc.org>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 19 Jul 2024 08:54:09 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Revert commits breaking macOS keychain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 15 Sep 2024 15:44:12 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Revert breaking osxkeychain
</span>
This reverts commit e1ab45b2dab51f94db9548666dfd7af626d2aa7e.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,12 +14,15 @@ This reverts commit e3cef40db89f5a7c91f4e9d6c4959ca1e41f4647.
</span> This reverts commit 9032bcad82f45a403e4a8de86e1fcb4bfd1ab282.
This reverts commit 9abe31f5f161be4d69118bdfae00103cd6efa510.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This reverts commit b201316835bbf2c49c2780f23cfd6146f6b8d1a2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ---
contrib/credential/osxkeychain/Makefile | 3 +-
.../osxkeychain/git-credential-osxkeychain.c | 390 +++---------------
2 files changed, 69 insertions(+), 324 deletions(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git contrib/credential/osxkeychain/Makefile contrib/credential/osxkeychain/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/contrib/credential/osxkeychain/Makefile b/contrib/credential/osxkeychain/Makefile
</span> index 238f5f8c36..4b3a08a2ba 100644
--- a/contrib/credential/osxkeychain/Makefile
+++ b/contrib/credential/osxkeychain/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +36,8 @@ index 238f5f8c36..4b3a08a2ba 100644
</span>
git-credential-osxkeychain.o: git-credential-osxkeychain.c
$(CC) -c $(CFLAGS) $<
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git contrib/credential/osxkeychain/git-credential-osxkeychain.c contrib/credential/osxkeychain/git-credential-osxkeychain.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6ce22a28ed..5f2e5f16c8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1c8310d7fe..5f2e5f16c8 100644
</span> --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
@@ -3,52 +3,14 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +210,7 @@ index 6ce22a28ed..5f2e5f16c8 100644
</span> - username_buf,
- buffer_len,
- ENCODING)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- write_item("username", username_buf, buffer_len - 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- write_item("username", username_buf, strlen(username_buf));
</span> - }
- free(username_buf);
+ write_item("username", attr.data, attr.length);
</pre><pre style='margin:0'>
</pre>