Date: Fri, 14 Dec 2018 09:18:33 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487414 - in head/security/py-certbot: . files Message-ID: <201812140918.wBE9IXPe025148@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Fri Dec 14 09:18:33 2018 New Revision: 487414 URL: https://svnweb.freebsd.org/changeset/ports/487414 Log: Fix setting FreeBSD specific paths since upstream change https://github.com/certbot/certbot/commit/a23d76beb0e2c9539670766045314a5d50f582a2#diff-64ccdc74e8a07f9b039a6254093f1d0d as part of the update to 0.29.1 PR: 233909 Reported by: Paul Macdonald Approved by: koobs (python) Added: head/security/py-certbot/files/patch-certbot_compat.py (contents, props changed) Modified: head/security/py-certbot/Makefile head/security/py-certbot/files/patch-setup.py Modified: head/security/py-certbot/Makefile ============================================================================== --- head/security/py-certbot/Makefile Fri Dec 14 09:00:11 2018 (r487413) +++ head/security/py-certbot/Makefile Fri Dec 14 09:18:33 2018 (r487414) @@ -3,7 +3,7 @@ PORTNAME= certbot PORTVERSION= ${ACME_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP @@ -38,9 +38,8 @@ NO_ARCH= yes post-patch: @${REINPLACE_CMD} \ - -e 's|/etc/|${LOCALBASE}/etc/|' \ - -e 's|/var/lib|/var/db|' \ - ${WRKSRC}/${PORTNAME}/constants.py + s,%%LOCALBASE%%,${LOCALBASE}, \ + ${WRKSRC}/${PORTNAME}/compat.py do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test Added: head/security/py-certbot/files/patch-certbot_compat.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-certbot/files/patch-certbot_compat.py Fri Dec 14 09:18:33 2018 (r487414) @@ -0,0 +1,36 @@ +# Incorrect config file path since update to 0.29.1 +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233909 +# TODO: Upstream + +--- certbot/compat.py.orig 2018-12-05 23:47:58 UTC ++++ certbot/compat.py +@@ -183,6 +183,11 @@ LINUX_DEFAULT_FOLDERS = { + 'work': '/var/lib/letsencrypt', + 'logs': '/var/log/letsencrypt', + } ++FREEBSD_DEFAULT_FOLDERS = { ++ 'config': '%%LOCALBASE%%/etc/letsencrypt', ++ 'work': '/var/db/letsencrypt', ++ 'logs': '/var/log/letsencrypt', ++} + + def get_default_folder(folder_type): + """ +@@ -195,7 +200,13 @@ def get_default_folder(folder_type): + + """ + if 'fcntl' in sys.modules: +- # Linux specific +- return LINUX_DEFAULT_FOLDERS[folder_type] +- # Windows specific +- return WINDOWS_DEFAULT_FOLDERS[folder_type] ++ # Unix-like ++ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): ++ # FreeBSD specific ++ return FREEBSD_DEFAULT_FOLDERS[folder_type] ++ else: ++ # Linux specific ++ return LINUX_DEFAULT_FOLDERS[folder_type] ++ else: ++ # Windows specific ++ return WINDOWS_DEFAULT_FOLDERS[folder_type] Modified: head/security/py-certbot/files/patch-setup.py ============================================================================== --- head/security/py-certbot/files/patch-setup.py Fri Dec 14 09:00:11 2018 (r487413) +++ head/security/py-certbot/files/patch-setup.py Fri Dec 14 09:18:33 2018 (r487414) @@ -1,6 +1,6 @@ ---- setup.py.orig 2018-03-08 22:20:34 UTC +--- setup.py.orig 2018-12-05 23:47:59 UTC +++ setup.py -@@ -44,7 +44,6 @@ install_requires = [ +@@ -39,7 +39,6 @@ install_requires = [ 'configobj', 'cryptography>=1.2', # load_pem_x509_certificate 'josepy', @@ -8,7 +8,7 @@ 'parsedatetime>=1.3', # Calendar.parseDT 'pyrfc3339', 'pytz', -@@ -58,6 +57,7 @@ dev_extras = [ +@@ -53,6 +52,7 @@ dev_extras = [ 'astroid==1.3.5', 'coverage', 'ipdb',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812140918.wBE9IXPe025148>