Date: Tue, 12 Oct 2021 16:57:12 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2096f8f0c0e7 - main - devel/git-cinnabar: unbreak after 65831666797c Message-ID: <202110121657.19CGvCYM044825@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2096f8f0c0e7614e633900f3a6a141bdbd60da07 commit 2096f8f0c0e7614e633900f3a6a141bdbd60da07 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-10-12 16:34:52 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-10-12 16:56:22 +0000 devel/git-cinnabar: unbreak after 65831666797c patch -p1 -F0 -o helper/csum-file.patched.c git-core/csum-file.c < helper/csum-file.c.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/csum-file.c b/csum-file.c |index 7510950fa3..19d02e3a63 100644 |--- a/csum-file.c |+++ b/csum-file.c -------------------------- Patching file git-core/csum-file.c using Plan A... Hunk #1 failed at 86. 1 out of 1 hunks failed--saving rejects to helper/csum-file.patched.c.rej done gmake[2]: *** [helper/helper.mk:99: helper/csum-file.patched.c] Error 1 --- devel/git-cinnabar/Makefile | 2 +- devel/git-cinnabar/files/patch-git-2.33 | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 156569027afe..e0c94286ab9f 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,6 +1,6 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/devel/git-cinnabar/files/patch-git-2.33 b/devel/git-cinnabar/files/patch-git-2.33 new file mode 100644 index 000000000000..469b600e802c --- /dev/null +++ b/devel/git-cinnabar/files/patch-git-2.33 @@ -0,0 +1,27 @@ +https://github.com/glandium/git-cinnabar/commit/ea33ee10ac39 + +--- helper/GIT-VERSION.mk.orig 2021-03-31 21:58:42 UTC ++++ helper/GIT-VERSION.mk +@@ -1,2 +1,2 @@ +-GIT_VERSION ?= v2.32.0 ++GIT_VERSION ?= v2.33.0 + WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 +--- helper/csum-file.c.patch.orig 2021-03-31 21:58:42 UTC ++++ helper/csum-file.c.patch +@@ -1,8 +1,8 @@ + diff --git a/csum-file.c b/csum-file.c +-index 7510950fa3..19d02e3a63 100644 ++index c951cf8277..1215459b01 100644 + --- a/csum-file.c + +++ b/csum-file.c +-@@ -86,7 +86,7 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int fl ++@@ -91,7 +91,7 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int fl + return fd; + } + +@@ -10,4 +10,4 @@ index 7510950fa3..19d02e3a63 100644 + +void real_hashwrite(struct hashfile *f, const void *buf, unsigned int count) + { + while (count) { +- unsigned left = sizeof(f->buffer) - f->offset; ++ unsigned left = f->buffer_len - f->offset;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110121657.19CGvCYM044825>