Index: head/devel/git-cinnabar/files/patch-git-2.23 =================================================================== --- head/devel/git-cinnabar/files/patch-git-2.23 (revision 523403) +++ head/devel/git-cinnabar/files/patch-git-2.23 (nonexistent) @@ -1,67 +0,0 @@ -https://github.com/glandium/git-cinnabar/commit/567078fb6031 - ---- helper/GIT-VERSION.mk.orig 2019-07-01 04:57:48 UTC -+++ helper/GIT-VERSION.mk -@@ -1,2 +1,2 @@ --GIT_VERSION ?= v2.22.0 -+GIT_VERSION ?= v2.23.0 - WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 ---- helper/cinnabar-fast-import.c.orig 2019-07-01 04:57:48 UTC -+++ helper/cinnabar-fast-import.c -@@ -247,7 +247,8 @@ static uintmax_t parse_mark_ref(const char *p, char ** - if (path_end) { - unsigned short mode; - char *path = xstrndup(*endptr, path_end - *endptr); -- if (!get_tree_entry(note, path, &git_oid, &mode)) -+ if (!get_tree_entry(the_repository, note, path, -+ &git_oid, &mode)) - note = &git_oid; - else - note = &empty_tree; ---- helper/cinnabar-helper.c.orig 2019-07-01 04:57:48 UTC -+++ helper/cinnabar-helper.c -@@ -1605,7 +1605,7 @@ static void upgrade_manifest_tree_v1(const struct obje - struct oid_map_entry k, *old2new; - - oidcpy(&k.old_oid, tree_id); -- hashmap_entry_init(&k.ent, sha1hash(k.old_oid.hash)); -+ hashmap_entry_init(&k.ent, oidhash(&k.old_oid)); - old2new = hashmap_get(cache, &k, NULL); - if (!old2new) { - struct strbuf tree_buf = STRBUF_INIT; -@@ -1748,7 +1748,7 @@ static void upgrade_manifest(struct commit *commit, - struct oid_map_entry k; - struct commit *p; - oidcpy(&k.old_oid, &commit->parents->item->object.oid); -- hashmap_entry_init(&k.ent, sha1hash(k.old_oid.hash)); -+ hashmap_entry_init(&k.ent, oidhash(&k.old_oid)); - entry = hashmap_get(&track->commit_cache, &k, NULL); - if (!entry) - die("Something went wrong"); -@@ -1784,7 +1784,7 @@ static void upgrade_manifest(struct commit *commit, - struct oid_map_entry k; - if (get_oid_hex(cursor, &k.old_oid)) - die("Invalid sha1"); -- hashmap_entry_init(&k.ent, sha1hash(k.old_oid.hash)); -+ hashmap_entry_init(&k.ent, oidhash(&k.old_oid)); - entry = hashmap_get(&track->commit_cache, &k, NULL); - if (!entry) - die("Something went wrong"); -@@ -1794,7 +1794,7 @@ static void upgrade_manifest(struct commit *commit, - } - - entry = xmalloc(sizeof(*entry)); -- hashmap_entry_init(&entry->ent, sha1hash(commit->object.oid.hash)); -+ hashmap_entry_init(&entry->ent, oidhash(&commit->object.oid)); - oidcpy(&entry->old_oid, &commit->object.oid); - store_git_commit(&new_commit, &entry->new_oid); - hashmap_add(&track->commit_cache, entry); -@@ -1950,7 +1950,7 @@ static void recurse_create_git_tree(const struct objec - { - struct oid_map_entry k, *cache_entry; - -- hashmap_entry_init(&k.ent, sha1hash(tree_id->hash)); -+ hashmap_entry_init(&k.ent, oidhash(tree_id)); - oidcpy(&k.old_oid, tree_id); - cache_entry = hashmap_get(cache, &k, NULL); - if (!cache_entry) { Property changes on: head/devel/git-cinnabar/files/patch-git-2.23 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/git-cinnabar/files/patch-git-2.24 =================================================================== --- head/devel/git-cinnabar/files/patch-git-2.24 (revision 523403) +++ head/devel/git-cinnabar/files/patch-git-2.24 (nonexistent) @@ -1,164 +0,0 @@ -https://github.com/glandium/git-cinnabar/commit/3a70616bca72 - ---- helper/GIT-VERSION.mk.orig 2019-07-01 04:57:48 UTC -+++ helper/GIT-VERSION.mk -@@ -1,2 +1,2 @@ --GIT_VERSION ?= v2.23.0 -+GIT_VERSION ?= v2.24.0 - WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 ---- helper/cinnabar-helper.c.orig 2019-07-01 04:57:48 UTC -+++ helper/cinnabar-helper.c -@@ -1578,21 +1578,25 @@ struct oid_map_entry { - struct object_id new_oid; - }; - --static int old2new_manifest_tree_cmp(const void *cmpdata, const void *e1, -- const void *e2, const void *keydata) -+static int old2new_manifest_tree_cmp(const void *cmpdata, const struct hashmap_entry *e1, -+ const struct hashmap_entry *e2, const void *keydata) - { -- const struct old2new_manifest_tree *entry1 = e1; -- const struct old2new_manifest_tree *entry2 = e2; -+ const struct old2new_manifest_tree *entry1 = -+ container_of(e1, const struct old2new_manifest_tree, ent); -+ const struct old2new_manifest_tree *entry2 = -+ container_of(e2, const struct old2new_manifest_tree, ent); - - return memcmp(&entry1->old_tree, &entry2->old_tree, - sizeof(struct old_manifest_tree)); - } - --static int oid_map_entry_cmp(const void *cmpdata, const void *e1, -- const void *e2, const void *keydata) -+static int oid_map_entry_cmp(const void *cmpdata, const struct hashmap_entry *e1, -+ const struct hashmap_entry *e2, const void *keydata) - { -- const struct oid_map_entry *entry1 = e1; -- const struct oid_map_entry *entry2 = e2; -+ const struct oid_map_entry *entry1 = -+ container_of(e1, const struct oid_map_entry, ent); -+ const struct oid_map_entry *entry2 = -+ container_of(e2, const struct oid_map_entry, ent); - - return oidcmp(&entry1->old_oid, &entry2->old_oid); - } -@@ -1606,7 +1610,7 @@ static void upgrade_manifest_tree_v1(const struct obje - - oidcpy(&k.old_oid, tree_id); - hashmap_entry_init(&k.ent, oidhash(&k.old_oid)); -- old2new = hashmap_get(cache, &k, NULL); -+ old2new = hashmap_get_entry(cache, &k, ent, NULL); - if (!old2new) { - struct strbuf tree_buf = STRBUF_INIT; - struct strbuf entry_buf = STRBUF_INIT; -@@ -1649,7 +1653,7 @@ static void upgrade_manifest_tree_v1(const struct obje - store_git_tree(&tree_buf, reference, &old2new->new_oid); - strbuf_release(&tree_buf); - strbuf_release(&entry_buf); -- hashmap_add(cache, old2new); -+ hashmap_add(cache, &old2new->ent); - - free_tree_buffer(tree); - if (ref_state.tree) -@@ -1667,7 +1671,7 @@ static void upgrade_manifest_tree(struct old_manifest_ - - hashmap_entry_init(&k.ent, memhash(tree, sizeof(*tree))); - k.old_tree = *tree; -- old2new = hashmap_get(cache, &k, NULL); -+ old2new = hashmap_get_entry(cache, &k, ent, NULL); - if (!old2new) { - struct old_manifest_tree_state state; - struct old_manifest_entry entry; -@@ -1712,7 +1716,7 @@ static void upgrade_manifest_tree(struct old_manifest_ - store_git_tree(&tree_buf, reference, &old2new->new_tree); - strbuf_release(&tree_buf); - strbuf_release(&entry_buf); -- hashmap_add(cache, old2new); -+ hashmap_add(cache, &old2new->ent); - - free_tree_buffer(state.tree_git); - free_tree_buffer(state.tree_hg); -@@ -1749,7 +1753,7 @@ static void upgrade_manifest(struct commit *commit, - struct commit *p; - oidcpy(&k.old_oid, &commit->parents->item->object.oid); - hashmap_entry_init(&k.ent, oidhash(&k.old_oid)); -- entry = hashmap_get(&track->commit_cache, &k, NULL); -+ entry = hashmap_get_entry(&track->commit_cache, &k, ent, NULL); - if (!entry) - die("Something went wrong"); - p = lookup_commit(the_repository, &entry->new_oid); -@@ -1785,7 +1789,7 @@ static void upgrade_manifest(struct commit *commit, - if (get_oid_hex(cursor, &k.old_oid)) - die("Invalid sha1"); - hashmap_entry_init(&k.ent, oidhash(&k.old_oid)); -- entry = hashmap_get(&track->commit_cache, &k, NULL); -+ entry = hashmap_get_entry(&track->commit_cache, &k, ent, NULL); - if (!entry) - die("Something went wrong"); - oid_to_hex_r(cursor, &entry->new_oid); -@@ -1797,7 +1801,7 @@ static void upgrade_manifest(struct commit *commit, - hashmap_entry_init(&entry->ent, oidhash(&commit->object.oid)); - oidcpy(&entry->old_oid, &commit->object.oid); - store_git_commit(&new_commit, &entry->new_oid); -- hashmap_add(&track->commit_cache, entry); -+ hashmap_add(&track->commit_cache, &entry->ent); - oidset_insert(&track->manifests, &entry->new_oid); - - get_manifest_oid(commit, &oid); -@@ -1932,8 +1936,8 @@ static void do_upgrade(struct string_list *args) - free_tree_buffer(get_commit_tree(manifest_commit)); - } - } -- hashmap_free(&track.commit_cache, 1); -- hashmap_free(&track.tree_cache, 1); -+ hashmap_free_entries(&track.commit_cache, struct oid_map_entry, ent); -+ hashmap_free_entries(&track.tree_cache, struct oid_map_entry, ent); - oidset_clear(&track.manifests); - stop_progress(&track.progress); - } -@@ -1952,7 +1956,7 @@ static void recurse_create_git_tree(const struct objec - - hashmap_entry_init(&k.ent, oidhash(tree_id)); - oidcpy(&k.old_oid, tree_id); -- cache_entry = hashmap_get(cache, &k, NULL); -+ cache_entry = hashmap_get_entry(cache, &k, ent, NULL); - if (!cache_entry) { - struct manifest_tree_state state; - struct manifest_tree_state ref_state = { NULL, }; -@@ -2017,7 +2021,7 @@ static void recurse_create_git_tree(const struct objec - cache_entry->old_oid = k.old_oid; - store_git_tree(tree_buf, reference, &cache_entry->new_oid); - strbuf_release(&tree_buf_); -- hashmap_add(cache, cache_entry); -+ hashmap_add(cache, &cache_entry->ent); - } - - if (state.tree) -@@ -2277,7 +2281,7 @@ static void do_reload(struct string_list *args) - - oidset_clear(&hg2git_seen); - -- hashmap_free(&git_tree_cache, 1); -+ hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); - hashmap_init(&git_tree_cache, oid_map_entry_cmp, NULL, 0); - - oid_array_clear(&manifest_heads); -@@ -2450,7 +2454,7 @@ int cmd_main(int argc, const char *argv[]) - - oidset_clear(&hg2git_seen); - -- hashmap_free(&git_tree_cache, 1); -+ hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent); - - return 0; - } ---- helper/curl-compat.c.orig 2019-07-01 04:57:48 UTC -+++ helper/curl-compat.c -@@ -6,6 +6,7 @@ void curl_easy_setopt() {} - void curl_easy_strerror() {} - void curl_global_cleanup() {} - void curl_global_init() {} -+void curl_global_init_mem() {} - void curl_multi_add_handle() {} - void curl_multi_cleanup() {} - void curl_multi_fdset() {} Property changes on: head/devel/git-cinnabar/files/patch-git-2.24 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/git-cinnabar/files/patch-git-2.25 =================================================================== --- head/devel/git-cinnabar/files/patch-git-2.25 (revision 523403) +++ head/devel/git-cinnabar/files/patch-git-2.25 (nonexistent) @@ -1,67 +0,0 @@ -https://github.com/glandium/git-cinnabar/commit/ea76c73d222e - ---- helper/cinnabar-fast-import.c.orig 2019-07-01 04:57:48 UTC -+++ helper/cinnabar-fast-import.c -@@ -588,7 +588,7 @@ static void store_file(struct rev_chunk *chunk) - while (rev_diff_iter_next(&diff)) { - if (diff.start > last_file.file.len || diff.start < last_end) - die("Malformed file chunk for %s", -- sha1_to_hex(chunk->node->hash)); -+ hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1])); - strbuf_add(&data, last_file.file.buf + last_end, - diff.start - last_end); - strbuf_addbuf(&data, &diff.data); -@@ -598,7 +598,7 @@ static void store_file(struct rev_chunk *chunk) - - if (last_file.file.len < last_end) - die("Malformed file chunk for %s", -- sha1_to_hex(chunk->node->hash)); -+ hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1])); - - strbuf_add(&data, last_file.file.buf + last_end, - last_file.file.len - last_end); -@@ -702,8 +702,8 @@ static void store_manifest(struct rev_chunk *chunk) - note = get_note_hg(&hg2git, chunk->delta_node); - if (!note) - die("Cannot find delta node %s for %s", -- sha1_to_hex(chunk->delta_node->hash), -- sha1_to_hex(chunk->node->hash)); -+ hash_to_hex_algop(chunk->delta_node->hash, &hash_algos[GIT_HASH_SHA1]), -+ hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1])); - - // TODO: this could be smarter, avoiding to throw everything - // away. But this is what the equivalent fast-import commands -@@ -826,7 +826,7 @@ static void store_manifest(struct rev_chunk *chunk) - strbuf_addstr(&data, "author 0 +0000\n" - "committer 0 +0000\n" - "\n"); -- strbuf_addstr(&data, sha1_to_hex(last_manifest_oid.hash)); -+ strbuf_addstr(&data, hash_to_hex_algop(last_manifest_oid.hash, &hash_algos[GIT_HASH_SHA1])); - store_object(OBJ_COMMIT, &data, NULL, &last_manifest->oid, 0); - strbuf_release(&data); - ensure_notes(&hg2git); -@@ -834,11 +834,11 @@ static void store_manifest(struct rev_chunk *chunk) - add_head(&manifest_heads, &last_manifest->oid); - if ((cinnabar_check & CHECK_MANIFESTS) && - !check_manifest(&last_manifest->oid, NULL)) -- die("sha1 mismatch for node %s", sha1_to_hex(chunk->node->hash)); -+ die("sha1 mismatch for node %s", hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1])); - return; - - malformed: -- die("Malformed manifest chunk for %s", sha1_to_hex(chunk->node->hash)); -+ die("Malformed manifest chunk for %s", hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1])); - } - - static void for_each_changegroup_chunk(FILE *in, int version, ---- helper/hg-connect.c.orig 2019-07-01 04:57:48 UTC -+++ helper/hg-connect.c -@@ -263,7 +263,7 @@ void hg_unbundle(struct hg_connection *conn, struct st - /* XXX: should use hg_object_id-specific function */ - oid_array_for_each_unique(heads, unbundlehash, &ctx); - git_SHA1_Final(sha1, &ctx); -- sha1_to_hex_r(&heads_str[13], sha1); -+ hash_to_hex_algop_r(&heads_str[13], sha1, &hash_algos[GIT_HASH_SHA1]); - } else - heads_str = join_oid_array_hex(heads, ' '); - } else Property changes on: head/devel/git-cinnabar/files/patch-git-2.25 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/git-cinnabar/Makefile =================================================================== --- head/devel/git-cinnabar/Makefile (revision 523403) +++ head/devel/git-cinnabar/Makefile (revision 523404) @@ -1,54 +1,50 @@ # $FreeBSD$ PORTNAME= git-cinnabar -DISTVERSION= 0.5.2 -PORTREVISION= 6 +DISTVERSION= 0.5.3 CATEGORIES= devel - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 9b89584e9d40.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Git remote helper to interact with Mercurial repositories LICENSE= GPLv2 BUILD_DEPENDS= ${NONEXISTENT}:devel/git:configure RUN_DEPENDS= git:devel/git \ hg:devel/mercurial USE_GITHUB= yes GH_ACCOUNT= glandium USES= gmake python:2.7,run shebangfix SHEBANG_LANG= python2.7 SHEBANG_FILES= ${PORTNAME} git-remote-hg ALL_TARGET= ${PORTNAME}-helper .ifnmake describe MAKE_ENV!= ${MAKE} -V MAKE_ENV -C ${.CURDIR}/../git MAKE_ARGS!= ${MAKE} -V MAKE_ARGS -C ${.CURDIR}/../git .endif MAKE_ENV+= PYTHON_PATH="${PYTHON_CMD}" MAKE_ARGS+= SUBMODULE_STATUS=dummy DATADIR= ${PREFIX}/libexec/git-core PORTDATA= * PORTDOCS= README.md OPTIONS_DEFINE= DOCS post-configure: @${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \ ${TAR} xof - -C${WRKSRC}/git-core do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \ ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \ ${STAGEDIR}${DATADIR}/pythonlib) (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/devel/git-cinnabar/distinfo =================================================================== --- head/devel/git-cinnabar/distinfo (revision 523403) +++ head/devel/git-cinnabar/distinfo (revision 523404) @@ -1,5 +1,3 @@ -TIMESTAMP = 1561957068 -SHA256 (glandium-git-cinnabar-0.5.2_GH0.tar.gz) = e88ef4e55a06a7cb770c26f679c6f7c182f7986611cbfede1215c42e34f7031c -SIZE (glandium-git-cinnabar-0.5.2_GH0.tar.gz) = 167168 -SHA256 (9b89584e9d40.patch) = e1ad2c7627d70ddb462d1ad17b6343cfb3e2ac1339ed014d23c0d00a0d1af936 -SIZE (9b89584e9d40.patch) = 831 +TIMESTAMP = 1579313396 +SHA256 (glandium-git-cinnabar-0.5.3_GH0.tar.gz) = 0d01653613585b6a2c8e473b0e9fbb1103e341788ac59b89288f04ac5ac33bfa +SIZE (glandium-git-cinnabar-0.5.3_GH0.tar.gz) = 175612