From owner-svn-ports-head@freebsd.org Mon Sep 21 15:40:05 2020 Return-Path: Delivered-To: svn-ports-head@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 E80F53F46B5; Mon, 21 Sep 2020 15:40:05 +0000 (UTC) (envelope-from naddy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bw7tF5x9pz4PNg; Mon, 21 Sep 2020 15:40:05 +0000 (UTC) (envelope-from naddy@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 AF12D106AA; Mon, 21 Sep 2020 15:40:05 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08LFe5j5097917; Mon, 21 Sep 2020 15:40:05 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08LFe4bT097910; Mon, 21 Sep 2020 15:40:04 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <202009211540.08LFe4bT097910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Mon, 21 Sep 2020 15:40:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549451 - in head/devel/got: . files X-SVN-Group: ports-head X-SVN-Commit-Author: naddy X-SVN-Commit-Paths: in head/devel/got: . files X-SVN-Commit-Revision: 549451 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2020 15:40:06 -0000 Author: naddy Date: Mon Sep 21 15:40:04 2020 New Revision: 549451 URL: https://svnweb.freebsd.org/changeset/ports/549451 Log: Update to 0.40. User-visible changes: - document our default choice of text editor - fix got.conf overriding GOT_AUTHOR even if no author is set in got.conf - fix crash in got_free_gotconfig() - print newline to clear the bottom line when tog exits Deleted: head/devel/got/files/patch-lib_utf8.c head/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c head/devel/got/files/patch-regress_cmdline_commit.sh Modified: head/devel/got/Makefile head/devel/got/distinfo head/devel/got/files/patch-got_got.c head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y head/devel/got/files/patch-regress_cmdline_common.sh Modified: head/devel/got/Makefile ============================================================================== --- head/devel/got/Makefile Mon Sep 21 15:05:22 2020 (r549450) +++ head/devel/got/Makefile Mon Sep 21 15:40:04 2020 (r549451) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= got -PORTVERSION= 0.39 -PORTREVISION= 2 +PORTVERSION= 0.40 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ Modified: head/devel/got/distinfo ============================================================================== --- head/devel/got/distinfo Mon Sep 21 15:05:22 2020 (r549450) +++ head/devel/got/distinfo Mon Sep 21 15:40:04 2020 (r549451) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600100495 -SHA256 (got-0.39.tar.gz) = 0169e18c71e9005935e8c6b77ea95f18c49762b98767b7d312a3d24121e39df4 -SIZE (got-0.39.tar.gz) = 440979 +TIMESTAMP = 1600702149 +SHA256 (got-0.40.tar.gz) = 7c587749bb990c9d933808e860fc18a4259861bb82cffac3ead7a4640c77d23b +SIZE (got-0.40.tar.gz) = 440924 Modified: head/devel/got/files/patch-got_got.c ============================================================================== --- head/devel/got/files/patch-got_got.c Mon Sep 21 15:05:22 2020 (r549450) +++ head/devel/got/files/patch-got_got.c Mon Sep 21 15:40:04 2020 (r549451) @@ -1,4 +1,4 @@ ---- got/got.c.orig 2020-09-14 13:58:27 UTC +--- got/got.c.orig 2020-09-21 12:09:15 UTC +++ got/got.c @@ -213,7 +213,8 @@ main(int argc, char *argv[]) @@ -10,7 +10,7 @@ if (Vflag) { got_version_print_str(); -@@ -3884,7 +3885,7 @@ print_diff(void *arg, unsigned char status, unsigned c +@@ -3883,7 +3884,7 @@ print_diff(void *arg, unsigned char status, unsigned c if (dirfd != -1) { fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW); if (fd == -1) { @@ -19,7 +19,7 @@ err = got_error_from_errno2("openat", abspath); goto done; -@@ -3897,7 +3898,7 @@ print_diff(void *arg, unsigned char status, unsigned c +@@ -3896,7 +3897,7 @@ print_diff(void *arg, unsigned char status, unsigned c } else { fd = open(abspath, O_RDONLY | O_NOFOLLOW); if (fd == -1) { @@ -28,7 +28,7 @@ err = got_error_from_errno2("open", abspath); goto done; -@@ -9283,11 +9284,11 @@ cat_commit(struct got_object_id *id, struct got_reposi +@@ -9282,11 +9283,11 @@ cat_commit(struct got_object_id *id, struct got_reposi } fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR, got_object_commit_get_author(commit), @@ -42,7 +42,7 @@ logmsg = got_object_commit_get_logmsg_raw(commit); fprintf(outfile, "messagelen %zd\n", strlen(logmsg)); -@@ -9342,7 +9343,7 @@ cat_tag(struct got_object_id *id, struct got_repositor +@@ -9341,7 +9342,7 @@ cat_tag(struct got_object_id *id, struct got_repositor fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER, got_object_tag_get_tagger(tag), Modified: head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y ============================================================================== --- head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y Mon Sep 21 15:05:22 2020 (r549450) +++ head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y Mon Sep 21 15:40:04 2020 (r549451) @@ -1,36 +1,6 @@ -XXX remove first hunk after 0.39 ---- libexec/got-read-gotconfig/parse.y.orig 2020-09-14 16:35:22 UTC +--- libexec/got-read-gotconfig/parse.y.orig 2020-09-21 12:09:15 UTC +++ libexec/got-read-gotconfig/parse.y -@@ -24,27 +24,17 @@ - %{ - #include - #include --#include --#include - --#include -- --#include -- - #include - - #include - #include - #include --#include --#include --#include - #include - #include - #include -+#include - #include --#include --#include - - #include "got_error.h" - #include "gotconfig.h" -@@ -71,7 +61,7 @@ int igetc(void); +@@ -61,7 +61,7 @@ int igetc(void); int lgetc(int); void lungetc(int); int findeol(void); @@ -39,7 +9,7 @@ XXX remove first hunk after 0.39 TAILQ_HEAD(symhead, sym) symhead = TAILQ_HEAD_INITIALIZER(symhead); struct sym { -@@ -133,7 +123,7 @@ boolean : STRING { +@@ -123,7 +123,7 @@ boolean : STRING { ; numberstring : NUMBER { char *s; @@ -48,7 +18,7 @@ XXX remove first hunk after 0.39 yyerror("string: asprintf"); YYERROR; } -@@ -395,7 +385,7 @@ getservice(char *n) +@@ -385,7 +385,7 @@ getservice(char *n) } static int Modified: head/devel/got/files/patch-regress_cmdline_common.sh ============================================================================== --- head/devel/got/files/patch-regress_cmdline_common.sh Mon Sep 21 15:05:22 2020 (r549450) +++ head/devel/got/files/patch-regress_cmdline_common.sh Mon Sep 21 15:40:04 2020 (r549451) @@ -1,4 +1,3 @@ -XXX remove second hunk after 0.39 --- regress/cmdline/common.sh.orig 2020-09-13 18:20:00 UTC +++ regress/cmdline/common.sh @@ -24,6 +24,20 @@ export GOT_LOG_DEFAULT_LIMIT=0 @@ -22,25 +21,6 @@ XXX remove second hunk after 0.39 git_init() { git init -q "$1" -@@ -96,13 +110,13 @@ git_show_tree() - - trim_obj_id() - { -- let trimcount=$1 -- id=$2 -+ local trimcount=$1 -+ local id=$2 - -- pat="" -- while [ trimcount -gt 0 ]; do -+ local pat="" -+ while [ "$trimcount" -gt 0 ]; do - pat="[0-9a-f]$pat" -- let trimcount-- -+ trimcount=$((trimcount - 1)) - done - - echo ${id%$pat} @@ -168,7 +182,7 @@ test_init() echo "No test name provided" >&2 return 1