From owner-svn-ports-all@freebsd.org Mon Mar 23 11:18:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 077C927FAD4; Mon, 23 Mar 2020 11:18:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mBh4616Vz3QJS; Mon, 23 Mar 2020 11:18:12 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B0637D97B; Mon, 23 Mar 2020 11:18:12 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NBICog083358; Mon, 23 Mar 2020 11:18:12 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NBICFM083356; Mon, 23 Mar 2020 11:18:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003231118.02NBICFM083356@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 23 Mar 2020 11:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528968 - in head/devel/git-cinnabar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/git-cinnabar: . files X-SVN-Commit-Revision: 528968 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 11:18:13 -0000 Author: jbeich Date: Mon Mar 23 11:18:12 2020 New Revision: 528968 URL: https://svnweb.freebsd.org/changeset/ports/528968 Log: devel/git-cinnabar: rebuild and unbreak after r528780 |diff --git a/notes.c b/notes.c |index 75c028b300..24089afa8a 100644 |--- a/notes.c |+++ b/notes.c -------------------------- Patching file /wrkdirs/usr/ports/devel/git-cinnabar/work/git-cinnabar-0.5.4/git-core/notes.c using Plan A... Hunk #1 succeeded at 419 (offset 2 lines). Hunk #2 failed at 721. Hunk #3 succeeded at 752 (offset 3 lines). Hunk #4 succeeded at 1159 (offset 35 lines). Hunk #5 failed at 1177. Hunk #6 succeeded at 1159 (offset 4 lines). 2 out of 6 hunks failed--saving rejects to helper/notes.patched.c.rej done gmake[2]: *** [Makefile:157: ../helper/notes.patched.c] Error 1 Reported by: pkg-fallout Added: head/devel/git-cinnabar/files/ head/devel/git-cinnabar/files/patch-git-2.25.2 (contents, props changed) Modified: head/devel/git-cinnabar/Makefile (contents, props changed) Modified: head/devel/git-cinnabar/Makefile ============================================================================== --- head/devel/git-cinnabar/Makefile Mon Mar 23 10:59:59 2020 (r528967) +++ head/devel/git-cinnabar/Makefile Mon Mar 23 11:18:12 2020 (r528968) @@ -2,6 +2,7 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Added: head/devel/git-cinnabar/files/patch-git-2.25.2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/git-cinnabar/files/patch-git-2.25.2 Mon Mar 23 11:18:12 2020 (r528968) @@ -0,0 +1,30 @@ +--- helper/notes.c.patch.orig 2020-02-05 23:41:37 UTC ++++ helper/notes.c.patch +@@ -14,10 +14,10 @@ index 75c028b300..24089afa8a 100644 + if (hex_to_bytes(object_oid.hash + prefix_len, entry.path, + hashsz - prefix_len)) + goto handle_non_note; /* entry.path is not a SHA1 */ +-@@ -722,6 +719,7 @@ static int write_each_note_helper(struct tree_write_stack *tws, +- struct write_each_note_data { ++@@ -720,6 +720,7 @@ struct write_each_note_data { + struct tree_write_stack *root; +- struct non_note *next_non_note; ++ struct non_note **nn_list; ++ struct non_note *nn_prev; + + unsigned int note_mode; + }; + +@@ -41,10 +41,10 @@ index 75c028b300..24089afa8a 100644 + { + struct tree_write_stack root; + struct write_each_note_data cb_data; +-@@ -1143,6 +1142,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result) +- root.path[0] = root.path[1] = '\0'; ++@@ -1178,6 +1179,7 @@ int write_notes_tree_mode(struct notes_tree *t, struct + cb_data.root = &root; +- cb_data.next_non_note = t->first_non_note; ++ cb_data.nn_list = &(t->first_non_note); ++ cb_data.nn_prev = NULL; + + cb_data.note_mode = mode; + + /* Write tree objects representing current notes tree */