From 61e999c21c750a19c50db238c70a610357543ca59600270efd3f8f04e9d8259e Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Sat, 24 Sep 2022 08:56:06 +0000 Subject: [PATCH] Accepting request 1005624 from home:glaubitz:branches:Cloud:Tools - Update to version 1.33.4 (bsc#1203170) * Fix the issue where watchdog sending signal to incorrect processes and add FIPS mode support * Apply additional check on awscredsuri option - from version 1.33.3 * Fix the potential stunnel hanging issue caused by full subprocess PIPE filled by stunnel log * Specify FIPS mode in configuration * Add separate env_path for macOS; Add comments * Update get-pip.py download url in README - from version 1.33.2 * Fix the incorrect path to generate read_ahead_kb config file and Bump the default tls port range from 400 to 1000 - Add patch to use unittest.mock instead of mock in testsuite * use_mock_from_unittest.patch - Use relative URL in Source field OBS-URL: https://build.opensuse.org/request/show/1005624 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-efs-utils?expand=0&rev=25 --- aws-efs-utils.changes | 20 ++++++++++++++++++++ aws-efs-utils.spec | 6 ++++-- efs-utils-1.33.1.tar.gz | 3 --- efs-utils-1.33.4.tar.gz | 3 +++ use_mock_from_unittest.patch | 12 ++++++++++++ 5 files changed, 39 insertions(+), 5 deletions(-) delete mode 100644 efs-utils-1.33.1.tar.gz create mode 100644 efs-utils-1.33.4.tar.gz create mode 100644 use_mock_from_unittest.patch diff --git a/aws-efs-utils.changes b/aws-efs-utils.changes index 5ba355d..42da342 100644 --- a/aws-efs-utils.changes +++ b/aws-efs-utils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Sep 23 13:00:33 UTC 2022 - John Paul Adrian Glaubitz + +- Update to version 1.33.4 (bsc#1203170) + * Fix the issue where watchdog sending signal to incorrect + processes and add FIPS mode support + * Apply additional check on awscredsuri option +- from version 1.33.3 + * Fix the potential stunnel hanging issue caused by full + subprocess PIPE filled by stunnel log + * Specify FIPS mode in configuration + * Add separate env_path for macOS; Add comments + * Update get-pip.py download url in README +- from version 1.33.2 + * Fix the incorrect path to generate read_ahead_kb config file + and Bump the default tls port range from 400 to 1000 +- Add patch to use unittest.mock instead of mock in testsuite + * use_mock_from_unittest.patch +- Use relative URL in Source field + ------------------------------------------------------------------- Wed May 18 05:39:02 UTC 2022 - pgajdos@suse.com diff --git a/aws-efs-utils.spec b/aws-efs-utils.spec index c9f7aed..8cdbb79 100644 --- a/aws-efs-utils.spec +++ b/aws-efs-utils.spec @@ -17,16 +17,17 @@ Name: aws-efs-utils -Version: 1.33.1 +Version: 1.33.4 Release: 0 Summary: Utilities for using the EFS file systems License: MIT Group: System/Management URL: https://github.com/aws/efs-utils -Source0: https://github.com/aws/efs-utils/archive/refs/tags/v%{version}.tar.gz#/efs-utils-%{version}.tar.gz +Source0: %{url}/archive/v%{version}.tar.gz#/efs-utils-%{version}.tar.gz Patch0: disable_mount_efs_test.patch Patch1: harden_amazon-efs-mount-watchdog.service.patch Patch2: skip-styletest.patch +Patch3: use_mock_from_unittest.patch BuildRequires: openssl BuildRequires: python3-attrs >= 17.4.0 BuildRequires: python3-botocore >= 1.17.53 @@ -60,6 +61,7 @@ This package provides utilities for using the EFS file systems. find . -name "*.py" -exec sed -i 's/env python3/python3/' {} + %patch1 -p1 %patch2 +%patch3 -p1 %build # No build required diff --git a/efs-utils-1.33.1.tar.gz b/efs-utils-1.33.1.tar.gz deleted file mode 100644 index 155aca3..0000000 --- a/efs-utils-1.33.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62dba9d76224420ea65b0c7107d5b4dbf3273edba592a48e84a622570515150 -size 112444 diff --git a/efs-utils-1.33.4.tar.gz b/efs-utils-1.33.4.tar.gz new file mode 100644 index 0000000..66dfd12 --- /dev/null +++ b/efs-utils-1.33.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6d8198f4d45103f5b44e781c229b4b2c6c58da2c3128e992b1c9ba9c77f64df +size 117274 diff --git a/use_mock_from_unittest.patch b/use_mock_from_unittest.patch new file mode 100644 index 0000000..686273c --- /dev/null +++ b/use_mock_from_unittest.patch @@ -0,0 +1,12 @@ +diff -Nru efs-utils-1.33.4.orig/test/common.py efs-utils-1.33.4/test/common.py +--- efs-utils-1.33.4.orig/test/common.py 2022-09-22 07:36:56.000000000 +0200 ++++ efs-utils-1.33.4/test/common.py 2022-09-23 14:58:48.522147941 +0200 +@@ -8,7 +8,7 @@ + + import subprocess + +-from mock import MagicMock ++from unittest.mock import MagicMock + + + # The process mock can be retrieved by calling PopenMock().mock