Index: head/devel/got/Makefile =================================================================== --- head/devel/got/Makefile (revision 549450) +++ head/devel/got/Makefile (revision 549451) @@ -1,27 +1,26 @@ # $FreeBSD$ PORTNAME= got -PORTVERSION= 0.39 -PORTREVISION= 2 +PORTVERSION= 0.40 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ MAINTAINER= naddy@FreeBSD.org COMMENT= Game of Trees version control system LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix post-extract: ${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC} # The regression test suite requires: # installed got # installed git # ssh to 127.0.0.1 run-test: @(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress) .include Index: head/devel/got/distinfo =================================================================== --- head/devel/got/distinfo (revision 549450) +++ head/devel/got/distinfo (revision 549451) @@ -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 Index: head/devel/got/files/patch-regress_cmdline_commit.sh =================================================================== --- head/devel/got/files/patch-regress_cmdline_commit.sh (revision 549450) +++ head/devel/got/files/patch-regress_cmdline_commit.sh (nonexistent) @@ -1,13 +0,0 @@ -XXX remove after 0.39 ---- regress/cmdline/commit.sh.orig 2020-09-13 18:20:00 UTC -+++ regress/cmdline/commit.sh -@@ -248,7 +248,8 @@ test_commit_deleted_subdirs() { - return 1 - fi - -- (cd $testroot/wt && got rm -R $testroot/wt/{epsilon,gamma} >/dev/null) -+ (cd $testroot/wt && \ -+ got rm -R $testroot/wt/epsilon $testroot/wt/gamma >/dev/null) - - (cd $testroot/wt && got commit -m 'test commit_deleted_subdirs' \ - > $testroot/stdout 2> $testroot/stderr) Property changes on: head/devel/got/files/patch-regress_cmdline_commit.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-lib_utf8.c =================================================================== --- head/devel/got/files/patch-lib_utf8.c (revision 549450) +++ head/devel/got/files/patch-lib_utf8.c (nonexistent) @@ -1,12 +0,0 @@ -XXX remove after 0.39 ---- lib/utf8.c.orig 2020-09-10 16:01:39 UTC -+++ lib/utf8.c -@@ -15,6 +15,8 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#include -+ - #include - #include - #include Property changes on: head/devel/got/files/patch-lib_utf8.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c =================================================================== --- head/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c (revision 549450) +++ head/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c (nonexistent) @@ -1,11 +0,0 @@ -XXX remove after 0.39 ---- libexec/got-read-gotconfig/got-read-gotconfig.c.orig 2020-09-14 16:29:32 UTC -+++ libexec/got-read-gotconfig/got-read-gotconfig.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - #include "got_error.h" Property changes on: head/devel/got/files/patch-libexec_got-read-gotconfig_got-read-gotconfig.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/got/files/patch-got_got.c =================================================================== --- head/devel/got/files/patch-got_got.c (revision 549450) +++ head/devel/got/files/patch-got_got.c (revision 549451) @@ -1,53 +1,53 @@ ---- 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[]) argc -= optind; argv += optind; - optind = 0; + optind = 1; + optreset = 1; 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) { - if (errno != ELOOP) { + if (errno != ELOOP && errno != EMLINK) { 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) { - if (errno != ELOOP) { + if (errno != ELOOP && errno != EMLINK) { 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), - got_object_commit_get_author_time(commit)); + (long long)got_object_commit_get_author_time(commit)); fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER, got_object_commit_get_author(commit), - got_object_commit_get_committer_time(commit)); + (long long)got_object_commit_get_committer_time(commit)); 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), - got_object_tag_get_tagger_time(tag)); + (long long)got_object_tag_get_tagger_time(tag)); tagmsg = got_object_tag_get_message(tag); fprintf(outfile, "messagelen %zd\n", strlen(tagmsg)); Index: head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y =================================================================== --- head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y (revision 549450) +++ head/devel/got/files/patch-libexec_got-read-gotconfig_parse.y (revision 549451) @@ -1,59 +1,29 @@ -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); -static int parseport(char *, long long *); +static int parseport(char *, int64_t *); 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; - if (asprintf(&s, "%lld", $1) == -1) { + if (asprintf(&s, "%lld", (long long)$1) == -1) { yyerror("string: asprintf"); YYERROR; } -@@ -395,7 +385,7 @@ getservice(char *n) +@@ -385,7 +385,7 @@ getservice(char *n) } static int -parseport(char *port, long long *pn) +parseport(char *port, int64_t *pn) { if ((*pn = getservice(port)) == -1) { *pn = 0LL; Index: head/devel/got/files/patch-regress_cmdline_common.sh =================================================================== --- head/devel/got/files/patch-regress_cmdline_common.sh (revision 549450) +++ head/devel/got/files/patch-regress_cmdline_common.sh (revision 549451) @@ -1,52 +1,32 @@ -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 export MALLOC_OPTIONS=S +# compat wrapper +sed() +( + for i; do + arg=$1 + shift + case $arg in + -i) set - "$@" "$arg" '' ;; + *) set - "$@" "$arg" ;; + esac + done + exec sed "$@" +) + 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 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