diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2020-06-18 15:15:00 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2020-06-18 15:15:00 +0000 |
| commit | 7ff922fd1dcf027f396c92bf974f6645079d7518 (patch) | |
| tree | dd36dfa155a84a23f4f332d6f9eb519b8d825000 | |
| parent | f2d0e1387a4dd182cf2256c37e5fb2ceefa4c1c5 (diff) | |
| download | ports-7ff922fd1dcf027f396c92bf974f6645079d7518.tar.gz ports-7ff922fd1dcf027f396c92bf974f6645079d7518.zip | |
MFH: r539546
Update to 3001 Sodium.
Changes: https://salt.tips/whats-new-in-salt-sodium/
PR: 247372
Approved by: maintainer
Approved by: portmgr (blanket)
Notes
Notes:
svn path=/branches/2020Q2/; revision=539547
| -rw-r--r-- | sysutils/py-salt/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/py-salt/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/py-salt/files/patch-salt_loader.py | 12 | ||||
| -rw-r--r-- | sysutils/py-salt/files/patch-setup.py | 10 |
4 files changed, 16 insertions, 14 deletions
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 1daf6c07d7fb..e2fa42e89e00 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2019.2.5 +PORTVERSION= 3001 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index a42b7ce02d79..bd041e9d1f59 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -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 diff --git a/sysutils/py-salt/files/patch-salt_loader.py b/sysutils/py-salt/files/patch-salt_loader.py index 1578e73b9df7..f889f3c70adb 100644 --- a/sysutils/py-salt/files/patch-salt_loader.py +++ b/sysutils/py-salt/files/patch-salt_loader.py @@ -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 diff --git a/sysutils/py-salt/files/patch-setup.py b/sysutils/py-salt/files/patch-setup.py index e1516c3225de..57f656f3b492 100644 --- a/sysutils/py-salt/files/patch-setup.py +++ b/sysutils/py-salt/files/patch-setup.py @@ -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") |