Date: Mon, 4 Jul 2022 15:03:35 GMT From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 40eba94b5710 - main - devel/got: update to 0.73 Message-ID: <202207041503.264F3ZQO019293@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=40eba94b5710d721366c8fd6b29cf95dcae26527 commit 40eba94b5710d721366c8fd6b29cf95dcae26527 Author: Christian Weisgerber <naddy@FreeBSD.org> AuthorDate: 2022-07-04 15:02:42 +0000 Commit: Christian Weisgerber <naddy@FreeBSD.org> CommitDate: 2022-07-04 15:02:42 +0000 devel/got: update to 0.73 User-visible changes: - got patch: use diff3 to merge changes if possible - tog: alias C-b/C-f to scroll page back/forward with b/f - tog: make SPACE page down in all views - tog: allow prefixing movement keys with count modifier - always show commit or tree IDs in diff header, in order to help 'got patch' - tog: implement support for horizontal splitscreens - switch 'tog diff' and 'tog blame' to Myers diff by default for speed - make the diff algorithm used by 'tog diff' and 'tog blame' configurable - got patch: handle mangled whitespace - fix "imsg_add TREE_ENTRY: Result too large" error on i386 - create and verify tags signed by SSH keys - tog: add C-g/backspace key map to abort compound commands - rename got.conf(5) fetch-all-branches to fetch_all_branches for consistency - rename got.conf(5) mirror-references to mirror_references for consistency --- devel/got/Makefile | 3 +-- devel/got/distinfo | 6 +++--- devel/got/files/openbsd-compat/freezero.c | 2 ++ devel/got/files/openbsd-compat/recallocarray.c | 2 ++ devel/got/files/patch-gotadmin_Makefile | 4 ++-- devel/got/files/patch-lib_sigs.c | 11 +++++++++++ devel/got/files/patch-libexec_got-read-pack_got-read-pack.c | 4 ++-- devel/got/files/patch-libexec_got-read-patch_got-read-patch.c | 4 ++-- devel/got/files/patch-regress_cmdline_Makefile | 4 ++-- devel/got/files/patch-regress_cmdline_commit.sh | 4 ++-- devel/got/files/patch-regress_fetch_Makefile | 4 ++-- 11 files changed, 31 insertions(+), 17 deletions(-) diff --git a/devel/got/Makefile b/devel/got/Makefile index 7259df61504e..1d3b9bd1be06 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,6 +1,5 @@ PORTNAME= got -PORTVERSION= 0.72 -PORTREVISION= 1 +PORTVERSION= 0.73 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ diff --git a/devel/got/distinfo b/devel/got/distinfo index 6608d901e4ea..700fda3a7bca 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655574650 -SHA256 (got-0.72.tar.gz) = 8be46f3184ab0abcd4d8be9659e791a6a764e7e00abc320e66bd63b580e303fc -SIZE (got-0.72.tar.gz) = 622448 +TIMESTAMP = 1656945056 +SHA256 (got-0.73.tar.gz) = 9b2046c6989d914ff93a042df7f5e97f81de7337d3bc8a8e9ef91784c2090c48 +SIZE (got-0.73.tar.gz) = 644344 diff --git a/devel/got/files/openbsd-compat/freezero.c b/devel/got/files/openbsd-compat/freezero.c index 2f6c0c35de59..d2938666c4f0 100644 --- a/devel/got/files/openbsd-compat/freezero.c +++ b/devel/got/files/openbsd-compat/freezero.c @@ -17,6 +17,8 @@ #include <stdlib.h> #include <string.h> +void freezero(void *, size_t); + void freezero(void *ptr, size_t sz) { diff --git a/devel/got/files/openbsd-compat/recallocarray.c b/devel/got/files/openbsd-compat/recallocarray.c index d93abd2da5fd..c81a4e7130fd 100644 --- a/devel/got/files/openbsd-compat/recallocarray.c +++ b/devel/got/files/openbsd-compat/recallocarray.c @@ -21,6 +21,8 @@ #include <string.h> #include <unistd.h> +void *recallocarray(void *, size_t, size_t, size_t); + /* * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW diff --git a/devel/got/files/patch-gotadmin_Makefile b/devel/got/files/patch-gotadmin_Makefile index e35e667ab932..ad34cefb8344 100644 --- a/devel/got/files/patch-gotadmin_Makefile +++ b/devel/got/files/patch-gotadmin_Makefile @@ -1,6 +1,6 @@ ---- gotadmin/Makefile.orig 2021-10-04 10:08:55 UTC +--- gotadmin/Makefile.orig 2022-07-03 11:08:45 UTC +++ gotadmin/Makefile -@@ -24,8 +24,4 @@ DPADD = ${LIBZ} ${LIBUTIL} +@@ -25,8 +25,4 @@ DPADD = ${LIBZ} ${LIBUTIL} NOMAN = Yes .endif diff --git a/devel/got/files/patch-lib_sigs.c b/devel/got/files/patch-lib_sigs.c new file mode 100644 index 000000000000..8681646adb9d --- /dev/null +++ b/devel/got/files/patch-lib_sigs.c @@ -0,0 +1,11 @@ +--- lib/sigs.c.orig 2022-07-04 14:54:12 UTC ++++ lib/sigs.c +@@ -206,7 +206,7 @@ got_tag_write_signed_data(BUF *buf, struct got_tag_obj + got_date_format_gmtoff(gmtoff, sizeof(gmtoff), + got_object_tag_get_tagger_gmtoff(tag)); + if (asprintf(&tagger, "%s %lld %s", got_object_tag_get_tagger(tag), +- got_object_tag_get_tagger_time(tag), gmtoff) == -1) { ++ (long long)got_object_tag_get_tagger_time(tag), gmtoff) == -1) { + err = got_error_from_errno("asprintf"); + goto done; + } diff --git a/devel/got/files/patch-libexec_got-read-pack_got-read-pack.c b/devel/got/files/patch-libexec_got-read-pack_got-read-pack.c index 89bde218d824..926785d07069 100644 --- a/devel/got/files/patch-libexec_got-read-pack_got-read-pack.c +++ b/devel/got/files/patch-libexec_got-read-pack_got-read-pack.c @@ -1,4 +1,4 @@ ---- libexec/got-read-pack/got-read-pack.c.orig 2022-06-19 18:47:42 UTC +--- libexec/got-read-pack/got-read-pack.c.orig 2022-07-04 14:48:30 UTC +++ libexec/got-read-pack/got-read-pack.c @@ -14,6 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -8,7 +8,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <sys/queue.h> -@@ -1646,6 +1647,11 @@ main(int argc, char *argv[]) +@@ -1917,6 +1918,11 @@ main(int argc, char *argv[]) /* revoke access to most system calls */ if (pledge("stdio recvfd", NULL) == -1) { err = got_error_from_errno("pledge"); diff --git a/devel/got/files/patch-libexec_got-read-patch_got-read-patch.c b/devel/got/files/patch-libexec_got-read-patch_got-read-patch.c index bc70e9c4f84b..6bdec6c59be9 100644 --- a/devel/got/files/patch-libexec_got-read-patch_got-read-patch.c +++ b/devel/got/files/patch-libexec_got-read-patch_got-read-patch.c @@ -1,4 +1,4 @@ ---- libexec/got-read-patch/got-read-patch.c.orig 2022-06-19 18:47:42 UTC +--- libexec/got-read-patch/got-read-patch.c.orig 2022-07-04 14:48:30 UTC +++ libexec/got-read-patch/got-read-patch.c @@ -35,6 +35,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -8,7 +8,7 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/uio.h> -@@ -487,6 +488,11 @@ main(int argc, char **argv) +@@ -578,6 +579,11 @@ main(int argc, char **argv) /* revoke access to most system calls */ if (pledge("stdio recvfd", NULL) == -1) { err = got_error_from_errno("pledge"); diff --git a/devel/got/files/patch-regress_cmdline_Makefile b/devel/got/files/patch-regress_cmdline_Makefile index bb51b0909783..c11c9f731001 100644 --- a/devel/got/files/patch-regress_cmdline_Makefile +++ b/devel/got/files/patch-regress_cmdline_Makefile @@ -1,6 +1,6 @@ ---- regress/cmdline/Makefile.orig 2021-10-04 10:11:31 UTC +--- regress/cmdline/Makefile.orig 2022-05-10 11:21:59 UTC +++ regress/cmdline/Makefile -@@ -93,4 +93,6 @@ cleanup: +@@ -97,4 +97,6 @@ cleanup: ./cleanup.sh -q -r "$(GOT_TEST_ROOT)" diff --git a/devel/got/files/patch-regress_cmdline_commit.sh b/devel/got/files/patch-regress_cmdline_commit.sh index 82497661191a..d3187079463d 100644 --- a/devel/got/files/patch-regress_cmdline_commit.sh +++ b/devel/got/files/patch-regress_cmdline_commit.sh @@ -1,6 +1,6 @@ ---- regress/cmdline/commit.sh.orig 2022-02-08 10:47:01 UTC +--- regress/cmdline/commit.sh.orig 2022-07-02 13:23:44 UTC +++ regress/cmdline/commit.sh -@@ -1376,7 +1376,7 @@ test_commit_prepared_logmsg() { +@@ -1380,7 +1380,7 @@ test_commit_prepared_logmsg() { cat > $testroot/editor.sh <<EOF #!/bin/sh diff --git a/devel/got/files/patch-regress_fetch_Makefile b/devel/got/files/patch-regress_fetch_Makefile index 8964acce92df..3cf02b0e7d58 100644 --- a/devel/got/files/patch-regress_fetch_Makefile +++ b/devel/got/files/patch-regress_fetch_Makefile @@ -1,6 +1,6 @@ ---- regress/fetch/Makefile.orig 2020-09-11 17:05:16 UTC +--- regress/fetch/Makefile.orig 2022-07-03 11:08:45 UTC +++ regress/fetch/Makefile -@@ -11,7 +11,7 @@ LDADD = -lutil -lz +@@ -12,7 +12,7 @@ LDADD = -lutil -lz -lm NOMAN = yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207041503.264F3ZQO019293>