Attachment #218963 for bug #250519

View | Details | Raw Unified | Return to bug 250519
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	salt
PORTVERSION=	3002
CATEGORIES=	sysutils python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

# Unbreak the sysctl state.
# https://github.com/saltstack/salt/issues/57826
# https://github.com/saltstack/salt/pull/57839
PATCH_SITES=	https://github.com/saltstack/salt/commit/
PATCHFILES+=	1fa77bc846856d3a9a9d80e7643fb2f46febf827.patch:-p1

MAINTAINER=	christer.edwards@gmail.com
COMMENT=	Distributed remote execution and configuration management system



SUB_FILES=	pkg-message

OPTIONS_DEFINE=	AWS TCP ZEROMQ
OPTIONS_DEFAULT=ZEROMQ

AWS_DESC=	Install dependencies required for Amazon Web Services
RAET_DESC=	Install dependencies required for RAET transport
TCP_DESC=	Install dependencies required for TCP transport
ZEROMQ_DESC=	Install dependencies required for ZeroMQ transport


			${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR}

RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${PY_FLAVOR}

TCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}

ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}

Lines 1-5 Link Here

(-)distinfo (-5 / +3 lines)
1	TIMESTAMP = 1597171484	1	TIMESTAMP = 1603344549
2	SHA256 (salt-3001.1.tar.gz) = e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc	2	SHA256 (salt-3002.tar.gz) = b622c9de9fde571db96bfd659a183bea553dd26e71cac85659387e937221aae6
3	SIZE (salt-3001.1.tar.gz) = 14556156	3	SIZE (salt-3002.tar.gz) = 15741439
4	SHA256 (1fa77bc846856d3a9a9d80e7643fb2f46febf827.patch) = 36977a22f504cd383efb97b5ae6c34a4712f5843fb295af2dd8047afc17823cf
5	SIZE (1fa77bc846856d3a9a9d80e7643fb2f46febf827.patch) = 9298




--- salt/loader.py.orig	2020-10-22 05:33:25 UTC
+++ salt/loader.py
@@ -1468,7 +1468,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__")))
+                    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
                 except OSError:
                     pass

Return to bug 250519

Lines 2-18 Link Here

(-)Makefile (-11 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= salt	4	PORTNAME= salt
5	PORTVERSION= 3001.1	5	PORTVERSION= 3002
6	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		9
10	# Unbreak the sysctl state.
11	# https://github.com/saltstack/salt/issues/57826
12	# https://github.com/saltstack/salt/pull/57839
13	PATCH_SITES= https://github.com/saltstack/salt/commit/
14	PATCHFILES+= 1fa77bc846856d3a9a9d80e7643fb2f46febf827.patch:-p1
15
16	MAINTAINER= christer.edwards@gmail.com	10	MAINTAINER= christer.edwards@gmail.com
17	COMMENT= Distributed remote execution and configuration management system	11	COMMENT= Distributed remote execution and configuration management system
18		12
Lines 67-77 Link Here
67		61
68	SUB_FILES= pkg-message	62	SUB_FILES= pkg-message
69		63
70	OPTIONS_DEFINE= AWS RAET TCP ZEROMQ	64	OPTIONS_DEFINE= AWS TCP ZEROMQ
71	OPTIONS_DEFAULT=ZEROMQ	65	OPTIONS_DEFAULT=ZEROMQ
72		66
73	AWS_DESC= Install dependencies required for Amazon Web Services	67	AWS_DESC= Install dependencies required for Amazon Web Services
74	RAET_DESC= Install dependencies required for RAET transport
75	TCP_DESC= Install dependencies required for TCP transport	68	TCP_DESC= Install dependencies required for TCP transport
76	ZEROMQ_DESC= Install dependencies required for ZeroMQ transport	69	ZEROMQ_DESC= Install dependencies required for ZeroMQ transport
77		70
Lines 80-87 Link Here
80	${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \	73	${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \
81	${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR}	74	${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR}
82		75
83	RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${PY_FLAVOR}
84
85	TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}	76	TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}
86		77
87	ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}	78	ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}

Lines 1-13 Link Here

(-)files/patch-salt_loader.py (-12 / +10 lines)
1	--- salt/loader.py.orig 2020-06-18 07:20:08 UTC	1	--- salt/loader.py.orig 2020-10-22 05:33:25 UTC
2	+++ salt/loader.py	2	+++ salt/loader.py
3	@@ -1383,9 +1383,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):	3	@@ -1468,7 +1468,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
4	try:	4	try:
5	pycache_files = [	5	pycache_files = [
6	os.path.join("__pycache__", x)	6	os.path.join("__pycache__", x)
7	- for x in sorted(	7	- for x in sorted(os.listdir(os.path.join(mod_dir, "__pycache__")))
8	- os.listdir(os.path.join(mod_dir, "__pycache__"))	8	+ 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')
9	- )	9	]
10	+ 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')	10	except OSError:
11	]	11	pass
12	except OSError:
13	pass