Skip to content

Commit

Permalink
git-devel: update to 2.45.0-rc0
Browse files Browse the repository at this point in the history
  • Loading branch information
@herbygillot
herbygillot committed Apr 19, 2024
1 parent 1a8ea93 commit e21cd2a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions devel/git/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ long_description Git is a fast, scalable, distributed open source version \
subport ${name}-devel {
PortGroup github 1.0

github.setup git git 2.44.0 v
github.setup git git 2.45.0-rc0 v
github.tarball_from archive
revision 0

Expand Down Expand Up @@ -77,9 +77,9 @@ if {${name} eq ${subport}} {
# DEVELOPMENT VERSION

checksums ${distname}${extract.suffix} \
rmd160 83166f3170bf6940a06f91647ea84bee92fddf8c \
sha256 318b9234cb188628c773e021bdfc5cf23e9963e29eb940b05cefd71bfc8d9a1a \
size 11037128
rmd160 183c5784c27339aaddff9a024e47cce4ab45ba29 \
sha256 ab90fbdf3ae669c4709c0004aabef008bd4760305874d85fc75c66e1f3173a81 \
size 11101794

depends_build-append \
port:asciidoc \
Expand Down

6 comments on commit e21cd2a

@herbygillot
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barracuda156 Seeing the following on 10.6 trying to build the RC for the next version of git (git-devel):

make: Leaving directory `/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_devel_git/git-devel/work/git-2.45.0-rc0'
DEBUG: Executing proc-post-org.macports.build-build-0
DEBUG: system -W /opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_devel_git/git-devel/work/git-2.45.0-rc0/contrib/credential/osxkeychain: make CFLAGS="-Os -std=gnu99 -arch x86_64" LDFLAGS="-Wl,-headerpad_max_install_names -L/opt/local/lib -lMacportsLegacySupport -arch x86_64" CC=/opt/local/bin/clang-mp-11 prefix=/opt/local CURLDIR=/opt/local ICONVDIR=/opt/local NO_FINK=1 NO_DARWIN_PORTS=1 NO_R_TO_GCC_LINKER=1 V=1 PERL_PATH="/opt/local/bin/perl5.34" NO_PERL_CPAN_FALLBACK=1 LIBPCREDIR=/opt/local USE_LIBPCRE2=1
/opt/local/bin/clang-mp-11 -c -Os -std=gnu99 -arch x86_64 git-credential-osxkeychain.c
git-credential-osxkeychain.c:120:43: error: use of undeclared identifier 'kSecAttrAccount'
        account_ref = CFDictionaryGetValue(item, kSecAttrAccount);
                                                 ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecClass'
        attrs = CREATE_SEC_ATTRIBUTES(kSecMatchLimit, kSecMatchLimitOne,
                ^
git-credential-osxkeychain.c:97:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecClass, kSecClassInternetPassword, \
                          ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecClassInternetPassword'
git-credential-osxkeychain.c:97:17: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecClass, kSecClassInternetPassword, \
                                     ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecAttrServer'
git-credential-osxkeychain.c:98:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecAttrServer, host, \
                          ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecAttrAccount'
git-credential-osxkeychain.c:99:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecAttrAccount, username, \
                          ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecAttrPath'
git-credential-osxkeychain.c:100:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecAttrPath, path, \
                          ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecAttrPort'
git-credential-osxkeychain.c:101:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecAttrPort, port, \
                          ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecAttrProtocol'
git-credential-osxkeychain.c:102:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecAttrProtocol, protocol, \
                          ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecAttrAuthenticationType'
git-credential-osxkeychain.c:103:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecAttrAuthenticationType, \
                          ^
git-credential-osxkeychain.c:155:10: error: use of undeclared identifier 'kSecAttrAuthenticationTypeDefault'
git-credential-osxkeychain.c:104:6: note: expanded from macro 'CREATE_SEC_ATTRIBUTES'
                          kSecAttrAuthenticationTypeDefault, \
                          ^
git-credential-osxkeychain.c:155:32: error: use of undeclared identifier 'kSecMatchLimit'
        attrs = CREATE_SEC_ATTRIBUTES(kSecMatchLimit, kSecMatchLimitOne,
                                      ^
git-credential-osxkeychain.c:155:48: error: use of undeclared identifier 'kSecMatchLimitOne'
        attrs = CREATE_SEC_ATTRIBUTES(kSecMatchLimit, kSecMatchLimitOne,
                                                      ^
git-credential-osxkeychain.c:156:11: error: use of undeclared identifier 'kSecReturnAttributes'
                                      kSecReturnAttributes, kCFBooleanTrue,
                                      ^
git-credential-osxkeychain.c:157:11: error: use of undeclared identifier 'kSecReturnData'
                                      kSecReturnData, kCFBooleanTrue,
                                      ^
git-credential-osxkeychain.c:159:11: warning: implicit declaration of function 'SecItemCopyMatching' is invalid in C99 [-Wimplicit-function-declaration]
        result = SecItemCopyMatching(attrs, (CFTypeRef *)&item);
                 ^
git-credential-osxkeychain.c:164:36: error: use of undeclared identifier 'kSecValueData'
        data = CFDictionaryGetValue(item, kSecValueData);
                                          ^
git-credential-osxkeychain.c:195:7: error: use of undeclared identifier 'kSecClass'
                                         kSecClass, kSecClassInternetPassword,
                                         ^
git-credential-osxkeychain.c:195:18: error: use of undeclared identifier 'kSecClassInternetPassword'
                                         kSecClass, kSecClassInternetPassword,
                                                    ^
git-credential-osxkeychain.c:196:7: error: use of undeclared identifier 'kSecMatchItemList'
                                         kSecMatchItemList, item_ref_list,
                                         ^
git-credential-osxkeychain.c:209:31: error: use of undeclared identifier 'kSecReturnData'
                CFDictionarySetValue(query, kSecReturnData, kCFBooleanTrue);
                                            ^
git-credential-osxkeychain.c:210:12: warning: implicit declaration of function 'SecItemCopyMatching' is invalid in C99 [-Wimplicit-function-declaration]
                result = SecItemCopyMatching(query, (CFTypeRef *)&data);
                         ^
git-credential-osxkeychain.c:229:14: warning: implicit declaration of function 'SecItemDelete' is invalid in C99 [-Wimplicit-function-declaration]
                                result = SecItemDelete(delete_query);
                                         ^
git-credential-osxkeychain.c:238:12: warning: implicit declaration of function 'SecItemDelete' is invalid in C99 [-Wimplicit-function-declaration]
                result = SecItemDelete(delete_query);
                         ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
4 warnings and 20 errors generated.
make: *** [git-credential-osxkeychain.o] Error 1
Command failed: make CFLAGS="-Os -std=gnu99 -arch x86_64" LDFLAGS="-Wl,-headerpad_max_install_names -L/opt/local/lib -lMacportsLegacySupport -arch x86_64" CC=/opt/local/bin/clang-mp-11 prefix=/opt/local CURLDIR=/opt/local ICONVDIR=/opt/local NO_FINK=1 NO_DARWIN_PORTS=1 NO_R_TO_GCC_LINKER=1 V=1 PERL_PATH="/opt/local/bin/perl5.34" NO_PERL_CPAN_FALLBACK=1 LIBPCREDIR=/opt/local USE_LIBPCRE2=1
Exit code: 2
Error: Failed to build git-devel: command execution failed
DEBUG: Error code: NONE
DEBUG: Backtrace: command execution failed
    while executing
"$post $targetname"
Error: See /opt/local/var/macports/logs/_opt_bblocal_var_buildworker_ports_build_ports_devel_git/git-devel/main.log for details.
Error: Follow https://guide.macports.org/#project.tickets if you believe there is a bug.
Error: Processing of port git-devel failed

@barracuda156
Copy link
Contributor

@barracuda156 barracuda156 commented on e21cd2a Apr 19, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@herbygillot Oh great, we just fixed one thing, and someone has broken another, LOL

Thank you, I will look into this today.

UPD. Ah, it is git itself, not libgit2. Well, oh wow.

@herbygillot
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@herbygillot Oh great, we just fixed one thing, and someone has broken another, LOL

Thank you, I will look into this today.

It's possible this might get fixed in the final release for 2.45.0, but good to have a fix ready. We will push the release version of 2.45.0 in git-devel first before updating git itself.

@barracuda156
Copy link
Contributor

@barracuda156 barracuda156 commented on e21cd2a Apr 19, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be raised to upstream too.

A quick look suggests these should be available on 10.6 (well, may be not in pre-release on ppc, but at least in 10.6.8).
https://developer.apple.com/documentation/security/ksecclassinternetpassword
https://developer.apple.com/documentation/security/ksecattraccount

@barracuda156
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@herbygillot https://lore.kernel.org/all/f7031316a043b36fac10ecf784d2294894967e7b.1708212896.git.gitgitgadget@gmail.com/

@herbygillot
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@herbygillot https://lore.kernel.org/all/f7031316a043b36fac10ecf784d2294894967e7b.1708212896.git.gitgitgadget@gmail.com/

Good find.

Please sign in to comment.