diff --git a/devel/got/Makefile b/devel/got/Makefile index 033d5dbe581e..1308e85f4d16 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,34 +1,34 @@ PORTNAME= got -PORTVERSION= 0.76 +PORTVERSION= 0.77 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ MAINTAINER= naddy@FreeBSD.org COMMENT= Game of Trees version control system WWW= https://gameoftrees.org LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix CONFLICTS_INSTALL= p5-App-GitGot # Insert #include "openbsd-compat.h" into each source file, # after the <...> includes and before the "..." ones. n= ${.newline} post-extract: @${FIND} ${WRKSRC} -name '*.[cy]' -exec \ ${REINPLACE_CMD} '1,/^#include "/{ \ /^#include "/i\$n#include "openbsd-compat.h"\$n$n}' \ {} + ${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC} # The regression test suite requires: # installed got # installed git # ssh to 127.0.0.1 regress: @(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress) .include diff --git a/devel/got/distinfo b/devel/got/distinfo index b7d53b327852..61943694a250 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663960911 -SHA256 (got-0.76.tar.gz) = a2d735cbbf4537bac728d87e345e0458d7fa45f51a7533226ac1da7879a39350 -SIZE (got-0.76.tar.gz) = 777980 +TIMESTAMP = 1666621785 +SHA256 (got-0.77.tar.gz) = de2a1361c9cac212632f140c123871c7bdb07dbfb616a685032a137936d08456 +SIZE (got-0.77.tar.gz) = 830525 diff --git a/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c b/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c index 1e2d4660eac6..bc07b3bdb9bc 100644 --- a/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c +++ b/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c @@ -1,22 +1,22 @@ ---- libexec/got-index-pack/got-index-pack.c.orig 2022-06-19 18:47:42 UTC +--- libexec/got-index-pack/got-index-pack.c.orig 2022-10-20 14:40:52 UTC +++ libexec/got-index-pack/got-index-pack.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include - #include - #include -@@ -1020,6 +1021,11 @@ main(int argc, char **argv) + #include +@@ -110,6 +111,11 @@ main(int argc, char **argv) /* revoke access to most system calls */ if (pledge("stdio recvfd", NULL) == -1) { err = got_error_from_errno("pledge"); + got_privsep_send_error(&ibuf, err); + return 1; + } + if (cap_enter() == -1) { + err = got_error_from_errno("cap_enter"); got_privsep_send_error(&ibuf, err); return 1; } diff --git a/devel/got/files/patch-regress_cmdline_common.sh b/devel/got/files/patch-regress_cmdline_common.sh index fe56acb5f345..fd950c2005dd 100644 --- a/devel/got/files/patch-regress_cmdline_common.sh +++ b/devel/got/files/patch-regress_cmdline_common.sh @@ -1,23 +1,32 @@ ---- regress/cmdline/common.sh.orig 2021-03-22 10:05:11 UTC +--- regress/cmdline/common.sh.orig 2022-08-23 09:11:50 UTC +++ regress/cmdline/common.sh -@@ -26,6 +26,20 @@ export GOT_TEST_ROOT="/tmp" +@@ -27,6 +27,29 @@ export GOT_IGNORE_GITCONFIG=1 export MALLOC_OPTIONS=S ++# work around the fix for CVE-2022-39253 in Git 2.38.1 ++git() ++( ++ if [ "$1" = submodule ]; then ++ set - -c protocol.file.allow=always "$@" ++ fi ++ exec git "$@" ++) ++ +# 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"