10 changed files with 296 additions and 135 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,26 @@
-SOURCES/stratis-cli-2.4.2.tar.gz
+/stratis-cli-0.0.5.tar.gz
+/stratis-cli-0.5.0.tar.gz
+/stratis-cli-0.5.2.tar.gz
+/stratis-cli-0.5.3.tar.gz
+/stratis-cli-0.5.5.tar.gz
+/stratis-cli-0.9.0.tar.gz
+/stratis-cli-1.0.0.tar.gz
+/stratis-cli-1.0.1.tar.gz
+/stratis-cli-1.0.2.tar.gz
+/stratis-cli-1.0.4.tar.gz
+/stratis-cli-2.0.0.tar.gz
+/stratis-cli-2.0.1.tar.gz
+/stratis-cli-2.1.0.tar.gz
+/stratis-cli-2.1.1.tar.gz
+/stratis-cli-2.2.1.tar.gz
+/stratis-cli-2.3.0.tar.gz
+/stratis-cli-2.4.1.tar.gz
+/stratis-cli-2.4.2.tar.gz
+/stratis-cli-2.4.3.tar.gz
+/stratis-cli-3.1.0.tar.gz
+/stratis-cli-3.2.0.tar.gz
+/stratis-cli-3.4.0.tar.gz
+/stratis-cli-3.4.1.tar.gz
+/stratis-cli-3.5.2.tar.gz
+/stratis-cli-3.5.3.tar.gz
+/stratis-cli-3.6.0.tar.gz
--- a/.stratis-cli.metadata
+++ b/.stratis-cli.metadata
@ -1 +1 @@
-1d26c9a3f549d08e90bb54084f99b1825d6ac538 SOURCES/stratis-cli-2.4.2.tar.gz
+ca2d41d023639307671e3286bd377405d08bede7 stratis-cli-3.6.0.tar.gz
--- a/README.md
+++ b/README.md
@ -0,0 +1,3 @@
+# stratis-cli
+
+The stratis-cli package
--- a/SPECS/stratis-cli.spec
+++ b/SPECS/stratis-cli.spec
@ -1,133 +0,0 @@
-Name:           stratis-cli
-Version:        2.4.2
-Release:        1%{?dist}
-Summary:        Command-line tool for interacting with the Stratis daemon
-
-License:        ASL 2.0
-URL:            https://github.com/stratis-storage/stratis-cli
-Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  %{_bindir}/a2x
-
-Requires:       platform-python
-Requires:       python3-dateutil
-Requires:       python3-psutil
-Requires:       python3-dbus-client-gen >= 0.4
-Requires:       python3-dbus-python-client-gen >= 0.7
-Requires:       python3-justbytes >= 0.14
-
-# It runs without, but totally useless
-Requires:       stratisd >= 2.4
-
-# stratisd only available on certain arches
-ExclusiveArch:  %{rust_arches} noarch
-ExcludeArch:    i686
-BuildArch:      noarch
-
-%description
-stratis provides a command-line interface (CLI) for
-interacting with the Stratis daemon, stratisd. stratis
-interacts with stratisd via D-Bus.
-
-%prep
-%autosetup
-
-%build
-%py3_build
-a2x -f manpage docs/stratis.txt
-
-%install
-%py3_install
-%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions \
-  shell-completion/bash/stratis
-%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \
-  shell-completion/zsh/_stratis
-%{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratis.8
-
-%files
-%license LICENSE
-%doc README.rst
-%{_bindir}/stratis
-%{_mandir}/man8/stratis.8*
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/stratis
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_stratis
-%{python3_sitelib}/stratis_cli/
-%{python3_sitelib}/stratis_cli-*.egg-info/
-
-%changelog
-* Wed Jun 16 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.2-1
- Update to 2.4.2
- Resolves: rhbz#1931670
- Remove requirement for python3-semantic_version
- Resolves: rhbz#1972355
- Remove unnecessary keyutils Requires line
-
-* Thu Jun 03 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.1-1
- Update to 2.4.1
- Resolves: rhbz#1931670
-
-* Fri May 07 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.0-3
- Update to 2.4.0
- Resolves: rhbz#1931670
-
-* Mon Jan 11 2021  Dennis Keefe <dkeefe@redhat.com> - 2.3.0-3
- Update to 2.3.0
- Resolves: rhbz#1885329
- 
-* Mon Jul 13 2020  Dennis Keefe <dkeefe@redhat.com> - 2.1.1-6
- Update to 2.1.1
- Resolves: rhbz#1791472
- Update RPM spec file
- Resolves: rhbz#1827360
- Error messages when creating a pool are more helpful
- Resolves: rhbz#1734496
- Support per-pool encryption of devices that form a pools data tier
- Resolves: rhbz#1768580
- Improve error handling on partial unlock failure of encrypted pools
- Resolves: rhbz#1855520
- 
-* Sun Nov 10 2019  Dennis Keefe <dkeefe@redhat.com> - 2.0.0-2
- Update to 2.0.0
- Allow the user to interact with the daemon under conditions
-  where a pool, filesystem, or blockdev is not fully functional.
- Resolves: rhbz#1730493
- Establish an environment variable for D-Bus timeout parameter.
- Resolves: rhbz#1678631
- Return detailed error messages on all error-appearing user actions.
- Resolves: rhbz#1642393
- Resolves: rhbz#1687869
- Exit with error code 0 and error message on stderr for all command-line
-  parsing errors.
- Resolves: rhbz#1747564
- Show more complete error messages on D-Bus method call failures.
- Resolves: rhbz#1717460
- Add version numbers to required packages
- Resolves: rhbz#1717489
- 
-* Mon Jun 3 2019 Dennis Keefe <dkeefe@redhat.com> - 1.0.4-2
- Update to 1.0.4
-
-* Tue Dec 11 2018 Andy Grover <agrover@redhat.com> - 1.0.2-1
- Update to 1.0.2
-
-* Wed Nov 7 2018 Andy Grover <agrover@redhat.com> - 1.0.1-1
- Update to 1.0.1
-
-* Wed Oct 3 2018 Andy Grover <agrover@redhat.com> - 1.0.0-2
- Bump stratisd req
-
-* Tue Oct 2 2018 Andy Grover <agrover@redhat.com> - 1.0.0-1
- Update to 1.0.0
-
-* Fri Aug 3 2018 Andy Grover <agrover@redhat.com> - 0.5.5-2
- Remove zsh completion package and own completion dirs as needed
-
-* Thu Aug 2 2018 Andy Grover <agrover@redhat.com> - 0.5.5-1
- Update to 0.5.5
- Add zsh completion subpackage
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/plans/unit.fmf
+++ b/plans/unit.fmf
@ -0,0 +1,17 @@
+summary: stratis-cli unit tests
+
+prepare:
+  - name: Install package
+    how: install
+    package: [stratis-cli, util-linux, python3-psutil]
+
+discover:
+  how: shell
+  url: https://github.com/stratis-storage/testing.git
+  ref: v3.6.0
+  tests:
+    - name: unit
+      test: python3 stratis_cli_cert.py -v
+
+execute:
+  how: tmt
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,17 @@
+---
+inspections:
+  # stratis-cli has no ABI
+  abidiff: off
+  # stratis-cli is a Python program
+  annocheck: off
+  # the project does not use .desktop files
+  desktop: off
+  # stratis-cli is a Python program
+  elf: off
+  # the project uses no Java
+  javabytecode: off
+  # stratis-cli is a Python program
+  lto: off
+
+# The info is fine, but we'll assume that all the filesize changes are as intended.
+filesize: info
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (stratis-cli-3.6.0.tar.gz) = 6bdb94139eea07c130c995a687b7702b667081c7d6ff97ee1a749b1d4fe980e1b523aee182eee59a8dcf2a0664ec7fcf8b44331bc9443a2c2aa8d8bffe2d2eae
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@ -0,0 +1,224 @@
+Name:           stratis-cli
+Version:        3.6.0
+Release:        1%{?dist}
+Summary:        Command-line tool for interacting with the Stratis daemon
+
+License:        Apache-2.0
+URL:            https://github.com/stratis-storage/stratis-cli
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  %{_bindir}/a2x
+%if 0%{?rhel}
+BuildRequires:  python3-dateutil
+BuildRequires:  python3-dbus-client-gen
+BuildRequires:  python3-dbus-python-client-gen
+BuildRequires:  python3-justbytes
+BuildRequires:  python3-packaging
+BuildRequires:  python3-psutil
+BuildRequires:  python3-wcwidth
+%endif
+
+# Require the version of stratisd that supports a compatible D-Bus interface
+Requires:       (stratisd >= 3.6.0 with stratisd < 4.0.0)
+
+# Exclude the same arches for stratis-cli as are excluded for stratisd
+ExclusiveArch:  %{rust_arches} noarch
+%if 0%{?rhel}
+ExcludeArch:    i686
+%endif
+BuildArch:      noarch
+
+%description
+stratis provides a command-line interface (CLI) for
+interacting with the Stratis daemon, stratisd. stratis
+interacts with stratisd via D-Bus.
+
+%prep
+%autosetup
+
+%build
+%py3_build
+a2x -f manpage docs/stratis.txt
+
+%install
+%py3_install
+# Do not install tab-completion files for RHEL
+%if !0%{?rhel}
+%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions \
+  shell-completion/bash/stratis
+%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \
+  shell-completion/zsh/_stratis
+%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/fish/vendor_completions.d \
+  shell-completion/fish/stratis.fish
+%endif
+%{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratis.8
+
+%files
+%license LICENSE
+%doc README.rst
+%{_bindir}/stratis
+%{_mandir}/man8/stratis.8*
+%if !0%{?rhel}
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/stratis
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_stratis
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_completions.d
+%{_datadir}/fish/vendor_completions.d/stratis.fish
+%endif
+%{python3_sitelib}/stratis_cli/
+%{python3_sitelib}/stratis_cli-*.egg-info/
+
+%changelog
+* Mon Nov 06 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.0-1
+- Update to version 3.6.0
+- Resolves: RHEL-2265
+
+* Thu Jun 08 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.3-1
+- Allow for inconsistent value in StoppedPools D-Bus property
+- Resolves: rhbz#2213325
+
+* Tue May 16 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.2-1
+- Update to version 3.5.2
+- Resolves: rhbz#2167462
+
+* Mon Jan 09 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.1-1
+- send_uevent: remove strict parameter
+- Resolves: rhbz#2158914
+
+* Wed Nov 23 2022 Bryan Gurney <bgurney@redhat.com> - 3.4.0-1
+- Update to version 3.4.0
+- Resolves: rhbz#2124977
+- Return no-op on overprovision command on error
+- Resolves: rhbz#2131934
+- Return error on init-cache if cache is present
+- Resolves: rhbz#2141223
+
+* Fri Jul 08 2022 Bryan Gurney <bgurney@redhat.com> - 3.2.0-1
+- Add the ability to stop and start pools
+- Resolves: rhbz#2105061
+
+* Tue May 31 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-1
+- Update to 3.1.0
+- Resolves: rhbz#2039946
+- Revise stratis-cli.spec file to unified format
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.3-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon Jul 19 2021 Bryan Gurney <bgurney@redhat.com> - 2.4.3-1
+- Remove psutil dependency from setup.py
+- Resolves: rhbz#1983689
+
+* Mon Jun 28 2021 Bryan Gurney <bgurney@redhat.com> - 2.4.2-3
+- Remove semantic_version and wcwidth dependencies from setup.py
+- Resolves: rhbz#1976731
+
+* Thu Jun 17 2021 Bryan Gurney <bgurney@redhat.com> - 2.4.2-2
+- Remove unnecessary keyutils Requires line
+- Resolves: rhbz#1914316
+
+* Thu Jun 17 2021 Bryan Gurney <bgurney@redhat.com> - 2.4.2-1
+- Update to 2.4.2
+- Resolves: rhbz#1914316
+- Remove requirement for python3-semantic_version
+- Resolves: rhbz#1972353
+
+* Fri Jun 11 2021 Bryan Gurney <bgurney@redhat.com> - 2.4.1-1
+- Update to 2.4.1
+- Resolves: rhbz#1914316
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.0-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 12 2021 mulhern <amulhern@redhat.com> - 2.3.0-1
+- Update to 2.3.0
+
+* Tue Nov 10 2020 mulhern <amulhern@redhat.com> - 2.2.1-1
+- Update to 2.2.1
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 mulhern <amulhern@redhat.com> - 2.1.1-1
+- Update to 2.1.1
+
+* Thu Jul 9 2020 mulhern <amulhern@redhat.com> - 2.1.0-1
+- Update to 2.1.0
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.0.1-2
+- Rebuilt for Python 3.9
+
+* Wed Feb 19 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.0.1-1
+- Update to 2.0.1
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Nov 07 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.0-1
+- Update to 2.0.0
+
+* Sat Sep 07 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.4-1
+- Update to 1.0.4
+
+* Sat Nov 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.0-3
+- Make package archful
+
+* Thu Sep 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.0-2
+- Bump stratisd req
+
+* Thu Sep 27 2018 Andy Grover <agrover@redhat.com> - 1.0.0-1
+- Update to 1.0.0
+
+* Fri Aug 31 2018 Andy Grover <agrover@redhat.com> - 0.9.0-1
+- Update to 0.9.0
+
+* Fri Aug 3 2018 Andy Grover <agrover@redhat.com> - 0.5.5-3
+- Remove zsh completions subpackage
+- Own completion directories
+
+* Thu Aug 2 2018 Andy Grover <agrover@redhat.com> - 0.5.5-1
+- Update to 0.5.5
+- Add zsh completions subpackage
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.3-2
+- Rebuilt for Python 3.7
+
+* Mon Jun 4 2018 Andy Grover <agrover@redhat.com> - 0.5.3-1
+- Update to 0.5.3
+
+* Tue May 1 2018 Andy Grover <agrover@redhat.com> - 0.5.2-1
+- Update to 0.5.2
+
+* Wed Apr 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.0-3
+- Fix dependency on stratisd
+
+* Tue Apr 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.0-2
+- Relax stratisd dependency
+
+* Thu Mar 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 19 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.5-3
+- Enable usage of dependency generator
+
+* Mon Jan 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.5-2
+- Include manpage
+
+* Mon Jan 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.5-1
+- Initial package
				`@ -0,0 +1 @@`
				`SHA512 (stratis-cli-3.6.0.tar.gz) = 6bdb94139eea07c130c995a687b7702b667081c7d6ff97ee1a749b1d4fe980e1b523aee182eee59a8dcf2a0664ec7fcf8b44331bc9443a2c2aa8d8bffe2d2eae`