Attachment 221557 Details for Bug 252593 – Fixed formating

[patch] Fixed formating

datadog-integrations.patch (text/plain), 6.08 KB, created by uros on 2021-01-14 10:14:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: uros

Created: 2021-01-14 10:14:18 UTC

Size: 6.08 KB

patch

obsolete

>diff -ru --new-file datadog-integrations.orig/Makefile datadog-integrations/Makefile
>--- datadog-integrations.orig/Makefile	2021-01-08 17:36:02.000000000 +0100
>+++ datadog-integrations/Makefile	2021-01-14 11:08:03.214642000 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/sysutils/datadog-integrations/Makefile 560794 2021-01-08 16:36:02Z mikael $
> 
> PORTNAME=	datadog-integrations
>-DISTVERSION=	7.23.0
>+DISTVERSION=	7.24.0
> CATEGORIES=	sysutils
> 
> MAINTAINER=	uros@gruber.si
>@@ -12,7 +12,7 @@
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
> 
>-RUN_DEPENDS=	datadog-agent>=${DISTVERSION}:sysutils/datadog-agent \
>+RUN_DEPENDS=	datadog-agent>=7.24.1:sysutils/datadog-agent \
> 		${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \
>@@ -28,20 +28,19 @@
> 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
> 
> USES=		python:3.7+
>-
>-ETCDIR=		${PREFIX}/etc/datadog
>-
>-USERS=		datadog
>-GROUPS=		${USERS}
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	DataDog
> GH_PROJECT=	integrations-core
> GH_TAGNAME=	${DISTVERSION}
> 
>+ETCDIR=		${PREFIX}/etc/datadog
>+
> NO_BUILD=	yes
> NO_ARCH=	yes
> 
>+USERS=		datadog
>+GROUPS=		${USERS}
>+
> PLIST_SUB+=	USER=${USERS} \
> 		GROUP=${GROUPS}
> 
>@@ -114,7 +113,7 @@
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
> 
>-	# Install core-integrations
>+# Install core-integrations
> .for dir in ${INTEGRATIONS}
> 	(cd ${WRKSRC}/${dir}; \
> 	${PYTHON_CMD} setup.py bdist; \
>@@ -122,7 +121,7 @@
> .endfor
> 
> post-install:
>-	# Install core-integrations
>+# Install core-integrations
> .for dir in ${CONFFILES}
> 	(cd ${WRKSRC}/${dir}; \
> 	${MV} datadog_checks/${dir}/data ${STAGEDIR}${ETCDIR}/conf.d/${dir}.d)
>diff -ru --new-file datadog-integrations.orig/distinfo datadog-integrations/distinfo
>--- datadog-integrations.orig/distinfo	2020-12-12 20:00:33.000000000 +0100
>+++ datadog-integrations/distinfo	2021-01-11 18:01:12.723854000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1603966878
>-SHA256 (DataDog-integrations-core-7.23.0_GH0.tar.gz) = 6d9c54a79b0eaa675bd3944c240269e8ce45e1c3f8c1b3d508b399f36e41321f
>-SIZE (DataDog-integrations-core-7.23.0_GH0.tar.gz) = 29105298
>+TIMESTAMP = 1610384472
>+SHA256 (DataDog-integrations-core-7.24.0_GH0.tar.gz) = fdb04d75b10e18610570aeea8f316cdc71511512bfd7617984e54cde93d0c426
>+SIZE (DataDog-integrations-core-7.24.0_GH0.tar.gz) = 29726898
>diff -ru --new-file datadog-integrations.orig/pkg-plist datadog-integrations/pkg-plist
>--- datadog-integrations.orig/pkg-plist	2021-01-08 17:36:02.000000000 +0100
>+++ datadog-integrations/pkg-plist	2021-01-11 20:17:50.207253000 +0100
>@@ -149,6 +149,7 @@
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/__pycache__/tailfile.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/__pycache__/time.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/__pycache__/timeout.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/__pycache__/tls.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/__pycache__/tracing.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/agent/__init__.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/agent/__pycache__/__init__.cpython-37.pyc
>@@ -171,10 +172,14 @@
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/__pycache__/__init__.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/__pycache__/core.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/__pycache__/query.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/__pycache__/sql.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/__pycache__/statement_metrics.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/__pycache__/transform.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/__pycache__/utils.cpython-37.pyc
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/core.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/query.py
>+%%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/sql.py
>+%%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/statement_metrics.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/transform.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/db/utils.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/headers.py
>@@ -204,6 +209,7 @@
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/tailfile.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/time.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/timeout.py
>+%%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/tls.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/base/utils/tracing.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/checks/__init__.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/checks/__pycache__/__init__.cpython-37.pyc
>@@ -452,11 +458,11 @@
> %%PYTHON_SITELIBDIR%%/datadog_checks/utils/tailfile.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/utils/timeout.py
> %%PYTHON_SITELIBDIR%%/datadog_checks/utils/tracing.py
>-%%PYTHON_SITELIBDIR%%/datadog_checks_base-14.0.1-py%%PYTHON_VER%%.egg-info/PKG-INFO
>-%%PYTHON_SITELIBDIR%%/datadog_checks_base-14.0.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>-%%PYTHON_SITELIBDIR%%/datadog_checks_base-14.0.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>-%%PYTHON_SITELIBDIR%%/datadog_checks_base-14.0.1-py%%PYTHON_VER%%.egg-info/requires.txt
>-%%PYTHON_SITELIBDIR%%/datadog_checks_base-14.0.1-py%%PYTHON_VER%%.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/datadog_checks_base-15.6.1-py%%PYTHON_VER%%.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/datadog_checks_base-15.6.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/datadog_checks_base-15.6.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/datadog_checks_base-15.6.1-py%%PYTHON_VER%%.egg-info/requires.txt
>+%%PYTHON_SITELIBDIR%%/datadog_checks_base-15.6.1-py%%PYTHON_VER%%.egg-info/top_level.txt
> %%CONSUL%%%%PYTHON_SITELIBDIR%%/datadog_consul-1.16.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
> %%CONSUL%%%%PYTHON_SITELIBDIR%%/datadog_consul-1.16.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
> %%CONSUL%%%%PYTHON_SITELIBDIR%%/datadog_consul-1.16.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt

Actions: View | Diff

Attachments on bug 252593: 221476 | 221557 | 221558