Index: head/sysutils/fusefs-gitfs/Makefile =================================================================== --- head/sysutils/fusefs-gitfs/Makefile (revision 517811) +++ head/sysutils/fusefs-gitfs/Makefile (revision 517812) @@ -1,47 +1,48 @@ # $FreeBSD$ PORTNAME= gitfs -DISTVERSION= 0.4.5.1 -PORTREVISION= 1 +DISTVERSION= 0.5.2 CATEGORIES= sysutils devel PKGNAMEPREFIX= fusefs- MAINTAINER= jbeich@FreeBSD.org COMMENT= Version controlled file system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>=0.1.1:devel/py-atomiclong@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cffi>=1.12.3:devel/py-cffi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fusepy>=3.0.1:devel/py-fusepy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycparser>=2.19:devel/py-pycparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygit2>=0.28.2:devel/py-pygit2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}raven>=6.10.0:devel/py-raven@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=4.6.5:devel/py-pytest@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= PressLabs NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils concurrent optsuffix post-patch: @${REINPLACE_CMD} -e 's/==/>=/' ${WRKSRC}/*requirements.txt # XXX Integrations tests want MOUNT_PATH, REPO_* passed via TEST_ENV do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) .include .if ${PYTHON_REL} < 3300 TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} .else post-patch: patch-py3k-mock patch-py3k-mock: @${GREP} -Flr 'mock import' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.mock -e 's/mock import/unittest.&/' .endif .include Index: head/sysutils/fusefs-gitfs/distinfo =================================================================== --- head/sysutils/fusefs-gitfs/distinfo (revision 517811) +++ head/sysutils/fusefs-gitfs/distinfo (revision 517812) @@ -1,3 +1,3 @@ -TIMESTAMP = 1481188259 -SHA256 (PressLabs-gitfs-0.4.5.1_GH0.tar.gz) = 6049fd81182d9172e861d922f3e2660f76366f85f47f4c2357f769d24642381c -SIZE (PressLabs-gitfs-0.4.5.1_GH0.tar.gz) = 57695 +TIMESTAMP = 1571569210 +SHA256 (PressLabs-gitfs-0.5.2_GH0.tar.gz) = 921e24311e3b8ea3a5448d698a11a747618ee8dd62d5d43a85801de0b111cbf3 +SIZE (PressLabs-gitfs-0.5.2_GH0.tar.gz) = 64141 Index: head/sysutils/fusefs-gitfs/files/patch-gitfs_utils_args.py =================================================================== --- head/sysutils/fusefs-gitfs/files/patch-gitfs_utils_args.py (revision 517811) +++ head/sysutils/fusefs-gitfs/files/patch-gitfs_utils_args.py (revision 517812) @@ -1,36 +1,36 @@ https://github.com/PressLabs/gitfs/issues/258 https://github.com/PressLabs/gitfs/issues/257 ---- gitfs/utils/args.py.orig 2016-10-19 15:12:59 UTC +--- gitfs/utils/args.py.orig 2019-10-20 11:00:10 UTC +++ gitfs/utils/args.py -@@ -43,7 +43,7 @@ class Args(object): - ("foreground", (False, "bool")), - ("branch", ("master", "string")), - ("allow_other", (False, "bool")), -- ("allow_root", (True, "bool")), -+ ("allow_root", (False, "bool")), - ("commiter_name", (self.get_commiter_user, "string")), - ("commiter_email", (self.get_commiter_email, "string")), - ("max_size", (10, "float")), -@@ -71,12 +71,6 @@ class Args(object): +@@ -44,7 +44,7 @@ class Args(object): + ("foreground", (False, "bool")), + ("branch", ("master", "string")), + ("allow_other", (False, "bool")), +- ("allow_root", (True, "bool")), ++ ("allow_root", (False, "bool")), + ("commiter_name", (self.get_commiter_user, "string")), + ("commiter_email", (self.get_commiter_email, "string")), + ("max_size", (10, "float")), +@@ -76,12 +76,6 @@ class Args(object): return self.check_args(self.set_defaults(args)) def check_args(self, args): - # check allow_other and allow_root - if args.allow_other: - args.allow_root = False - else: - args.allow_root = True - # check log_level if args.debug: - args.log_level = 'debug' -@@ -169,7 +163,7 @@ class Args(object): + args.log_level = "debug" +@@ -182,7 +176,7 @@ class Args(object): return "{}@{}".format(args.user, socket.gethostname()) def get_repo_path(self, args): - return tempfile.mkdtemp(dir="/var/lib/gitfs") + return tempfile.mkdtemp(prefix="gitfs") def get_ssh_key(self, args): return os.environ["HOME"] + "/.ssh/id_rsa"