From 1aa665ea16cb6f51a25e79130b33685ea7abf6a5cdf72f21b728d5ea86c9b7cb Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 14 Feb 2019 14:50:21 +0000 Subject: [PATCH] osc copypac from project:Cloud:Tools package:amazon-efs-utils revision:3 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-efs-utils?expand=0&rev=1 --- .gitattributes | 23 ++++++++++ .gitignore | 1 + amazon-efs-utils.changes | 17 +++++++ amazon-efs-utils.spec | 92 +++++++++++++++++++++++++++++++++++++ efs-switchparser.patch | 98 ++++++++++++++++++++++++++++++++++++++++ v1.5.tar.gz | 3 ++ 6 files changed, 234 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 amazon-efs-utils.changes create mode 100644 amazon-efs-utils.spec create mode 100644 efs-switchparser.patch create mode 100644 v1.5.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/amazon-efs-utils.changes b/amazon-efs-utils.changes new file mode 100644 index 0000000..99dbe4a --- /dev/null +++ b/amazon-efs-utils.changes @@ -0,0 +1,17 @@ +------------------------------------------------------------------- +Thu Feb 14 00:56:12 UTC 2019 - Robert Schweikert + +- Support Python 3.2 and later + + Add efs-switchparser.patch + + SafeConfigParser is no longer available, use ConfigParser + +------------------------------------------------------------------- +Mon Feb 11 18:20:10 UTC 2019 - Jan Engelhardt + +- Ensure neutrality of descriptions. + +------------------------------------------------------------------- +Sat Feb 9 09:21:23 UTC 2019 - John Paul Adrian Glaubitz + +- Initial build (bsc#1101451, fate#327220, bsc#1124652, fate#327221) + + Version 1.5 diff --git a/amazon-efs-utils.spec b/amazon-efs-utils.spec new file mode 100644 index 0000000..8360578 --- /dev/null +++ b/amazon-efs-utils.spec @@ -0,0 +1,92 @@ +# +# spec file for package amazon-efs-utils +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +Name: amazon-efs-utils +Version: 1.5 +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/v%{version}.tar.gz +Patch: efs-switchparser.patch +BuildRequires: systemd +BuildRequires: systemd-rpm-macros +Requires: nfs-utils +Requires: python3 +Requires: stunnel >= 4.56 +BuildArch: noarch + +%description +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 + +%build +# No build required + +%install +mkdir -p %{buildroot}%{_sysconfdir}/amazon/efs +mkdir -p %{buildroot}%{_unitdir} +install -p -m 644 %{_builddir}/efs-utils-%{version}/dist/amazon-efs-mount-watchdog.service %{buildroot}%{_unitdir} + +mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}/usr/sbin +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_localstatedir}/log/amazon/efs +mkdir -p %{buildroot}%{_mandir}/man8 +mkdir -p %{buildroot}%{_sysconfdir}/amazon/efs + +install -p -m 644 %{_builddir}/efs-utils-%{version}/dist/efs-utils.conf %{buildroot}%{_sysconfdir}/amazon/efs +install -p -m 444 %{_builddir}/efs-utils-%{version}/dist/efs-utils.crt %{buildroot}%{_sysconfdir}/amazon/efs +install -p -m 755 %{_builddir}/efs-utils-%{version}/src/mount_efs/__init__.py %{buildroot}/sbin/mount.efs +install -p -m 755 %{_builddir}/efs-utils-%{version}/src/watchdog/__init__.py %{buildroot}%{_bindir}/amazon-efs-mount-watchdog +install -p -m 644 %{_builddir}/efs-utils-%{version}/man/mount.efs.8 %{buildroot}%{_mandir}/man8 + +# Create rc-link +for srv_name in %{buildroot}%{_unitdir}/*.service; do rc_name=$(basename -s '.service' $srv_name); ln -s service %{buildroot}%{_sbindir}/rc$rc_name; done + +%pre +%service_add_pre amazon-efs-mount-watchdog.service + +%post +%service_add_post amazon-efs-mount-watchdog.service + +%preun +%service_del_preun -f amazon-efs-mount-watchdog.service + +%postun +%service_del_postun -f amazon-efs-mount-watchdog.service + +%files +%defattr(-,root,root,-) +%doc NOTICE README.md +%license LICENSE +%{_unitdir}/amazon-efs-mount-watchdog.service +%{_sysconfdir}/amazon +%config %{_sysconfdir}/amazon/efs/efs-utils.conf +%config %{_sysconfdir}/amazon/efs/efs-utils.crt +/sbin/mount.efs +%{_bindir}/amazon-efs-mount-watchdog +%{_sbindir}/rcamazon-efs-mount-watchdog +/var/log/amazon +%{_mandir}/man8/mount.efs.8.gz + +%changelog diff --git a/efs-switchparser.patch b/efs-switchparser.patch new file mode 100644 index 0000000..e071eee --- /dev/null +++ b/efs-switchparser.patch @@ -0,0 +1,98 @@ +--- src/mount_efs/__init__.py.orig ++++ src/mount_efs/__init__.py +@@ -44,9 +44,9 @@ from contextlib import contextmanager + 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 +@@ -517,7 +517,7 @@ def assert_root(): + + + def read_config(config_file=CONFIG_FILE): +- p = ConfigParser.SafeConfigParser() ++ p = cp.ConfigParser() + p.read(config_file) + return p + +--- src/watchdog/__init__.py.orig ++++ src/watchdog/__init__.py +@@ -21,9 +21,9 @@ from logging.handlers import RotatingFil + from signal import SIGTERM + + try: +- import ConfigParser ++ import ConfigParser as cp + except ImportError: +- from configparser import ConfigParser ++ import configparser as cp + + VERSION = '1.5' + +@@ -275,7 +275,7 @@ def assert_root(): + + + def read_config(config_file=CONFIG_FILE): +- p = ConfigParser.SafeConfigParser() ++ p = cp.ConfigParser() + p.read(config_file) + return p + +--- test/mount_efs_test/test_choose_tls_port.py.orig ++++ test/mount_efs_test/test_choose_tls_port.py +@@ -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 @@ DEFAULT_TLS_PORT_RANGE_HIGH = 20449 + + + 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)) +--- test/mount_efs_test/test_write_stunnel_config_file.py.orig ++++ test/mount_efs_test/test_write_stunnel_config_file.py +@@ -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 @@ def _get_config(mocker, stunnel_debug_en + 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.5.tar.gz b/v1.5.tar.gz new file mode 100644 index 0000000..3ad65f4 --- /dev/null +++ b/v1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8796fed18f6941f1eb00d946099daeb10ced2202c53abdee2d6bb14427d9406 +size 29114