update

wolfi-dev · Jun 20, 2024 · d19ea6c · d19ea6c
1 parent dce89ac
commit d19ea6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 77 deletions.
diff --git a/datadog-agent.yaml b/datadog-agent.yaml
@@ -252,7 +252,7 @@ subpackages:
             with:
               repository: https://github.com/DataDog/integrations-core
               tag: ${{package.version}}
-              expected-commit: c2b36b32207f8f91d70aca04be032097dcdfb774
+              expected-commit: 5da8cbaf24ef090f2801e807988d7f6f15dd3ee6
           - uses: patch
             with:
               patches: /home/build/cve-fixes.patch

diff --git a/datadog-agent/cve-fixes.patch b/datadog-agent/cve-fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/.deps/resolved/linux-aarch64_py3.txt b/.deps/resolved/linux-aarch64_py3.txt
-index 864dfc45e2..b44ebf44fd 100644
+index 2eafbffc4b..e3c38f2649 100644
 --- a/.deps/resolved/linux-aarch64_py3.txt
 +++ b/.deps/resolved/linux-aarch64_py3.txt
-@@ -76,11 +76,11 @@ pyasn1 @ https://agent-int-packages.datadoghq.com/external/pyasn1/pyasn1-0.4.6-p
+@@ -76,7 +76,7 @@ pyasn1 @ https://agent-int-packages.datadoghq.com/external/pyasn1/pyasn1-0.4.6-p
  pyasn1-modules @ https://agent-int-packages.datadoghq.com/external/pyasn1-modules/pyasn1_modules-0.4.0-py3-none-any.whl#sha256=be04f15b66c206eed667e0bb5ab27e2b1855ea54a842e5037738099e8ca4ae0b
  pycparser @ https://agent-int-packages.datadoghq.com/external/pycparser/pycparser-2.22-py3-none-any.whl#sha256=c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
  pycryptodomex @ https://agent-int-packages.datadoghq.com/external/pycryptodomex/pycryptodomex-3.20.0-cp35-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=91852d4480a4537d169c29a9d104dda44094c78f1f5b67bca76c29a91042b623
@@ -11,16 +11,11 @@ index 864dfc45e2..b44ebf44fd 100644
  pydantic-core @ https://agent-int-packages.datadoghq.com/external/pydantic-core/pydantic_core-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=4ac140d54da366672f6b91f9a1e8e2d4e7e72720143353501ae886d3fca03272
  pyjwt @ https://agent-int-packages.datadoghq.com/external/pyjwt/PyJWT-2.8.0-py3-none-any.whl#sha256=59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320
  pymongo @ https://agent-int-packages.datadoghq.com/external/pymongo/pymongo-4.6.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=60931b0e07448afe8866ffff764cd5bf4b1a855dc84c7dcb3974c6aa6a377a59
--pymysql @ https://agent-int-packages.datadoghq.com/external/pymysql/PyMySQL-1.1.0-py3-none-any.whl#sha256=8969ec6d763c856f7073c4c64662882675702efcb114b4bcbb955aea3a069fa7
-+pymysql @ https://agent-int-packages.datadoghq.com/external/pymysql/PyMySQL-1.1.1-py3-none-any.whl#sha256=4de15da4c61dc132f4fb9ab763063e693d521a80fd0e87943b9a453dd4c19d6c
- pynacl @ https://agent-int-packages.datadoghq.com/external/pynacl/PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=a36d4a9dda1f19ce6e03c9a784a2921a4b726b02e1c736600ca9c22029474394
- pyodbc @ https://agent-int-packages.datadoghq.com/built/pyodbc/pyodbc-5.1.0-20240416121030-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=a4cffc2d0b8caa1f2f1031164b4570b8ae5d0f75b05f1bc5c6bd7425640ea816
- pyopenssl @ https://agent-int-packages.datadoghq.com/external/pyopenssl/pyOpenSSL-24.1.0-py3-none-any.whl#sha256=17ed5be5936449c5418d1cd269a1a9e9081bc54c17aed272b45856a3d3dc86ad
 diff --git a/.deps/resolved/linux-x86_64_py3.txt b/.deps/resolved/linux-x86_64_py3.txt
