From 2a5bf4946f05d4639a180f258f6a9003b955b570 Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Wed, 21 Oct 2020 11:33:23 +0000 Subject: Update to 0.43. User-visible changes: - do not treat the -h and -V flags as errors - fix a bug where 'got status' showed an unchanged empty file as changed - properly handle nonexistent remote repository names given to 'got fetch' --- devel/got/Makefile | 2 +- devel/got/distinfo | 6 +-- devel/got/files/openbsd-compat/Makefile | 4 +- devel/got/files/openbsd-compat/basename.c | 65 ---------------------- devel/got/files/openbsd-compat/dirname.c | 71 ------------------------- devel/got/files/openbsd-compat/openbsd-compat.h | 11 ---- devel/got/files/patch-regress_cmdline_Makefile | 6 +-- devel/got/files/patch-regress_cmdline_common.sh | 9 ---- devel/got/files/patch-regress_cmdline_import.sh | 38 ------------- devel/got/files/patch-regress_cmdline_rm.sh | 20 ------- 10 files changed, 8 insertions(+), 224 deletions(-) delete mode 100644 devel/got/files/openbsd-compat/basename.c delete mode 100644 devel/got/files/openbsd-compat/dirname.c delete mode 100644 devel/got/files/patch-regress_cmdline_import.sh delete mode 100644 devel/got/files/patch-regress_cmdline_rm.sh (limited to 'devel/got') diff --git a/devel/got/Makefile b/devel/got/Makefile index 9ad6de0b67ed..9887f1dff181 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= got -PORTVERSION= 0.42 +PORTVERSION= 0.43 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ diff --git a/devel/got/distinfo b/devel/got/distinfo index ac7838c049bd..134efa738059 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601492035 -SHA256 (got-0.42.tar.gz) = d5b976942cc630026fda401b903860bcd145a187d64231e062b57a6bc8a63d67 -SIZE (got-0.42.tar.gz) = 444954 +TIMESTAMP = 1603279167 +SHA256 (got-0.43.tar.gz) = 64ecad392a32243ab3252371ba27916f5e6fce8b41f37be7c727a6c2ff30de49 +SIZE (got-0.43.tar.gz) = 445698 diff --git a/devel/got/files/openbsd-compat/Makefile b/devel/got/files/openbsd-compat/Makefile index 68efdd3bb100..b07dd011928c 100644 --- a/devel/got/files/openbsd-compat/Makefile +++ b/devel/got/files/openbsd-compat/Makefile @@ -1,9 +1,7 @@ LIB= openbsd-compat INTERNALLIB= -SRCS= basename.c \ - dirname.c \ - freezero.c \ +SRCS= freezero.c \ getdtablecount.c \ imsg.c \ imsg-buffer.c \ diff --git a/devel/got/files/openbsd-compat/basename.c b/devel/got/files/openbsd-compat/basename.c deleted file mode 100644 index 84e9d13de81e..000000000000 --- a/devel/got/files/openbsd-compat/basename.c +++ /dev/null @@ -1,65 +0,0 @@ -/* $OpenBSD: basename.c,v 1.16 2019/01/25 00:19:25 millert Exp $ */ - -/* - * Copyright (c) 1997, 2004 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include -#include - -#include - -char * -basename(const char *path) -{ - static char bname[PATH_MAX]; - size_t len; - const char *endp, *startp; - - /* Empty or NULL string gets treated as "." */ - if (path == NULL || *path == '\0') { - bname[0] = '.'; - bname[1] = '\0'; - return (bname); - } - - /* Strip any trailing slashes */ - endp = path + strlen(path) - 1; - while (endp > path && *endp == '/') - endp--; - - /* All slashes becomes "/" */ - if (endp == path && *endp == '/') { - bname[0] = '/'; - bname[1] = '\0'; - return (bname); - } - - /* Find the start of the base */ - startp = endp; - while (startp > path && *(startp - 1) != '/') - startp--; - - len = endp - startp + 1; - if (len >= sizeof(bname)) { - errno = ENAMETOOLONG; - return (NULL); - } - memcpy(bname, startp, len); - bname[len] = '\0'; - return (bname); -} diff --git a/devel/got/files/openbsd-compat/dirname.c b/devel/got/files/openbsd-compat/dirname.c deleted file mode 100644 index 1973f82ef481..000000000000 --- a/devel/got/files/openbsd-compat/dirname.c +++ /dev/null @@ -1,71 +0,0 @@ -/* $OpenBSD: dirname.c,v 1.16 2019/01/25 00:19:25 millert Exp $ */ - -/* - * Copyright (c) 1997, 2004 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include -#include - -#include - -/* A slightly modified copy of this file exists in libexec/ld.so */ - -char * -dirname(const char *path) -{ - static char dname[PATH_MAX]; - size_t len; - const char *endp; - - /* Empty or NULL string gets treated as "." */ - if (path == NULL || *path == '\0') { - dname[0] = '.'; - dname[1] = '\0'; - return (dname); - } - - /* Strip any trailing slashes */ - endp = path + strlen(path) - 1; - while (endp > path && *endp == '/') - endp--; - - /* Find the start of the dir */ - while (endp > path && *endp != '/') - endp--; - - /* Either the dir is "/" or there are no slashes */ - if (endp == path) { - dname[0] = *endp == '/' ? '/' : '.'; - dname[1] = '\0'; - return (dname); - } else { - /* Move forward past the separating slashes */ - do { - endp--; - } while (endp > path && *endp == '/'); - } - - len = endp - path + 1; - if (len >= sizeof(dname)) { - errno = ENAMETOOLONG; - return (NULL); - } - memcpy(dname, path, len); - dname[len] = '\0'; - return (dname); -} diff --git a/devel/got/files/openbsd-compat/openbsd-compat.h b/devel/got/files/openbsd-compat/openbsd-compat.h index 160184ac8bcd..30267cfab011 100644 --- a/devel/got/files/openbsd-compat/openbsd-compat.h +++ b/devel/got/files/openbsd-compat/openbsd-compat.h @@ -56,17 +56,6 @@ int open_posix(const char *path, int flags, ...); int openat_posix(int fd, const char *path, int flags, ...); -/* - * - */ -#undef basename -#undef dirname -#define basename(path) basename_const(path) -#define dirname(path) dirname_const(path) - -char *basename(const char *); -char *dirname(const char *); - /* * */ diff --git a/devel/got/files/patch-regress_cmdline_Makefile b/devel/got/files/patch-regress_cmdline_Makefile index 98a72bfc05f0..11d7899d9faf 100644 --- a/devel/got/files/patch-regress_cmdline_Makefile +++ b/devel/got/files/patch-regress_cmdline_Makefile @@ -1,8 +1,8 @@ ---- regress/cmdline/Makefile.orig 2020-08-09 09:17:05 UTC +--- regress/cmdline/Makefile.orig 2020-10-21 11:24:20 UTC +++ regress/cmdline/Makefile -@@ -78,4 +78,6 @@ fetch: +@@ -80,4 +80,6 @@ fetch: tree: - ./tree.sh -q + ./tree.sh -q -r "$(GOT_TEST_ROOT)" -.include +regress: ${REGRESS_TARGETS} .PHONY .SILENT diff --git a/devel/got/files/patch-regress_cmdline_common.sh b/devel/got/files/patch-regress_cmdline_common.sh index 23d0105f1852..5b367c8d97bf 100644 --- a/devel/got/files/patch-regress_cmdline_common.sh +++ b/devel/got/files/patch-regress_cmdline_common.sh @@ -21,12 +21,3 @@ git_init() { git init -q "$1" -@@ -168,7 +182,7 @@ test_init() - echo "No test name provided" >&2 - return 1 - fi -- local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX` -+ local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX` - mkdir $testroot/repo - git_init $testroot/repo - if [ -z "$no_tree" ]; then diff --git a/devel/got/files/patch-regress_cmdline_import.sh b/devel/got/files/patch-regress_cmdline_import.sh deleted file mode 100644 index 24780e2bc2fb..000000000000 --- a/devel/got/files/patch-regress_cmdline_import.sh +++ /dev/null @@ -1,38 +0,0 @@ ---- regress/cmdline/import.sh.orig 2020-09-13 18:20:00 UTC -+++ regress/cmdline/import.sh -@@ -18,7 +18,7 @@ - - test_import_basic() { - local testname=import_basic -- local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX` -+ local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX` - - got init $testroot/repo - -@@ -170,7 +170,7 @@ test_import_requires_new_branch() { - - test_import_ignores() { - local testname=import_ignores -- local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX` -+ local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX` - - got init $testroot/repo - -@@ -200,7 +200,7 @@ test_import_ignores() { - - test_import_empty_dir() { - local testname=import_empty_dir -- local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX` -+ local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX` - - got init $testroot/repo - -@@ -243,7 +243,7 @@ test_import_empty_dir() { - - test_import_symlink() { - local testname=import_symlink -- local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX` -+ local testroot=`mktemp -d ${TMPDIR-/tmp}/got-test-$testname-XXXXXXXX` - - got init $testroot/repo - diff --git a/devel/got/files/patch-regress_cmdline_rm.sh b/devel/got/files/patch-regress_cmdline_rm.sh deleted file mode 100644 index e02e31402b13..000000000000 --- a/devel/got/files/patch-regress_cmdline_rm.sh +++ /dev/null @@ -1,20 +0,0 @@ ---- regress/cmdline/rm.sh.orig 2020-09-15 22:43:33 UTC -+++ regress/cmdline/rm.sh -@@ -239,7 +239,7 @@ test_rm_directory() { - return 1 - fi - -- (cd $testroot/wt && ls -l > $testroot/stdout) -+ (cd $testroot/wt && ls -l | sed '/^total/d' > $testroot/stdout) - - echo -n '' > $testroot/stdout.expected - -@@ -251,7 +251,7 @@ test_rm_directory() { - return 1 - fi - -- (cd $testroot/wt && ls -l > $testroot/stdout) -+ (cd $testroot/wt && ls -l | sed '/^total/d' > $testroot/stdout) - - echo -n '' > $testroot/stdout.expected - -- cgit v1.2.3