diff --git a/.gitignore b/.gitignore index e69de29..f62b007 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,40 @@ +/certbot-apache-0.8.0.tar.gz +/certbot-apache-0.8.1.tar.gz +/certbot-apache-0.9.2.tar.gz +/certbot-apache-0.9.3.tar.gz +/certbot-apache-0.11.1.tar.gz +/certbot-apache-0.12.0.tar.gz +/certbot-apache-0.13.0.tar.gz +/certbot-apache-0.14.0.tar.gz +/certbot-apache-0.14.1.tar.gz +/certbot-apache-0.18.1.tar.gz +/certbot-apache-0.18.2.tar.gz +/certbot-apache-0.19.0.tar.gz +/certbot-apache-0.20.0.tar.gz +/certbot-apache-0.21.1.tar.gz +/certbot-apache-0.22.0.tar.gz +/certbot-apache-0.22.2.tar.gz +/certbot-apache-0.23.0.tar.gz +/certbot-apache-0.24.0.tar.gz +/certbot-apache-0.25.0.tar.gz +/certbot-apache-0.25.1.tar.gz +/certbot-apache-0.26.0.tar.gz +/certbot-apache-0.26.1.tar.gz +/certbot-apache-0.27.1.tar.gz +/certbot-apache-0.28.0.tar.gz +/certbot-apache-0.29.1.tar.gz +/certbot-apache-0.30.2.tar.gz +/certbot-apache-0.31.0.tar.gz +/certbot-apache-0.34.2.tar.gz +/certbot-apache-0.35.1.tar.gz +/certbot-apache-0.36.0.tar.gz +/certbot-apache-0.37.2.tar.gz +/certbot-apache-0.38.0.tar.gz +/certbot-apache-0.39.0.tar.gz +/certbot-apache-0.39.0.tar.gz.asc +/certbot-apache-1.0.0.tar.gz +/certbot-apache-1.0.0.tar.gz.asc +/certbot-apache-1.1.0.tar.gz +/certbot-apache-1.1.0.tar.gz.asc +/certbot-apache-1.2.0.tar.gz +/certbot-apache-1.2.0.tar.gz.asc diff --git a/gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg b/gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg new file mode 100644 index 0000000..013feed Binary files /dev/null and b/gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg differ diff --git a/python-certbot-apache-remove-mock-runtime-dependency.patch b/python-certbot-apache-remove-mock-runtime-dependency.patch new file mode 100644 index 0000000..acd47d3 --- /dev/null +++ b/python-certbot-apache-remove-mock-runtime-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 8a887b4..4cbe399 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,7 +11,6 @@ version = '1.2.0' + install_requires = [ + 'acme>=0.29.0', + 'certbot>=1.1.0', +- 'mock', + 'python-augeas', + 'setuptools', + 'zope.component', + diff --git a/python-certbot-apache.spec b/python-certbot-apache.spec new file mode 100644 index 0000000..45f32b2 --- /dev/null +++ b/python-certbot-apache.spec @@ -0,0 +1,344 @@ +%global pypi_name certbot-apache + +%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 8) +%bcond_without python3 +%else +%bcond_with python3 +%endif + +%if (0%{?fedora} && 0%{?fedora} >= 30) || (0%{?rhel} && 0%{?rhel} >= 8) +%bcond_with python2 +%else +%bcond_without python2 +%endif + +Name: python-%{pypi_name} +Version: 1.2.0 +Release: 2%{?dist} +Summary: The apache plugin for certbot + +License: ASL 2.0 +URL: https://pypi.python.org/pypi/certbot-apache +Source0: %{pypi_source} +Source1: %{pypi_source}.asc +# Key mentioned in https://certbot.eff.org/docs/install.html#certbot-auto +# Keyring generation steps as follows: +# gpg2 --keyserver pool.sks-keyservers.net --recv-key A2CFB51FA275A7286234E7B24D17C995CD9775F2 +# gpg2 --export --export-options export-minimal A2CFB51FA275A7286234E7B24D17C995CD9775F2 > gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg +Source2: gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg + +Patch1: %{name}-remove-mock-runtime-dependency.patch + +BuildArch: noarch + +%if %{with python2} +BuildRequires: python2-devel +%endif + +%if %{with python3} +BuildRequires: python3-devel +%endif + +%if %{with python2} +#For running tests +BuildRequires: python2-acme >= 0.29.0 +BuildRequires: python2-certbot >= 1.1.0 +BuildRequires: python2-mock +BuildRequires: python2-zope-component +BuildRequires: python2-zope-interface +%if 0%{?rhel} && 0%{?rhel} <= 7 +# EL7 has unversioned names for these packages +BuildRequires: pytest +BuildRequires: python-augeas +%else +BuildRequires: python2-augeas +BuildRequires: python2-pytest +%endif +%endif + +%if %{with python3} +BuildRequires: python3-acme >= 0.29.0 +BuildRequires: python3-certbot >= 1.1.0 +BuildRequires: python3-augeas +BuildRequires: python3-mock +BuildRequires: python3-pytest +BuildRequires: python3-zope-component +BuildRequires: python3-zope-interface +%endif + +# Used to verify OpenPGP signature +BuildRequires: gnupg2 + +%description +Plugin for certbot that allows for automatic configuration of apache + +%if %{with python2} +%package -n python2-%{pypi_name} + +# Provide the name users expect as a certbot plugin +%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) +Provides: %{pypi_name} = %{version}-%{release} +%endif + +# Although a plugin for the certbot command it's technically +# an extension to the certbot python libraries +Requires: python2-acme >= 0.29.0 +Requires: python2-certbot >= 0.39.0 +%if 0%{?rhel} && 0%{?rhel} <= 7 +# EL7 has unversioned names for these packages +Requires: python-augeas +%else +Requires: python2-augeas +%endif +Requires: mod_ssl +%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 8) +#Recommend the CLI as that will be the interface most use +Recommends: certbot >= 0.39.0 +%else +Requires: certbot >= 0.39.0 +%endif +Summary: The apache plugin for certbot +%{?python_provide:%python_provide python2-%{pypi_name}} + +%description -n python2-%{pypi_name} +Plugin for certbot that allows for automatic configuration of apache +%endif + +%if %{with python3} +%package -n python3-%{pypi_name} + +# Provide the name users expect as a certbot plugin +%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 8) +Provides: %{pypi_name} = %{version}-%{release} +%endif + +# Although a plugin for the certbot command it's technically +# an extension to the certbot python libraries +Requires: python3-acme >= 0.29.0 +Requires: python3-certbot >= 0.39.0 +Requires: python3-augeas +Requires: mod_ssl +%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 8) +#Recommend the CLI as that will be the interface most use +Recommends: certbot >= 0.39.0 +%else +Requires: certbot >= 0.39.0 +%endif +Summary: The apache plugin for certbot +%{?python_provide:%python_provide python3-%{pypi_name}} + +%description -n python3-%{pypi_name} +Plugin for certbot that allows for automatic configuration of apache +%endif + +%prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup -p1 -n %{pypi_name}-%{version} +# Remove bundled egg-info +rm -rf %{pypi_name}.egg-info + +%build +%if %{with python2} +%{py2_build} +%endif +%if %{with python3} +%py3_build +%endif + +%check +%if %{with python2} +(cd build/lib && %{__python2} ../../setup.py test) +%endif +%if %{with python3} +%{__python3} setup.py test +%endif + + +%install +%if %{with python2} +%{py2_install} +%endif +%if %{with python3} +%py3_install +%endif + +%if %{with python2} +%files -n python2-%{pypi_name} +%license LICENSE.txt +%doc README.rst +%{python2_sitelib}/certbot_apache +%{python2_sitelib}/certbot_apache-%{version}*.egg-info +%endif + +%if %{with python3} +%files -n python3-%{pypi_name} +%license LICENSE.txt +%doc README.rst +%{python3_sitelib}/certbot_apache +%{python3_sitelib}/certbot_apache-%{version}*.egg-info +%endif + +%changelog +* Sun Mar 01 2020 Felix Schwarz - 1.2.0-2 +- remove runtime dependencies on mock, pytest + +* Thu Feb 06 2020 Felix Schwarz - 1.2.0-1 +- Update to 1.2.0 (#1791074) + +* Sun Feb 02 2020 Felix Schwarz - 1.1.0-2 +- add missing sources + +* Sat Feb 01 2020 Felix Schwarz - 1.1.0-1 +- Update to 1.1.0 (#1791074) + +* Thu Jan 30 2020 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Dec 05 2019 Eli Young - 1.0.0-1 +- Update to 1.0.0 (#1769106) + +* Wed Dec 04 2019 Eli Young - 0.39.0-2 +- Verify source OpenPGP signature + +* Tue Oct 01 2019 Eli Young - 0.39.0-1 +- Update to 0.39.0 (#1757576) + +* Tue Sep 10 2019 Eli Young - 0.38.0-1 +- Update to 0.38.0 (#1748614) + +* Mon Aug 26 2019 Eli Young - 0.37.2-1 +- Update to 0.37.2 (#1742578) + +* Mon Aug 19 2019 Miro Hrončok - 0.36.0-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 0.36.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jul 19 2019 Eli Young - 0.36.0-1 +- Update to 0.36.0 + +* Fri Jun 21 2019 Eli Young - 0.35.1-1 +- Update to 0.35.1 (#1717678) + +* Tue May 28 2019 Eli Young - 0.34.2-1 +- Update to 0.34.2 (#1686185) (#1706298) (#1701018) + +* Fri Feb 08 2019 Eli Young - 0.31.0-1 +- Update to 0.31.0 (#1673770) + +* Sat Feb 02 2019 Fedora Release Engineering - 0.30.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 28 2019 Eli Young - 0.30.2-1 +- Update to 0.30.2 (#1669314) + +* Tue Dec 11 2018 Eli Young - 0.29.1-1 +- Update to 0.29.1 +- Remove Python 2 package in Fedora 30+ (#1654016) + +* Wed Nov 14 2018 Eli Young - 0.28.0-1 +- Update to 0.28.0 + +* Mon Sep 10 2018 Eli Young - 0.27.1-1 +- Update to 0.27.1 (#1627570) + +* Tue Jul 17 2018 Eli Young - 0.26.1-1 +- Update to 0.26.1 (#1600293) + +* Fri Jul 13 2018 Fedora Release Engineering - 0.25.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 0.25.1-2 +- Rebuilt for Python 3.7 + +* Wed Jun 13 2018 Eli Young - 0.25.1-1 +- Update to 0.25.1 (#1591032) + +* Thu Jun 07 2018 Eli Young - 0.25.0-1 +- Update to 0.25.0 (#1588220) + +* Wed May 02 2018 Eli Young - 0.24.0-2 +- Remove unnecessary patch + +* Wed May 02 2018 Eli Young - 0.24.0-1 +- Update to 0.24.0 (#1574151) + +* Thu Apr 05 2018 Eli Young - 0.23.0-1 +- Update to 0.23.0 (#1563900) + +* Tue Mar 20 2018 Eli Young - 0.22.2-1 +- Update to 0.22.2 (#1558281) + +* Sat Mar 10 2018 Eli Young - 0.22.0-1 +- Update to 0.22.0 (#1552954) + +* Wed Feb 21 2018 Iryna Shcherbina - 0.21.1-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 0.21.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Feb 02 2018 Eli Young - 0.21.1-1 +- Update to 0.21.1 (#1535996) + +* Wed Dec 20 2017 Eli Young - 0.20.0-1 +- Update to 0.20.0 + +* Fri Oct 06 2017 Eli Young - 0.19.0-1 +- Update to 0.19.0 (bz#1499369) + +* Fri Oct 6 2017 Eli Young - 0.18.2-2 +- Fix condition on provides for Fedora pre-26 - bz#1497314 + +* Mon Oct 2 2017 Nick Bebout - 0.18.2-2 +- Fix provides - bz#1497314 + +* Fri Sep 22 2017 Nick Bebout - 0.18.2-1 +- Update to 0.18.2 + +* Sun Sep 10 2017 Nick Bebout - 0.18.1-1 +- Update to 0.18.1 + +* Thu Jul 27 2017 Fedora Release Engineering - 0.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue May 16 2017 James Hogarth - 0.14.1-1 +- Update to 0.14.1 + +* Fri May 12 2017 James Hogarth - 0.14.0-1 +- Update to 0.14.0 + +* Wed Apr 19 2017 James Hogarth - 0.13.0-1 +- update to 0.13.0 +* Fri Mar 03 2017 James Hogarth - 0.12.0-1 +- update to 0.12.0 +- add python3 compatibility +* Sat Feb 11 2017 Fedora Release Engineering - 0.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Sat Feb 04 2017 James Hogarth - 0.11.1-1 +- Upgrade to 0.11.1 +- Add requires on mod_ssl bz#1367943 +* Fri Oct 14 2016 Nick Bebout - 0.9.3-1 +- Update to 0.9.3 +* Thu Oct 13 2016 Nick Bebout - 0.9.2-1 +- Update to 0.9.2 +* Tue Jul 19 2016 Fedora Release Engineering - 0.8.1-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages +* Sun Jun 19 2016 James Hogarth - 0.8.1-2 +- Spec bug on el7 requires - bz#1347997 +* Wed Jun 15 2016 Nick Bebout - 0.8.1-1 +- Update to 0.8.1 +* Tue Jun 07 2016 James Hogarth - 0.8.0-2 +- Move recommends to correct subpackage +- change to require python-augeas as python2-augeas not provided in F23 +- change the python-devel BR as per review +* Fri Jun 03 2016 james - 0.8.0-1 +- update to upstream 0.8.0 release +* Tue May 31 2016 James Hogarth - 0.7.0-1 +- Update to 0.7.0 release +* Thu May 26 2016 James Hogarth - 0.6.0-2 +- Ensure python2-* provide is present as per python guidelines +* Thu May 26 2016 James Hogarth - 0.6.0-1 +- Initial packaging of the plugin diff --git a/sources b/sources index e69de29..fb984ed 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (certbot-apache-1.2.0.tar.gz) = 49df8baac979a52f999c016e2e5421d378b7ea8f53ac3c6700cc594b3819f3b196fe39228dc4cd8ef80c134168cb431287665a9a0def127d7bb1d78e4358657c +SHA512 (certbot-apache-1.2.0.tar.gz.asc) = 19d41989d9965f25e4ec265e76257fbc66c821e5c3981f5308eee89066d24da88c3ad07cd0c02eff0659022a6a7a927dac26cc7571c5e9fe18b92e42aba3e6dd