From 6d3e17d8c75029df47d65e2acc5194e0a81c8bf8 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Sun, 2 Jun 2024 18:44:16 +0400 Subject: [PATCH] Update agent version to 1.8.2 Changes: - pyMySQL version updated to 1.1.1 (CVE-2024-36039), - requests version updated to 2.32.2, - dropped support for RHEL 8 (Python 3.6 is EOL since 2021). --- amplify/agent/common/context.py | 2 +- packages/nginx-amplify-agent/deb/debian/changelog | 7 +++++++ packages/nginx-amplify-agent/requirements-amzn2.txt | 2 +- packages/nginx-amplify-agent/requirements-py310.txt | 4 ++-- packages/nginx-amplify-agent/requirements-py39.txt | 4 ++-- packages/nginx-amplify-agent/requirements-rhel8.txt | 8 -------- packages/nginx-amplify-agent/requirements-rhel9.txt | 2 +- packages/nginx-amplify-agent/requirements.txt | 4 ++-- .../nginx-amplify-agent/rpm/nginx-amplify-agent.spec | 12 +++++------- packages/nginx-amplify-agent/setup-py310.py | 2 +- packages/nginx-amplify-agent/setup-py39.py | 2 +- packages/nginx-amplify-agent/setup.py | 2 +- packages/version | 2 +- 13 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 packages/nginx-amplify-agent/requirements-rhel8.txt diff --git a/amplify/agent/common/context.py b/amplify/agent/common/context.py index a51b6ec..bf67a08 100644 --- a/amplify/agent/common/context.py +++ b/amplify/agent/common/context.py @@ -37,7 +37,7 @@ class Context(Singleton): # define vars self.cpu_last_check = 0 - self.version_semver = (1, 8, 1) + self.version_semver = (1, 8, 2) self.version_build = 1 self.uuid = None self.version = '%s-%s' % ('.'.join(map(str, self.version_semver)), self.version_build) diff --git a/packages/nginx-amplify-agent/deb/debian/changelog b/packages/nginx-amplify-agent/deb/debian/changelog index a5b440f..a2faa49 100644 --- a/packages/nginx-amplify-agent/deb/debian/changelog +++ b/packages/nginx-amplify-agent/deb/debian/changelog @@ -1,3 +1,10 @@ +nginx-amplify-agent (1.8.2-1) stable; urgency=low + + * pyMySQL updated to 1.1.1 + * requests updated to 2.32.2 + + -- Andrei Belov Mon, 27 May 2024 18:05:44 +0400 + nginx-amplify-agent (1.8.1-1) stable; urgency=low * crossplane updated to 0.5.8 diff --git a/packages/nginx-amplify-agent/requirements-amzn2.txt b/packages/nginx-amplify-agent/requirements-amzn2.txt index 1c0fbfc..55f16b8 100644 --- a/packages/nginx-amplify-agent/requirements-amzn2.txt +++ b/packages/nginx-amplify-agent/requirements-amzn2.txt @@ -8,4 +8,4 @@ rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 ujson==5.4.0 -PyMySQL==1.0.2 +PyMySQL==1.1.1 diff --git a/packages/nginx-amplify-agent/requirements-py310.txt b/packages/nginx-amplify-agent/requirements-py310.txt index 9e4687d..9418947 100644 --- a/packages/nginx-amplify-agent/requirements-py310.txt +++ b/packages/nginx-amplify-agent/requirements-py310.txt @@ -7,6 +7,6 @@ crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 -requests==2.31.0 +requests==2.32.2 ujson==5.4.0 -PyMySQL==1.0.2 +PyMySQL==1.1.1 diff --git a/packages/nginx-amplify-agent/requirements-py39.txt b/packages/nginx-amplify-agent/requirements-py39.txt index 171c39b..477d5b0 100644 --- a/packages/nginx-amplify-agent/requirements-py39.txt +++ b/packages/nginx-amplify-agent/requirements-py39.txt @@ -7,6 +7,6 @@ crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 -requests==2.31.0 +requests==2.32.2 ujson==5.4.0 -PyMySQL==1.0.2 +PyMySQL==1.1.1 diff --git a/packages/nginx-amplify-agent/requirements-rhel8.txt b/packages/nginx-amplify-agent/requirements-rhel8.txt deleted file mode 100644 index 77536d6..0000000 --- a/packages/nginx-amplify-agent/requirements-rhel8.txt +++ /dev/null @@ -1,8 +0,0 @@ -netaddr==0.8.0 -flup==1.0.3 -crossplane==0.5.8 -rstr==3.0.0 -psutil==5.8.0 -python-daemon==2.2.4 -ujson==4.3.0 -PyMySQL==1.0.2 diff --git a/packages/nginx-amplify-agent/requirements-rhel9.txt b/packages/nginx-amplify-agent/requirements-rhel9.txt index 83c332d..f4db2e7 100644 --- a/packages/nginx-amplify-agent/requirements-rhel9.txt +++ b/packages/nginx-amplify-agent/requirements-rhel9.txt @@ -6,4 +6,4 @@ crossplane==0.5.7 rstr==3.0.0 python-daemon==2.2.4 ujson==5.4.0 -PyMySQL==1.0.2 +PyMySQL==1.1.1 diff --git a/packages/nginx-amplify-agent/requirements.txt b/packages/nginx-amplify-agent/requirements.txt index 0a007e4..3b2573b 100644 --- a/packages/nginx-amplify-agent/requirements.txt +++ b/packages/nginx-amplify-agent/requirements.txt @@ -7,6 +7,6 @@ crossplane==0.5.8 rstr==3.0.0 psutil==5.8.0 python-daemon==2.2.4 -requests==2.31.0 +requests==2.32.2 ujson==5.4.0 -PyMySQL==1.0.2 +PyMySQL==1.1.1 diff --git a/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec b/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec index ba0ead2..4515ada 100644 --- a/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec +++ b/packages/nginx-amplify-agent/rpm/nginx-amplify-agent.spec @@ -25,13 +25,6 @@ Requires: python3 >= 3.7 Requires: python3-requests %endif -%if 0%{?rhel} == 8 -Requires: python3 >= 3.6 -Requires: python3-gevent -Requires: python3-requests -Requires: python3-netifaces -%endif - %if 0%{?rhel} == 9 Requires: python3 >= 3.9 Requires: python3-requests @@ -164,6 +157,11 @@ fi %changelog +* Mon May 27 2024 Andrei Belov 1.8.2-1 +- 1.8.2-1 +- pyMySQL updated to 1.1.1 +- requests updated to 2.32.2 + * Fri Sep 23 2022 Andrei Belov 1.8.1-1 - 1.8.1-1 - crossplane updated to 0.5.8 diff --git a/packages/nginx-amplify-agent/setup-py310.py b/packages/nginx-amplify-agent/setup-py310.py index 3ccaa35..2509a0e 100644 --- a/packages/nginx-amplify-agent/setup-py310.py +++ b/packages/nginx-amplify-agent/setup-py310.py @@ -33,7 +33,7 @@ elif is_deb(): setup( name="nginx-amplify-agent", - version="1.8.1", + version="1.8.2", author="Mike Belov", author_email="dedm@nginx.com", description="NGINX Amplify Agent", diff --git a/packages/nginx-amplify-agent/setup-py39.py b/packages/nginx-amplify-agent/setup-py39.py index 3ccaa35..2509a0e 100644 --- a/packages/nginx-amplify-agent/setup-py39.py +++ b/packages/nginx-amplify-agent/setup-py39.py @@ -33,7 +33,7 @@ elif is_deb(): setup( name="nginx-amplify-agent", - version="1.8.1", + version="1.8.2", author="Mike Belov", author_email="dedm@nginx.com", description="NGINX Amplify Agent", diff --git a/packages/nginx-amplify-agent/setup.py b/packages/nginx-amplify-agent/setup.py index c6a7b25..0f8d08f 100644 --- a/packages/nginx-amplify-agent/setup.py +++ b/packages/nginx-amplify-agent/setup.py @@ -33,7 +33,7 @@ elif is_deb(): setup( name="nginx-amplify-agent", - version="1.8.1", + version="1.8.2", author="Mike Belov", author_email="dedm@nginx.com", description="NGINX Amplify Agent", diff --git a/packages/version b/packages/version index cf79782..80be405 100644 --- a/packages/version +++ b/packages/version @@ -1 +1 @@ -1.8.1-1 +1.8.2-1