From nobody Sat Sep 03 00:10:18 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MKFXp3x12z4bkwJ; Sat, 3 Sep 2022 00:10:18 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKFXp3P67z3GNq; Sat, 3 Sep 2022 00:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662163818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDYh3TmRimvKu6AOoZ5ckR20cKdtRW2uwmlDhI9YlPQ=; b=JVC3VUFmzKNmxcCEY3PGEwo9OL9J62ebUr2lvn97X6WDbESxds9Cb5474557fg1ZzPubV9 bDuSBg1IBBdXde8jE2kUfvWkcwjHnBZbUzrHIJmSNwFFOKjG7w/UN8YLcDzG7wgv0iWOiX dHPCFu+r/LAUGapIkRDA6ETCu/E6CdBw2CEtbZ9M9dGEX2dEWZZGH/sP2xRAepzPaivTgY 3afmpN2pLvQjY4Ov9e0vDyiYf8BwLfXojb5yZbq06o4OPOy7BRD+FB7aiWZrrUimneMshL fQGKesrGJcdv3R4iFgN8JjXdj9amv2R9FsEZoPrEmTiYxNmYG1NLa+0wvyoaeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MKFXp286tzymp; Sat, 3 Sep 2022 00:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2830AIJ4010241; Sat, 3 Sep 2022 00:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2830AIvD010235; Sat, 3 Sep 2022 00:10:18 GMT (envelope-from git) Date: Sat, 3 Sep 2022 00:10:18 GMT Message-Id: <202209030010.2830AIvD010235@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4994fd0dcd20 - main - devel/git-cinnabar: unbreak after d1b5bac3a60c List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4994fd0dcd201bf0088d16fc13240f0cffb9be30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662163818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDYh3TmRimvKu6AOoZ5ckR20cKdtRW2uwmlDhI9YlPQ=; b=ngW/g34y7rgmIqsTsbKrvIJ7fj/CoM9SyzgWDYVEDResVpRcM7h/pi9otj76HyNgWXjTnz u+kr0MglNH7Iksp2NuKAgepA7HNjFbTkDCMl8LSx9Nuqqzkenqv92fzCGoaWTOafmyC2QT 4dHTsGacHVR8SefmWg3m3YQxaFPj7K4OrDsHI3ANh8XGavXYeFd5qkT67wD2ERmQOZzqBx 4/zAsBP/5oqs6Lp6WYxGmdzfK1pVgUNaRYAOcq8YJg/qYKbG40YgFu9+JH8SJluBIxwkbv hKI6jJaxrokihVDHnXQsI1lTbIf0F3VneXB1SKZFQlsOg+SEEm8g6n2O1uffBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662163818; a=rsa-sha256; cv=none; b=NH6yAzIaw0PnwbSQbg4EswZx1IEQk5quUJ86TPH6Kwl0jxe/BfunYchZqzK3bb2DA8e08v yKDmsPblSn1+U/0qrav1hNV33kScnY12xRxhFJeHp7oX4It6tq+tbddl9ZxXTWZ24fxJ0+ kjcYkg47Gc7Ds6qwF46mEZroqmYvH/jPgMNatX5L60iWx057Gg/rhptXoJvAnmx7MDMJYQ dSyn6AC8eDV3WPdmE3RPQ4crtSto4dnSViSE+YQpfohP7T1yT6QZsiDhYXnTGlplok1Io3 v8JG6mdiVMuB1xLYHjEIVHApYVcT++hkMDuODaS0DCO1gAb1GMq2yIwCcyV2KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4994fd0dcd201bf0088d16fc13240f0cffb9be30 commit 4994fd0dcd201bf0088d16fc13240f0cffb9be30 Author: Jan Beich AuthorDate: 2022-09-03 00:05:11 +0000 Commit: Jan Beich CommitDate: 2022-09-03 00:10:09 +0000 devel/git-cinnabar: unbreak after d1b5bac3a60c Patching file git-core/tree-walk.c using Plan A... Hunk #1 failed at 47. cc -o hg-connect-http.o -c -MF ./.depend/hg-connect-http.o.d -MQ hg-connect-http.o -MMD -MP -isystem/usr/local/include -DLIBICONV_PLUG -O2 -pipe -ffunction-sections -fdata-sections -fstack-protector-strong -fno-strict-aliasing -DLIBICONV_PLUG -fstack-protector-strong -I. -I/usr/local/include -DGIT_HOST_CPU="\"amd64\"" -DUSE_LIBPCRE2 -I/usr/local/include -DUSE_CURL_FOR_IMAP_SEND -I/usr/include -DUSE_ST_TIMESPEC -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK -pthread -DHAVE_PATHS_H -DHAVE_STRINGS_H -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_BSD_SYSCTL -DHAVE_BSD_KERN_PROC_SYSCTL -DHAVE_GETDELIM -DHAVE_ARC4RANDOM -DFREAD_READS_DIRECTORIES -DDIR_HAS_BSD_GROUP_SEMANTICS -DFILENO_IS_A_MACRO -DSHELL_PATH='"/bin/sh"' helper/hg-connect-http.c done 1 out of 1 hunks failed--saving rejects to helper/tree-walk.patched.c.rej done gmake[2]: *** [helper/helper.mk:99: helper/tree-walk.patched.c] Error 1 --- devel/git-cinnabar/Makefile | 2 +- devel/git-cinnabar/files/patch-git-2.37.3 | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index 3a7564b2328c..dba020c3d6dd 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,6 +1,6 @@ PORTNAME= git-cinnabar DISTVERSION= 0.5.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/git-cinnabar/files/patch-git-2.37.3 b/devel/git-cinnabar/files/patch-git-2.37.3 new file mode 100644 index 000000000000..de470213ddd8 --- /dev/null +++ b/devel/git-cinnabar/files/patch-git-2.37.3 @@ -0,0 +1,19 @@ +https://github.com/glandium/git-cinnabar/commit/02449dbf25b1 + +--- helper/tree-walk.c.patch.orig 2022-07-30 21:04:45 UTC ++++ helper/tree-walk.c.patch +@@ -1,12 +1,12 @@ diff --git a/tree-walk.c b/tree-walk.c + diff --git a/tree-walk.c b/tree-walk.c +-index 3a94959d64..70558d2964 100644 ++index 74f4d710e8..f46ac155eb 100644 + --- a/tree-walk.c + +++ b/tree-walk.c + @@ -47,7 +47,7 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l + + /* Initialize the descriptor entry */ + desc->entry.path = path; +-- desc->entry.mode = canon_mode(mode); ++- desc->entry.mode = (desc->flags & TREE_DESC_RAW_MODES) ? mode : canon_mode(mode); + + desc->entry.mode = mode; + desc->entry.pathlen = len - 1; + oidread(&desc->entry.oid, (const unsigned char *)path + len);