Attachment 204450 Details for Bug 237971 – py-salt20183 patch

[patch] py-salt20183 patch

py-salt20183.diff.txt (text/plain), 2.90 KB, created by Christer Edwards on 2019-05-18 18:22:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2019-05-18 18:22:01 UTC

Size: 2.90 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt20183/Makefile
>--- py-salt/Makefile	2019-04-30 13:13:10.000000000 +0000
>+++ py-salt20183/Makefile	2019-05-18 18:09:13.233550000 +0000
>@@ -1,9 +1,8 @@
> # Created by: Christer Edwards <christer.edwards@gmail.com>
>-# $FreeBSD: head/sysutils/py-salt/Makefile 500487 2019-04-30 13:13:10Z swills $
>+# $FreeBSD: $
> 
> PORTNAME=	salt
>-PORTVERSION=	2019.2.0
>-PORTREVISION=	1
>+PORTVERSION=	2018.3.4
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -75,7 +74,8 @@
> 			${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo@${PY_FLAVOR} \
> 			${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet@${PY_FLAVOR}
> 
>-TCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${PY_FLAVOR}
>+TCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${PY_FLAVOR} \
>+			${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}
> 
> ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}
> ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} \
>diff -ruN py-salt/distinfo py-salt20183/distinfo
>--- py-salt/distinfo	2019-02-27 15:05:33.000000000 +0000
>+++ py-salt20183/distinfo	2019-03-04 04:10:46.537578000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1551187154
>-SHA256 (salt-2019.2.0.tar.gz) = 5695bb2b3fa288bcfc0e3b93d9449afd75220bd8f0deefb5e7fc03af381df6cd
>-SIZE (salt-2019.2.0.tar.gz) = 14952746
>+TIMESTAMP = 1551672646
>+SHA256 (salt-2018.3.4.tar.gz) = e8a11bdd0b549360006196660b32b33746aeb37ba8b61a1a90c8b6f1d6da3c30
>+SIZE (salt-2018.3.4.tar.gz) = 14404085
>diff -ruN py-salt/files/salt_proxy.in py-salt20183/files/salt_proxy.in
>--- py-salt/files/salt_proxy.in	2019-04-30 13:13:10.000000000 +0000
>+++ py-salt20183/files/salt_proxy.in	2015-09-27 14:32:04.000000000 +0000
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-# $FreeBSD: head/sysutils/py-salt/files/salt_proxy.in 500487 2019-04-30 13:13:10Z swills $
>+# $FreeBSD: head/sysutils/py-salt/files/salt_proxy.in 398042 2015-09-27 14:32:04Z junovitch $
> #
> # Salt Proxy startup script
> #
>@@ -38,8 +38,8 @@
> required_files="%%PREFIX%%/etc/salt"
> command_args="-c ${required_files} -d"
> 
>-export PATH="${salt_proxy_paths}"
>-export PYTHON_EGG_CACHE="${salt_proxy_eggcache}"
>+export PATH="${salt_minion_paths}"
>+export PYTHON_EGG_CACHE="${salt_minion_eggcache}"
> 
> salt_proxy_start()
> {
>diff -ruN py-salt/pkg-plist py-salt20183/pkg-plist
>--- py-salt/pkg-plist	2019-04-25 14:48:37.000000000 +0000
>+++ py-salt20183/pkg-plist	2019-05-03 17:47:59.739827000 +0000
>@@ -3,5 +3,5 @@
> %%PYTHON_SITELIBDIR%%/salt/_syspaths.py
> %%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
> %%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
>-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
> %%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc

Actions: View | Diff

Attachments on bug 237971: 204450 | 204451 | 204452 | 204453 | 204454 | 204455