diff --git a/aws-efs-utils.changes b/aws-efs-utils.changes index 3d04f15..3fb3afe 100644 --- a/aws-efs-utils.changes +++ b/aws-efs-utils.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue Dec 17 20:14:25 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com> + +- Update to version 1.17 + + Added support for Python 3 +- Enable testsuite which now passes on Python 3 +- Update BuildRequires from requirements.txt + +------------------------------------------------------------------- +Thu Dec 5 11:42:38 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com> + +- Update to version 1.16 + + Support Python 3 for tests +- from version 1.15 + + Properly support Python3 +- from version 1.14 + + Tolerate EFS state directory existing during mount +- from version 1.13 + + Change watchdog configuration so it stops after all file systems are unmounted +- from version 1.12 + + Update stunnel idle timeout + * The default stunnel idle timeout is many hours. By setting it to a value based + on the NFS lease length we can recover from network partitions sooner. +- from version 1.11 + + Add support for RHEL8 + * Fixes Python shebangs to work on systems without a default "python" version. + * Fixes watchdog process not being properly started on systemd systems. +- from version 1.10 + + Update to default configuration that disables OCSP + * To use OCSP, the client accessing EFS must be able to reach the Amazon Certificate + Authority (CA). To maximize file system availability in the event that the CA is + not reachable from your VPC, the EFS mount helper no longer enables OCSP by default. +- Don't enable testsuite as it is currently failing + + https://github.com/aws/efs-utils/issues/24 +- Drop patches merged upstream + + efs-switchparser.patch +- Update BuildRequires from requirements.txt + ------------------------------------------------------------------- Tue Apr 9 22:29:17 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com> diff --git a/aws-efs-utils.spec b/aws-efs-utils.spec index ccf1bbd..237b41a 100644 --- a/aws-efs-utils.spec +++ b/aws-efs-utils.spec @@ -1,7 +1,7 @@ # # spec file for package aws-efs-utils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,29 @@ Name: aws-efs-utils -Version: 1.7 +Version: 1.17 Release: 0 Summary: Utilities for using the EFS file systems License: MIT Group: System/Management -Url: https://github.com/aws/efs-utils +URL: https://github.com/aws/efs-utils Source0: https://github.com/aws/efs-utils/archive/v%{version}.tar.gz -Patch: efs-switchparser.patch +BuildRequires: python3-attrs >= 17.4.0 +BuildRequires: python3-coverage >= 4.5 +BuildRequires: python3-flake8 >= 3.7.9 +BuildRequires: python3-mccabe >= 0.6.1 +BuildRequires: python3-mock >= 2.0.0 +BuildRequires: python3-pbr >= 3.1.1 +BuildRequires: python3-pluggy >= 0.13.0 +BuildRequires: python3-py >= 1.8.0 +BuildRequires: python3-pycodestyle >= 2.5.0 +BuildRequires: python3-pyflakes >= 2.1.1 +BuildRequires: python3-pytest >= 4.6.7 +BuildRequires: python3-pytest-cov >= 2.8.1 +BuildRequires: python3-pytest-html >= 1.19.0 +BuildRequires: python3-pytest-metadata >= 1.7.0 +BuildRequires: python3-pytest-mock >= 1.11.2 +BuildRequires: python3-six >= 1.11.0 BuildRequires: systemd BuildRequires: systemd-rpm-macros Requires: nfs-utils @@ -38,11 +53,13 @@ This package provides utilities for using the EFS file systems. %prep %setup -n efs-utils-%{version} find . -name "*.py" -exec sed -i 's/env python/python3/' {} + -%patch -p1 %build # No build required +%check +make test + %install mkdir -p %{buildroot}%{_sysconfdir}/amazon/efs mkdir -p %{buildroot}%{_unitdir} diff --git a/efs-switchparser.patch b/efs-switchparser.patch deleted file mode 100644 index 7c47343..0000000 --- a/efs-switchparser.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Nru efs-utils-1.7.orig/src/mount_efs/__init__.py efs-utils-1.7/src/mount_efs/__init__.py ---- efs-utils-1.7.orig/src/mount_efs/__init__.py 2019-04-09 20:27:34.000000000 +0200 -+++ efs-utils-1.7/src/mount_efs/__init__.py 2019-04-09 23:59:43.477327640 +0200 -@@ -44,9 +44,9 @@ - from logging.handlers import RotatingFileHandler - - try: -- import ConfigParser -+ import ConfigParser as cp - except ImportError: -- from configparser import ConfigParser -+ import configparser as cp - - try: - from urllib2 import urlopen, URLError -@@ -537,7 +537,7 @@ - - - def read_config(config_file=CONFIG_FILE): -- p = ConfigParser.SafeConfigParser() -+ p = cp.ConfigParser() - p.read(config_file) - return p - -diff -Nru efs-utils-1.7.orig/src/watchdog/__init__.py efs-utils-1.7/src/watchdog/__init__.py ---- efs-utils-1.7.orig/src/watchdog/__init__.py 2019-04-09 20:27:34.000000000 +0200 -+++ efs-utils-1.7/src/watchdog/__init__.py 2019-04-09 23:59:43.477327640 +0200 -@@ -21,9 +21,9 @@ - from signal import SIGTERM - - try: -- import ConfigParser -+ import ConfigParser as cp - except ImportError: -- from configparser import ConfigParser -+ import configparser as cp - - VERSION = '1.7' - -@@ -280,7 +280,7 @@ - - - def read_config(config_file=CONFIG_FILE): -- p = ConfigParser.SafeConfigParser() -+ p = cp.ConfigParser() - p.read(config_file) - return p - -diff -Nru efs-utils-1.7.orig/test/mount_efs_test/test_choose_tls_port.py efs-utils-1.7/test/mount_efs_test/test_choose_tls_port.py ---- efs-utils-1.7.orig/test/mount_efs_test/test_choose_tls_port.py 2019-04-09 20:27:34.000000000 +0200 -+++ efs-utils-1.7/test/mount_efs_test/test_choose_tls_port.py 2019-04-09 23:59:43.477327640 +0200 -@@ -7,9 +7,13 @@ - # - - import mount_efs --import ConfigParser - import socket - -+try: -+ import ConfigParser as cp -+except ImportError: -+ import configparser as cp -+ - import pytest - - from mock import MagicMock -@@ -19,7 +23,7 @@ - - - def _get_config(): -- config = ConfigParser.SafeConfigParser() -+ config = cp.ConfigParser() - config.add_section(mount_efs.CONFIG_SECTION) - config.set(mount_efs.CONFIG_SECTION, 'port_range_lower_bound', str(DEFAULT_TLS_PORT_RANGE_LOW)) - config.set(mount_efs.CONFIG_SECTION, 'port_range_upper_bound', str(DEFAULT_TLS_PORT_RANGE_HIGH)) -diff -Nru efs-utils-1.7.orig/test/mount_efs_test/test_write_stunnel_config_file.py efs-utils-1.7/test/mount_efs_test/test_write_stunnel_config_file.py ---- efs-utils-1.7.orig/test/mount_efs_test/test_write_stunnel_config_file.py 2019-04-09 20:27:34.000000000 +0200 -+++ efs-utils-1.7/test/mount_efs_test/test_write_stunnel_config_file.py 2019-04-09 23:59:43.477327640 +0200 -@@ -7,9 +7,13 @@ - # - - import mount_efs --import ConfigParser - import os - -+try: -+ import ConfigParser as cp -+except ImportError: -+ import configparser as cp -+ - import pytest - - FS_ID = 'fs-deadbeef' -@@ -32,7 +36,7 @@ - if stunnel_check_cert_validity is None: - stunnel_check_cert_validity = stunnel_check_cert_validity_supported - -- config = ConfigParser.SafeConfigParser() -+ config = cp.ConfigParser() - config.add_section(mount_efs.CONFIG_SECTION) - config.set(mount_efs.CONFIG_SECTION, 'stunnel_debug_enabled', str(stunnel_debug_enabled)) - config.set(mount_efs.CONFIG_SECTION, 'stunnel_check_cert_hostname', str(stunnel_check_cert_hostname)) diff --git a/v1.17.tar.gz b/v1.17.tar.gz new file mode 100644 index 0000000..7e3057e --- /dev/null +++ b/v1.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d535100e3cd1fe22dec918f21f555993d9675214df83ac20d4e8621131d3078 +size 31263 diff --git a/v1.7.tar.gz b/v1.7.tar.gz deleted file mode 100644 index de51f05..0000000 --- a/v1.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9374777da47e1c6be8042546a6139e1d9a21dfca87f37aefd9f78d4a486cf7a -size 29384