diff --git a/devel/got/Makefile b/devel/got/Makefile index 1308e85f4d16..7d9d34c24d88 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,34 +1,34 @@ PORTNAME= got -PORTVERSION= 0.77 +PORTVERSION= 0.78 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 61943694a250..d927858483f7 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666621785 -SHA256 (got-0.77.tar.gz) = de2a1361c9cac212632f140c123871c7bdb07dbfb616a685032a137936d08456 -SIZE (got-0.77.tar.gz) = 830525 +TIMESTAMP = 1667499429 +SHA256 (got-0.78.tar.gz) = 1f0189f18cb8b376da944a1f8324e2949106398b6d221c7cbb3d0157d56b715e +SIZE (got-0.78.tar.gz) = 842599 diff --git a/devel/got/files/patch-regress_cmdline_common.sh b/devel/got/files/patch-regress_cmdline_common.sh index fd950c2005dd..52633c021556 100644 --- a/devel/got/files/patch-regress_cmdline_common.sh +++ b/devel/got/files/patch-regress_cmdline_common.sh @@ -1,32 +1,23 @@ ---- regress/cmdline/common.sh.orig 2022-08-23 09:11:50 UTC +--- regress/cmdline/common.sh.orig 2022-10-24 22:00:47 UTC +++ regress/cmdline/common.sh -@@ -27,6 +27,29 @@ export GOT_IGNORE_GITCONFIG=1 +@@ -27,6 +27,20 @@ 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"