From d59b8586b4c139c87d358b71ff20679f27193d52 Mon Sep 17 00:00:00 2001 From: Mike Sullivan Date: Wed, 13 Nov 2019 14:23:54 +0000 Subject: community/certbot: change version checking to Loose when using python3.8 --- community/certbot/APKBUILD | 6 ++++-- community/certbot/cerbot_py3_looseversion.patch | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 community/certbot/cerbot_py3_looseversion.patch (limited to 'community/certbot') diff --git a/community/certbot/APKBUILD b/community/certbot/APKBUILD index 60a64fc549..0756a3a165 100644 --- a/community/certbot/APKBUILD +++ b/community/certbot/APKBUILD @@ -26,7 +26,8 @@ depends=" checkdepends="py3-augeas" replaces="letsencrypt" subpackages="py3-acme:acme $pkgname-nginx $pkgname-apache" -source="certbot-$pkgver.tar.gz::https://github.com/certbot/certbot/archive/v$pkgver.tar.gz" +source="certbot-$pkgver.tar.gz::https://github.com/certbot/certbot/archive/v$pkgver.tar.gz + cerbot_py3_looseversion.patch" build() { local i @@ -96,4 +97,5 @@ apache() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3 certbot-0.40.1.tar.gz" +sha512sums="e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3 certbot-0.40.1.tar.gz +2886130eb5c28c3af3435107f2c8fce1c2cd8e1fbf1a49c11f8ba276b5748c26913748bbc4af10dca522a55e82bbae786f9a06d7c75efe94faf9afb0597f91b7 cerbot_py3_looseversion.patch" diff --git a/community/certbot/cerbot_py3_looseversion.patch b/community/certbot/cerbot_py3_looseversion.patch new file mode 100644 index 0000000000..5a10fde67f --- /dev/null +++ b/community/certbot/cerbot_py3_looseversion.patch @@ -0,0 +1,20 @@ +--- a/setup.py ++++ b/setup.py +@@ -3,7 +3,7 @@ + import re + import sys + +-from distutils.version import StrictVersion ++from distutils.version import LooseVersion + from setuptools import find_packages, setup, __version__ as setuptools_version + from setuptools.command.test import test as TestCommand + +@@ -60,7 +60,7 @@ + # So this dependency is not added for old Linux distributions with old setuptools, + # in order to allow these systems to build certbot from sources. + pywin32_req = 'pywin32>=225' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py +-if StrictVersion(setuptools_version) >= StrictVersion('36.2'): ++if LooseVersion(setuptools_version) >= LooseVersion('36.2'): + install_requires.append(pywin32_req + " ; sys_platform == 'win32'") + elif 'bdist_wheel' in sys.argv[1:]: + raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' -- cgit v1.2.3