-index 85adfd7da7..012040ff3f 100644
+index a8cda4efaf..27909d8b1e 100644
 --- a/.deps/resolved/linux-x86_64_py3.txt
 +++ b/.deps/resolved/linux-x86_64_py3.txt
-@@ -76,12 +76,12 @@ pyasn1 @ https://agent-int-packages.datadoghq.com/external/pyasn1/pyasn1-0.4.6-p
+@@ -76,7 +76,7 @@ pyasn1 @ https://agent-int-packages.datadoghq.com/external/pyasn1/pyasn1-0.4.6-p
  pyasn1-modules @ https://agent-int-packages.datadoghq.com/external/pyasn1-modules/pyasn1_modules-0.4.0-py3-none-any.whl#sha256=be04f15b66c206eed667e0bb5ab27e2b1855ea54a842e5037738099e8ca4ae0b
  pycparser @ https://agent-int-packages.datadoghq.com/external/pycparser/pycparser-2.22-py3-none-any.whl#sha256=c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
  pycryptodomex @ https://agent-int-packages.datadoghq.com/external/pycryptodomex/pycryptodomex-3.20.0-cp35-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=bca649483d5ed251d06daf25957f802e44e6bb6df2e8f218ae71968ff8f8edc4
@@ -29,17 +24,11 @@ index 85adfd7da7..012040ff3f 100644
  pydantic-core @ https://agent-int-packages.datadoghq.com/external/pydantic-core/pydantic_core-2.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=818f5cb1b209ab1295087c45717178f4bbbd2bd7eda421f7a119e7b9b736a3cb
  pyjwt @ https://agent-int-packages.datadoghq.com/external/pyjwt/PyJWT-2.8.0-py3-none-any.whl#sha256=59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320
  pymongo @ https://agent-int-packages.datadoghq.com/external/pymongo/pymongo-4.6.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=c2ad3e5bfcd345c0bfe9af69a82d720860b5b043c1657ffb513c18a0dee19c19
- pymqi @ https://agent-int-packages.datadoghq.com/built/pymqi/pymqi-1.12.10-20240419092042-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl#sha256=cfde2972d86d2988fca3336b5f8061498b8dd77a19377be1c86890ee205e989d
--pymysql @ https://agent-int-packages.datadoghq.com/external/pymysql/PyMySQL-1.1.0-py3-none-any.whl#sha256=8969ec6d763c856f7073c4c64662882675702efcb114b4bcbb955aea3a069fa7
-+pymysql @ https://agent-int-packages.datadoghq.com/external/pymysql/PyMySQL-1.1.1-py3-none-any.whl#sha256=4de15da4c61dc132f4fb9ab763063e693d521a80fd0e87943b9a453dd4c19d6c
- pynacl @ https://agent-int-packages.datadoghq.com/external/pynacl/PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=06b8f6fa7f5de8d5d2f7573fe8c863c051225a27b61e6860fd047b1775807858
- pyodbc @ https://agent-int-packages.datadoghq.com/built/pyodbc/pyodbc-5.1.0-20240419092043-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl#sha256=f21ee0d3575512fb4db66d8b7bc51b1f73df0f5929998c7008a66597f54021f5
- pyopenssl @ https://agent-int-packages.datadoghq.com/external/pyopenssl/pyOpenSSL-24.1.0-py3-none-any.whl#sha256=17ed5be5936449c5418d1cd269a1a9e9081bc54c17aed272b45856a3d3dc86ad
 diff --git a/agent_requirements.in b/agent_requirements.in
-index 3678372351..bb14908870 100644
+index e9c01a2f02..bb14908870 100644
 --- a/agent_requirements.in
 +++ b/agent_requirements.in
