From owner-svn-ports-head@freebsd.org Mon Dec 28 12:11:34 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 433B24B27A3; Mon, 28 Dec 2020 12:11:34 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4GcQ0KY2z3Lhd; Mon, 28 Dec 2020 12:11:34 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F28F5191C3; Mon, 28 Dec 2020 12:11:33 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BSCBX6q030120; Mon, 28 Dec 2020 12:11:33 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BSCBXWp030118; Mon, 28 Dec 2020 12:11:33 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202012281211.0BSCBXWp030118@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Mon, 28 Dec 2020 12:11:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559464 - head/net/glusterfs X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/net/glusterfs X-SVN-Commit-Revision: 559464 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Dec 2020 12:11:34 -0000 Author: fluffy Date: Mon Dec 28 12:11:33 2020 New Revision: 559464 URL: https://svnweb.freebsd.org/changeset/ports/559464 Log: net/glusterfs: unbreak build with python != 3.7 - get rid of hardcoded py37 suffixes in plist, use PYTHON_SUFFIX macro - add missed files to plist - bump PORTREVISION With hat: ports-secteam Modified: head/net/glusterfs/Makefile head/net/glusterfs/pkg-plist Modified: head/net/glusterfs/Makefile ============================================================================== --- head/net/glusterfs/Makefile Mon Dec 28 11:42:52 2020 (r559463) +++ head/net/glusterfs/Makefile Mon Dec 28 12:11:33 2020 (r559464) @@ -2,7 +2,7 @@ PORTNAME= glusterfs PORTVERSION= 8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ @@ -51,6 +51,7 @@ SHEBANG_FILES= build-aux/pkg-version \ USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes +USE_PYTHON= py3kplist USE_RC_SUBR= glusterd GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-epoll \ Modified: head/net/glusterfs/pkg-plist ============================================================================== --- head/net/glusterfs/pkg-plist Mon Dec 28 11:42:52 2020 (r559463) +++ head/net/glusterfs/pkg-plist Mon Dec 28 12:11:33 2020 (r559464) @@ -201,13 +201,13 @@ lib/ocf/resource.d/heartbeat/ganesha_grace lib/ocf/resource.d/heartbeat/ganesha_mon lib/ocf/resource.d/heartbeat/ganesha_nfsd %%PYTHON_SITELIBDIR%%/gluster/__init__.py -%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-37.opt-1.pyc -%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.py -%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-37.opt-1.pyc -%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-37.pyc -%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-37.opt-1.pyc -%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.py libdata/pkgconfig/glusterfs-api.pc libdata/pkgconfig/libgfchangelog.pc @@ -216,18 +216,18 @@ libexec/ganesha/dbus-send.sh libexec/ganesha/ganesha-ha.sh libexec/ganesha/generate-epoch.py libexec/glusterfs/gfevents/__init__.py -libexec/glusterfs/gfevents/__pycache__/__init__.cpython-37.opt-1.pyc -libexec/glusterfs/gfevents/__pycache__/__init__.cpython-37.pyc -libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-37.opt-1.pyc -libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-37.pyc -libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-37.opt-1.pyc -libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-37.pyc -libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-37.opt-1.pyc -libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-37.pyc -libexec/glusterfs/gfevents/__pycache__/handlers.cpython-37.opt-1.pyc -libexec/glusterfs/gfevents/__pycache__/handlers.cpython-37.pyc -libexec/glusterfs/gfevents/__pycache__/utils.cpython-37.opt-1.pyc -libexec/glusterfs/gfevents/__pycache__/utils.cpython-37.pyc +libexec/glusterfs/gfevents/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/gfevents/__pycache__/handlers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/handlers.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/gfevents/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/gfevents/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc libexec/glusterfs/gfevents/eventsapiconf.py libexec/glusterfs/gfevents/eventtypes.py libexec/glusterfs/gfevents/gf_event.py @@ -239,22 +239,21 @@ libexec/glusterfs/gfind_missing_files/gfid_to_path.py libexec/glusterfs/gfind_missing_files/gfid_to_path.sh libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh libexec/glusterfs/glfsheal -libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py libexec/glusterfs/glusterfind/__init__.py -libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-37.opt-1.pyc -libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-37.pyc -libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-37.opt-1.pyc -libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-37.pyc -libexec/glusterfs/glusterfind/__pycache__/conf.cpython-37.opt-1.pyc -libexec/glusterfs/glusterfind/__pycache__/conf.cpython-37.pyc -libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-37.opt-1.pyc -libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-37.pyc -libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-37.opt-1.pyc -libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-37.pyc -libexec/glusterfs/glusterfind/__pycache__/main.cpython-37.opt-1.pyc -libexec/glusterfs/glusterfind/__pycache__/main.cpython-37.pyc -libexec/glusterfs/glusterfind/__pycache__/utils.cpython-37.opt-1.pyc -libexec/glusterfs/glusterfind/__pycache__/utils.cpython-37.pyc +libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/glusterfind/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/glusterfind/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc +libexec/glusterfs/glusterfind/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +libexec/glusterfs/glusterfind/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc libexec/glusterfs/glusterfind/brickfind.py libexec/glusterfs/glusterfind/changelog.py libexec/glusterfs/glusterfind/changelogdata.py @@ -263,6 +262,7 @@ libexec/glusterfs/glusterfind/gfind_py2py3.py libexec/glusterfs/glusterfind/libgfchangelog.py libexec/glusterfs/glusterfind/main.py libexec/glusterfs/glusterfind/nodeagent.py +libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py libexec/glusterfs/glusterfind/tool.conf libexec/glusterfs/glusterfind/utils.py libexec/glusterfs/peer_add_secret_pub