Skip to content

Commit b61957a

Browse files
committed
git: update to 2.52.0
- add osxkeychain patch fix from @barracuda156
1 parent f01d515 commit b61957a

File tree

2 files changed

+10
-24
lines changed

2 files changed

+10
-24
lines changed

devel/git/Portfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ legacysupport.newest_darwin_requires_legacy 11
1111
name git
1212
# NOTE: Update the DEVEL version first before updating this RELEASE version,
1313
# to verify that the intended version builds on all platforms.
14-
version 2.51.1
14+
version 2.52.0
1515
revision 0
1616

1717
description A fast version control system
@@ -61,13 +61,13 @@ if {${name} eq ${subport}} {
6161
git-manpages-${version}${extract.suffix}
6262

6363
checksums git-${version}${extract.suffix} \
64-
rmd160 87a0ace578cdaf934e0e5a27f25a1e5a790035b2 \
65-
sha256 a83fd9ffaed7eee679ed92ceb06f75b4615ebf66d3ac4fbdbfbc9567dc533f4a \
66-
size 7865216 \
64+
rmd160 2cc7283f8e9ee453b658a2c6309f9751f62f1089 \
65+
sha256 3cd8fee86f69a949cb610fee8cd9264e6873d07fa58411f6060b3d62729ed7c5 \
66+
size 7957064 \
6767
git-manpages-${version}${extract.suffix} \
68-
rmd160 3b2a8f34efbfb397fdd84848dcf7020a04f7729e \
69-
sha256 07a3fd7d3f9c305643b60d7899807d9c0474dc96f7d2a73c7887f327c258f22e \
70-
size 602552
68+
rmd160 a0f5aa8c561291735b862c38e50ec2c6d8581678 \
69+
sha256 23186deddb3083bbaa9eb947cde26a5c7322d7fdb75bb4b3d60795db38221ac5 \
70+
size 607864
7171

7272
extract.only git-${version}${extract.suffix} \
7373
git-manpages-${version}${extract.suffix}
@@ -281,9 +281,9 @@ variant doc description {Install HTML and plaintext documentation} {
281281
# RELEASE
282282
distfiles-append git-htmldocs-${version}${extract.suffix}
283283
checksums-append git-htmldocs-${version}${extract.suffix} \
284-
rmd160 89458fc6b9bc45e92ef0dd16664a1d986eb919eb \
285-
sha256 524122af16a2c816dc6298f0cea1b761a840d76977e74de2bfffcdbdabc9dc0d \
286-
size 1629412
284+
rmd160 02f5cbfbb86b31a2b6dd1034da84816585b6f609 \
285+
sha256 e6efd0da47a15b6a59401c8c5c8944e4315b18a176b89bb57812778d6307be84 \
286+
size 1657524
287287

288288
patchfiles-append patch-git-subtree.html.diff
289289

devel/git/files/patch-Revert-breaking-osxkeychain.diff

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@ This reverts commit b201316835bbf2c49c2780f23cfd6146f6b8d1a2.
2222
.../osxkeychain/git-credential-osxkeychain.c | 390 +++---------------
2323
2 files changed, 69 insertions(+), 324 deletions(-)
2424

25-
diff --git a/contrib/credential/osxkeychain/Makefile b/contrib/credential/osxkeychain/Makefile
26-
index 238f5f8c36..4b3a08a2ba 100644
27-
--- a/contrib/credential/osxkeychain/Makefile
28-
+++ b/contrib/credential/osxkeychain/Makefile
29-
@@ -8,8 +8,7 @@ CFLAGS = -g -O2 -Wall
30-
-include ../../../config.mak
31-
32-
git-credential-osxkeychain: git-credential-osxkeychain.o
33-
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) \
34-
- -framework Security -framework CoreFoundation
35-
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -Wl,-framework -Wl,Security
36-
37-
git-credential-osxkeychain.o: git-credential-osxkeychain.c
38-
$(CC) -c $(CFLAGS) $<
3925
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
4026
index 1c8310d7fe..5f2e5f16c8 100644
4127
--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c

0 commit comments

Comments
 (0)