From owner-svn-ports-all@freebsd.org Thu Jun 18 15:15:01 2020 Return-Path: Delivered-To: svn-ports-all@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 7DDC8353179; Thu, 18 Jun 2020 15:15:01 +0000 (UTC) (envelope-from krion@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 49nlq92qWYz4qLl; Thu, 18 Jun 2020 15:15:01 +0000 (UTC) (envelope-from krion@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 5C2D7B6FD; Thu, 18 Jun 2020 15:15:01 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05IFF1Zl048657; Thu, 18 Jun 2020 15:15:01 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05IFF0pN048653; Thu, 18 Jun 2020 15:15:00 GMT (envelope-from krion@FreeBSD.org) Message-Id: <202006181515.05IFF0pN048653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarev Date: Thu, 18 Jun 2020 15:15:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539547 - in branches/2020Q2/sysutils/py-salt: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: krion X-SVN-Commit-Paths: in branches/2020Q2/sysutils/py-salt: . files X-SVN-Commit-Revision: 539547 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2020 15:15:01 -0000 Author: krion Date: Thu Jun 18 15:15:00 2020 New Revision: 539547 URL: https://svnweb.freebsd.org/changeset/ports/539547 Log: MFH: r539546 Update to 3001 Sodium. Changes: https://salt.tips/whats-new-in-salt-sodium/ PR: 247372 Approved by: maintainer Approved by: portmgr (blanket) Modified: branches/2020Q2/sysutils/py-salt/Makefile branches/2020Q2/sysutils/py-salt/distinfo branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py branches/2020Q2/sysutils/py-salt/files/patch-setup.py Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/sysutils/py-salt/Makefile ============================================================================== --- branches/2020Q2/sysutils/py-salt/Makefile Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/Makefile Thu Jun 18 15:15:00 2020 (r539547) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2019.2.5 +PORTVERSION= 3001 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2020Q2/sysutils/py-salt/distinfo ============================================================================== --- branches/2020Q2/sysutils/py-salt/distinfo Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/distinfo Thu Jun 18 15:15:00 2020 (r539547) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589397818 -SHA256 (salt-2019.2.5.tar.gz) = 7d7b80f17017a34bf86c6d7d6b7a94df78694d1401e69192aa3abd406f0edf3f -SIZE (salt-2019.2.5.tar.gz) = 14574347 +TIMESTAMP = 1592464695 +SHA256 (salt-3001.tar.gz) = 5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154 +SIZE (salt-3001.tar.gz) = 14448043 Modified: branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py ============================================================================== --- branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py Thu Jun 18 15:15:00 2020 (r539547) @@ -1,11 +1,13 @@ ---- salt/loader.py +--- salt/loader.py.orig 2020-06-18 07:20:08 UTC +++ salt/loader.py -@@ -1240,7 +1240,7 @@ +@@ -1383,9 +1383,7 @@ class LazyLoader(salt.utils.lazy.LazyDict): try: pycache_files = [ - os.path.join('__pycache__', x) for x in -- sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) -+ sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc') + os.path.join("__pycache__", x) +- for x in sorted( +- os.listdir(os.path.join(mod_dir, "__pycache__")) +- ) ++ for x in sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc') ] except OSError: pass Modified: branches/2020Q2/sysutils/py-salt/files/patch-setup.py ============================================================================== --- branches/2020Q2/sysutils/py-salt/files/patch-setup.py Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/files/patch-setup.py Thu Jun 18 15:15:00 2020 (r539547) @@ -1,13 +1,13 @@ ---- setup.py.orig 2018-04-02 16:35:13 UTC +--- setup.py.orig 2020-06-18 07:24:31 UTC +++ setup.py -@@ -992,8 +992,8 @@ class SaltDistribution(distutils.dist.Di +@@ -1119,8 +1119,8 @@ class SaltDistribution(distutils.dist.Distribution): def _property_data_files(self): # Data files common to all scenarios data_files = [ -- ('share/man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']), -- ('share/man/man7', ['doc/man/salt.7']) +- ("share/man/man1", ["doc/man/salt-call.1", "doc/man/salt-run.1"]), +- ("share/man/man7", ["doc/man/salt.7"]), + ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']), + ('man/man7', ['doc/man/salt.7']) ] if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: - data_files[0][1].append('doc/man/salt-ssh.1') + data_files[0][1].append("doc/man/salt-ssh.1")