-@@ -61,13 +61,13 @@ psutil==5.9.0
+@@ -61,7 +61,7 @@ psutil==5.9.0
  psycopg2-binary==2.9.9; python_version > '3.0'
  pyasn1==0.4.6
  pycryptodomex==3.20.0
@@ -48,13 +37,6 @@ index 3678372351..bb14908870 100644
  pyjwt==1.7.1; python_version < '3.0'
  pyjwt==2.8.0; python_version > '3.0'
  pymongo[srv]==4.6.3; python_version >= '3.9'
- pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'
- pymysql==0.10.1; python_version < '3.0'
--pymysql==1.1.0; python_version > '3.0'
-+pymysql==1.1.1; python_version > '3.0'
- pyodbc==5.1.0; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'
- pysmi==0.3.4
- pysnmp-mibs==0.1.6
 @@ -94,7 +94,7 @@ requests-oauthlib==2.0.0; python_version > '3.0'
  requests-toolbelt==1.0.0
  requests-unixsocket==0.3.0
@@ -73,19 +55,6 @@ index 3678372351..bb14908870 100644
  typing==3.10.0.0; python_version < '3.0'
  uptime==3.0.1
  vertica-python==1.2.0; python_version < '3.0'
-diff --git a/cacti/pyproject.toml b/cacti/pyproject.toml
-index 171b91184c..0ecb46fc1c 100644
---- a/cacti/pyproject.toml
-+++ b/cacti/pyproject.toml
-@@ -40,7 +40,7 @@ dynamic = [
- [project.optional-dependencies]
- deps = [
-     "pymysql==0.10.1; python_version < '3.0'",
--    "pymysql==1.1.0; python_version > '3.0'",
-+    "pymysql==1.1.1; python_version > '3.0'",
- ]
-
- [project.urls]
 diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml
 index ab30be4505..0791c9027f 100644
 --- a/datadog_checks_base/pyproject.toml
@@ -160,32 +129,6 @@ index 7361c558b8..c2eaf18b33 100644
  ]
 
  [[envs.default.matrix]]
-diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml
-index 08acd12b34..1eede5c2c1 100644
---- a/mysql/pyproject.toml
-+++ b/mysql/pyproject.toml
-@@ -42,7 +42,7 @@ deps = [
-     "cryptography==3.3.2; python_version < '3.0'",
-     "cryptography==42.0.5; python_version > '3.0'",
-     "pymysql==0.10.1; python_version < '3.0'",
--    "pymysql==1.1.0; python_version > '3.0'",
-+    "pymysql==1.1.1; python_version > '3.0'",
- ]
-
- [project.urls]
-diff --git a/proxysql/pyproject.toml b/proxysql/pyproject.toml
-index 9044cfc157..b450860d8d 100644
---- a/proxysql/pyproject.toml
-+++ b/proxysql/pyproject.toml
-@@ -40,7 +40,7 @@ dynamic = [
- [project.optional-dependencies]
- deps = [
-     "pymysql==0.10.1; python_version < '3.0'",
--    "pymysql==1.1.0; python_version > '3.0'",
-+    "pymysql==1.1.1; python_version > '3.0'",
- ]
-
- [project.urls]
 diff --git a/singlestore/hatch.toml b/singlestore/hatch.toml
 index 3a56775cbf..e706f41b58 100644
 --- a/singlestore/hatch.toml
@@ -199,16 +142,3 @@ index 3a56775cbf..e706f41b58 100644
  ]
 
  [[envs.default.matrix]]
-diff --git a/singlestore/pyproject.toml b/singlestore/pyproject.toml
-index a145cea446..6b9f0dccea 100644
---- a/singlestore/pyproject.toml
-+++ b/singlestore/pyproject.toml
-@@ -40,7 +40,7 @@ dynamic = [
- [project.optional-dependencies]
- deps = [
-     "pymysql==0.10.1; python_version < '3.0'",
--    "pymysql==1.1.0; python_version > '3.0'",
-+    "pymysql==1.1.1; python_version > '3.0'",
- ]
-
- [project.urls]