devel/git-cinnabar: update to 0.5.0.b2.22 Changes: https://github.com/glandium/git-cinnabar/compare/c75b60b...413267f3f11674997
Port details
devel/git-cinnabar0.7.5_2
Git remote helper to interact with Mercurial repositories
- Maintainer
- jbeich@FreeBSD.org
- Packages
- git-cinnabar 0.7.5_2
- Upstream
- up to date
- CPE
- none, CVEs only via VuXML
- WWW
- https://github.com/glandium/git-cinnabar
- Links
- cgit · VuXML
Unaddressed (0) · The CVE record lists this version as affected, no VuXML entry names the CVE
None. There is no CVE without a VuXML entry for this version.
VuXML only (0) · listed, port not fixed yet
None.
pkg audit reports nothing for this version.Fixed (0)
No VuXML entries for this package.
Commits (194)
devel/git-cinnabar: update to 0.5.0.b2.21 Changes: https://github.com/glandium/git-cinnabar/compare/1113749...c75b60bf5ee2c6169
devel/git-cinnabar: update to 0.5.0.b2.16 Changes: https://github.com/glandium/git-cinnabar/compare/826f1d8...11137496b53aeb15f
devel/git-cinnabar: mark BROKEN after r466347
../helper/cinnabar-fast-import.c:9:10: fatal error: 'mru.h' file not found
#include "mru.h"
^~~~~~~
1 error generated.
Regressed by: https://github.com/git/git/commit/ec2dd32c705fc48f871f16devel/git-cinnabar: rebuild after r46536296d74b5508
devel/git-cinnabar: rebuild after r4623464f4dde289d
devel/git-cinnabar: rebuild after r46234617790705fe
devel/git-cinnabar: rebuild after r45965395c9f89bfd
devel/git-cinnabar: update to 0.5.0.b2.12 to unbreak after r459462
./helper/cinnabar-helper.c:405:2: warning: implicit declaration of function 'DIFF_OPT_SET' is invalid in C99 [-Wimplicit-function-declaration]
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
^
./helper/cinnabar-helper.c:405:30: error: use of undeclared identifier 'RECURSIVE'
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
^
Changes: https://github.com/glandium/git-cinnabar/compare/c3e5bce...826f1d8
Reported by: pkg-fallout1d745a68eadevel/git-cinnabar: update to 0.5.0.b2.11 Changes: https://github.com/glandium/git-cinnabar/compare/83b5d99...c3e5bce5b8197bbf2
devel/git-cinnabar: update to 0.5.0.b2.9 Changes: https://github.com/glandium/git-cinnabar/compare/0.5.0b2...83b5d99da87398447
devel/git-cinnabar: mark BROKEN after r453269
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sha1_file.c b/sha1_file.c
|index 9c86d1924..7a1b277c8 100644
|--- a/sha1_file.c
|+++ b/sha1_file.c
--------------------------
Hunk #2 succeeded at 2314 (offset 6 lines).
Patching file /usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.0b2/git-core/sha1_file.c using Plan A...
No such line 2615 in input file, ignoring
done
Hunk #1 failed at 2616.
1 out of 1 hunks failed--saving rejects to helper/sha1_file.patched.c.rej
../helper/cinnabar-fast-import.c:139:13: error: passing 'struct mru' to parameter of incompatible
type 'struct mru *'; take the address with &
mru_append(packed_git_mru, pack_data);
^~~~~~~~~~~~~~
&
./mru.h:41:29: note: passing argument to parameter 'mru' here
void mru_append(struct mru *mru, void *item);
../helper/hg-connect.c:270:50: error: too many arguments to function call, expected 2, have 3
mks_tempfile_ts(tmpfile, "hg-bundle-XXXXXX.hg", 3);
~~~~~~~~~~~~~~~ ^
./tempfile.h:165:1: note: 'mks_tempfile_ts' declared here
static inline struct tempfile *mks_tempfile_ts(const char *template,
^
../helper/hg-connect.c:273:2: warning: implicit declaration of function 'close_tempfile' is invalid
in C99 [-Wimplicit-function-declaration]
close_tempfile(tmpfile);
^
../helper/hg-connect.c:281:18: warning: incompatible pointer types passing 'struct tempfile *' to
parameter of type 'struct tempfile **'; take the address with & [-Wincompatible-pointer-types]
delete_tempfile(tmpfile);
^~~~~~~
&
./tempfile.h:251:47: note: passing argument to parameter 'tempfile_p' here
extern void delete_tempfile(struct tempfile **tempfile_p);
^
../helper/cinnabar-helper.c:216:6: warning: implicit declaration of function 'get_sha1' is invalid in
C99 [-Wimplicit-function-declaration]
if (get_sha1(args->items[0].string, sha1))
^
../helper/cinnabar-helper.c:428:6: warning: implicit declaration of function 'get_sha1_committish' is
invalid in C99 [-Wimplicit-function-declaration]
if (get_sha1_committish(args->items[0].string, sha1))
^
../helper/cinnabar-helper.c:982:7: warning: logical not is only applied to the left hand side of this
bitwise operator [-Wlogical-not-parentheses]
if (!obj->flags & SEEN)
^ ~
../helper/cinnabar-helper.c:982:7: note: add parentheses after the '!' to evaluate the bitwise
operator first
if (!obj->flags & SEEN)
^
( )
../helper/cinnabar-helper.c:982:7: note: add parentheses around left hand side expression to silence
this warning
if (!obj->flags & SEEN)
^
( )
../helper/cinnabar-helper.c:1517:52: error: no member named 'size' in 'struct oidmap'
display_progress(track->progress, track->set.map.size);
~~~~~~~~~~~~~~ ^23f8db1da9devel/git-cinnabar: rebuild after r45270171ae8efe0e
devel/git-cinnabar: rebuild after r4516370ca334a759
devel/git-cinnabar: unbreak6fe3dbb261
devel/git-cinnabar: mark BROKEN after r447721
./helper/cinnabar-fast-import.c:95:41: warning: incompatible pointer types passing 'unsigned char *' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
struct object_entry *oe = find_object((unsigned char *)sha1);
^~~~~~~~~~~~~~~~~~~~~
./helper/fast-import.patched.c:573:59: note: passing argument to parameter 'oid' here
static struct object_entry *find_object(struct object_id *oid)
^
./helper/cinnabar-fast-import.c:105:21: warning: incompatible pointer types passing 'unsigned char *' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
return find_object((unsigned char *)sha1);
^~~~~~~~~~~~~~~~~~~~~
./helper/fast-import.patched.c:573:59: note: passing argument to parameter 'oid' here
static struct object_entry *find_object(struct object_id *oid)
^
./helper/cinnabar-fast-import.c:230:27: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
note = get_note(&hg2git, oid.hash);
^~~~~~~~
./notes.h:144:27: note: passing argument to parameter 'object_oid' here
const struct object_id *object_oid);
^
./helper/cinnabar-fast-import.c:230:7: warning: incompatible pointer types assigning to 'const unsigned char *' from 'const struct object_id *' [-Wincompatible-pointer-types]
note = get_note(&hg2git, oid.hash);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
./helper/cinnabar-fast-import.c:245:18: warning: incompatible pointer types passing 'unsigned char *' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
e = find_object((unsigned char *)note);
^~~~~~~~~~~~~~~~~~~~~
./helper/fast-import.patched.c:573:59: note: passing argument to parameter 'oid' here
static struct object_entry *find_object(struct object_id *oid)
^
./helper/cinnabar-fast-import.c:247:21: warning: incompatible pointer types passing 'unsigned char *' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
e = insert_object((unsigned char *)note);
^~~~~~~~~~~~~~~~~~~~~
./helper/fast-import.patched.c:583:61: note: passing argument to parameter 'oid' here
static struct object_entry *insert_object(struct object_id *oid)
^
./helper/cinnabar-fast-import.c:302:24: error: no member named 'sha1' in 'struct branch'
if (!is_null_sha1(b->sha1)) {
~ ^
./helper/cinnabar-fast-import.c:305:37: error: no member named 'sha1' in 'struct branch'
init_notes(notes, sha1_to_hex(b->sha1),
~ ^
./helper/cinnabar-fast-import.c:373:20: warning: incompatible pointer types passing 'unsigned char const[20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
c = lookup_commit(oid->hash);
^~~~~~~~~
./commit.h:48:54: note: passing argument to parameter 'oid' here
struct commit *lookup_commit(const struct object_id *oid);
^
./helper/cinnabar-fast-import.c:401:35: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
while ((note = get_note(&git2hg, git_id->hash))) {
^~~~~~~~~~~~
./notes.h:144:27: note: passing argument to parameter 'object_oid' here
const struct object_id *object_oid);
^
./helper/cinnabar-fast-import.c:401:15: warning: incompatible pointer types assigning to 'const unsigned char *' from 'const struct object_id *' [-Wincompatible-pointer-types]
while ((note = get_note(&git2hg, git_id->hash))) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./helper/cinnabar-fast-import.c:424:40: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
store_object(OBJ_COMMIT, &buf, NULL, git_id->hash, 0);
^~~~~~~~~~~~
./helper/fast-import.patched.c:1086:20: note: passing argument to parameter 'oidout' here
struct object_id *oidout,
^
./helper/cinnabar-fast-import.c:466:32: error: no member named 'sha1' in 'struct pack_idx_entry'
hashcpy(git_id.hash, oe->idx.sha1);
~~~~~~~ ^
./helper/cinnabar-fast-import.c:473:28: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
note = get_note(&hg2git, hg_id.hash);
^~~~~~~~~~
./notes.h:144:27: note: passing argument to parameter 'object_oid' here
const struct object_id *object_oid);
^
./helper/cinnabar-fast-import.c:473:8: warning: incompatible pointer types assigning to 'const unsigned char *' from 'const struct object_id *' [-Wincompatible-pointer-types]
note = get_note(&hg2git, hg_id.hash);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./helper/cinnabar-fast-import.c:488:19: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
add_note(notes, hg_id.hash, git_id.hash, NULL);
^~~~~~~~~~
./notes.h:124:60: note: passing argument to parameter 'object_oid' here
int add_note(struct notes_tree *t, const struct object_id *object_oid,
^
./helper/cinnabar-fast-import.c:488:31: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
add_note(notes, hg_id.hash, git_id.hash, NULL);
^~~~~~~~~~~
./notes.h:125:27: note: passing argument to parameter 'note_oid' here
const struct object_id *note_oid, combine_notes_fn combine_notes);
^
./helper/cinnabar-fast-import.c:520:36: warning: incompatible pointer types passing 'const unsigned char *' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
tree_content_set(tree, note_path, note_sha1, mode, NULL);
^~~~~~~~~
./helper/fast-import.patched.c:1549:26: note: passing argument to parameter 'oid' here
const struct object_id *oid,
^
./helper/cinnabar-fast-import.c:534:21: warning: incompatible pointer types passing 'int (const unsigned char *, const unsigned char *, char *, void *)' to parameter of type 'each_note_fn *' (aka 'int (*)(const struct object_id *, const struct object_id *, char *, void *)') [-Wincompatible-pointer-types]
store_each_note, tree))
^~~~~~~~~~~~~~~
./notes.h:208:65: note: passing argument to parameter 'fn' here
int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
^
./helper/cinnabar-fast-import.c:537:43: error: no member named 'sha1' in 'struct tree_entry_ms'
hashcpy(result->hash, tree->versions[1].sha1);
~~~~~~~~~~~~~~~~~ ^
./helper/cinnabar-fast-import.c:551:49: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
store_object(OBJ_BLOB, &file->metadata, NULL, sha1, 0);
^~~~
./helper/fast-import.patched.c:1086:20: note: passing argument to parameter 'oidout' here
struct object_id *oidout,
^
./helper/cinnabar-fast-import.c:553:25: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
add_note(&files_meta, file->sha1, sha1, NULL);
^~~~~~~~~~
./notes.h:124:60: note: passing argument to parameter 'object_oid' here
int add_note(struct notes_tree *t, const struct object_id *object_oid,
^
./helper/cinnabar-fast-import.c:553:37: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
add_note(&files_meta, file->sha1, sha1, NULL);
^~~~
./notes.h:125:27: note: passing argument to parameter 'note_oid' here
const struct object_id *note_oid, combine_notes_fn combine_notes);
^
./helper/cinnabar-fast-import.c:565:53: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
store_object(OBJ_BLOB, &file->content, &last_blob, sha1, 0);
^~~~
./helper/fast-import.patched.c:1086:20: note: passing argument to parameter 'oidout' here
struct object_id *oidout,
^
./helper/cinnabar-fast-import.c:567:20: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
add_note(&hg2git, file->sha1, sha1, NULL);
^~~~~~~~~~
./notes.h:124:60: note: passing argument to parameter 'object_oid' here
int add_note(struct notes_tree *t, const struct object_id *object_oid,
^
./helper/cinnabar-fast-import.c:567:32: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'const struct object_id *' [-Wincompatible-pointer-types]
add_note(&hg2git, file->sha1, sha1, NULL);
^~~~
./notes.h:125:27: note: passing argument to parameter 'note_oid' here
const struct object_id *note_oid, combine_notes_fn combine_notes);
^
./helper/cinnabar-fast-import.c:569:33: warning: incompatible pointer types passing 'unsigned char [20]' to parameter of type 'struct object_id *' [-Wincompatible-pointer-types]
file->content_oe = find_object(sha1);
^~~~
./helper/fast-import.patched.c:573:59: note: passing argument to parameter 'oid' here
static struct object_entry *find_object(struct object_id *oid)
^
23 warnings and 4 errors generated.b8fa900acedevel/git-cinnabar: rebuild after r44720512897e814a
devel/git-cinnabar: rebuild after r445615006f9b537d
devel/git-cinnabar: rebuild after r444462f44a9c75eb
devel/git-cinnabar: update to 0.5.0.b2 Changes: https://github.com/glandium/git-cinnabar/releases/tag/0.5.0b24dec55ecf8
devel/git-cinnabar: update to 0.5.0.b1 Changes: https://github.com/glandium/git-cinnabar/releases/tag/0.5.0b172f6d28804
devel/git-cinnabar: update to 0.4.0.13 to unbreak with git 2.13
../cinnabar-helper.c:859:4: warning: implicit declaration of function 'sha1_array_append' is invalid
in C99 [-Wimplicit-function-declaration]
sha1_array_append(array, sha1);
^
../cinnabar-helper.c:866:20: error: variable has incomplete type 'struct sha1_array'
struct sha1_array nodes = SHA1_ARRAY_INIT;
^
Changes: https://github.com/glandium/git-cinnabar/compare/cd0e1bb...a93db61
MFH: 2017Q2 (chasing r440558)0dfd75fd7ddevel/git-cinnabar: update to 0.4.0.5 Changes: https://github.com/glandium/git-cinnabar/compare/0.4.0...cd0e1bb MFH: 2017Q1 (requires r433742 to chase r436592)c661a6fb04
devel/git-cinnabar: unbreak after r433740 / 70558fc7a7b0
../cinnabar-fast-import.c:86:7: error: use of undeclared identifier 'pack_compression_seen'; did you
mean 'pack_compression_level'?
if (!pack_compression_seen && core_compression_seen)
^~~~~~~~~~~~~~~~~~~~~
pack_compression_level
./cache.h:705:12: note: 'pack_compression_level' declared here
extern int pack_compression_level;
^
../cinnabar-fast-import.c:86:32: error: use of undeclared identifier 'core_compression_seen'; did you
mean 'core_compression_level'?
if (!pack_compression_seen && core_compression_seen)
^~~~~~~~~~~~~~~~~~~~~
core_compression_level
./cache.h:704:12: note: 'core_compression_level' declared here
extern int core_compression_level;
^
Ping to: @glandium (upstream)fa190183ccdevel/git-cinnabar: update to 0.4.0 No functional changes since 0.4.0.r2.24. Changes: https://github.com/glandium/git-cinnabar/compare/84b8e6b...0.4.0 MFH: 2017Q17d88f9b820
devel/git-cinnabar: update to 0.4.0.r2.24 Changes: https://github.com/glandium/git-cinnabar/compare/d8de697...84b8e6b3ac95cc1eb
devel/git-cinnabar: update to 0.4.0.r2.8 Changes: https://github.com/glandium/git-cinnabar/compare/c6e1976...d8de697332c48133f
devel/git-cinnabar: update to 0.4.0.r2.5 Changes: https://github.com/glandium/git-cinnabar/commit/c6e19761878af2fe6
devel/git-cinnabar: update to 0.4.0.r2.4 Changes: https://github.com/glandium/git-cinnabar/compare/16fcf5c...ce1c3b85d8ab5182f
devel/git-cinnabar: update to 0.4.0.r.12 Changes: https://github.com/glandium/git-cinnabar/compare/194d2a1...16fcf5c195a0f52a2
devel/git-cinnabar: update to 0.4.0.r.6 Changes: https://github.com/glandium/git-cinnabar/compare/0.4.0rc...194d2a1cb2289b56e
devel/git-cinnabar: update to 0.4.0.r No changes beyond version bump in cinnabar/__init__.pye0c3f7a980
devel/git-cinnabar: update to 0.4.0.b3.36 Changes: https://github.com/glandium/git-cinnabar/compare/d666461...142a72e05e7e85739
devel/git-cinnabar: update to 0.4.0.b3.24 Changes: https://github.com/glandium/git-cinnabar/compare/2091b9b...d666461b0613181a4
devel/git-cinnabar: update to 0.4.0.b3.14 Changes: https://github.com/glandium/git-cinnabar/compare/75f38ed...2091b9b954a7d901d
Fix build as a regular user. Sponsored by: Absolight360935a881
devel/git-cinnabar: unbreak non-poudriere build != (like :=) expands variables during assignment, but PORTSDIR is only guaranteed to be defined after .include <bsd.port*.mk>. $ make clean all -C devel/git-cinnabar make[1]: chdir /devel/git: No such file or directory make: "/usr/ports/devel/git-cinnabar/Makefile" line 25: warning: "make -V WRKSRC -C /devel/git" returned non-zero status make[1]: chdir /devel/git: No such file or directory make: "/usr/ports/devel/git-cinnabar/Makefile" line 26: warning: "make -V MAKE_ENV -C /devel/git" returned non-zero status make[1]: chdir /devel/git: No such file or directory make: "/usr/ports/devel/git-cinnabar/Makefile" line 27: warning: "make -V MAKE_ARGS -C /devel/git" returned non-zero status [...] ===> Returning to build of git-cinnabar-0.4.0.b3.6 ===> git-cinnabar-0.4.0.b3.6 depends on executable: gmake - found ===> Configuring for git-cinnabar-0.4.0.b3.6 find: ./.pw: Permission denied find: ./.pw: Permission denied *** Error code 1 Reported by: vd38b413cfd5
devel/git-cinnabar: 35% faster builde5580386a5
devel/git-cinnabar: unbreak build-as-user on 11.0 ===> Configuring for git-cinnabar-0.4.0.b3.6 tar: Can't open `version': Permission denied tar: Error exit delayed from previous errors. Reported by: mat96e97b47bd
devel/git-cinnabar: chase r423921 by updating to 0.4.0.b3.6 common-main.o: In function `main': common-main.c:(.text+0x0): multiple definition of `main' cinnabar-helper.o:../cinnabar-helper.c:(.text+0x1b0): first defined here cc: error: linker command failed with exit code 1 (use -v to see invocation) Changes: https://github.com/glandium/git-cinnabar/compare/0.4.0b3...75f38ed PR: 213417 (for tracking) Reported by: pkg-fallout424efe7e06
devel/git-cinnabar: update to 0.4.0.b3 Changes: https://github.com/glandium/git-cinnabar/releases/tag/0.4.0b3 Changes: https://github.com/glandium/git-cinnabar/compare/0.4.0b2...0.4.0b392a93af1ef
devel/git-cinnabar: update to 0.4.0.b2 Changes: https://github.com/glandium/git-cinnabar/releases/tag/0.4.0b2 Changes: https://github.com/glandium/git-cinnabar/compare/0.4.0b1...0.4.0b21bcf722762
devel/git-cinnabar: unbreak build-as-user poudriere's BUILD_AS_NON_ROOT actually builds dependencies as root and only the port in question as non-root. So, don't assume another's port WRKSRC is writable. =======================<phase: configure >============================ ===> Configuring for git-cinnabar-0.4.0.b1 mv: rename /wrkdirs/usr/ports/devel/git/work/git-2.9.0 to /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.4.0b1/git-core: Permission denied *** Error code 1 Reported by: pkg-fallout3038813c31
devel/git-cinnabar: add new port git-cinnabar is a git remote helper to interact with mercurial repositories. Contrary to other such helpers*, it doesn't use a local mercurial clone under the hood, although it currently does require mercurial to be installed for some of its libraries. https://github.com/glandium/git-cinnabarbfa6e10298