Attachment 200033 Details for Bug 233909 – Fix setting FreeBSD specific paths

[patch] Fix setting FreeBSD specific paths

py-certbot.patch (text/plain), 2.94 KB, created by Matthew Seaman on 2018-12-11 10:29:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2018-12-11 10:29:24 UTC

Size: 2.94 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 487202)
>+++ Makefile	(working copy)
>@@ -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 @@
> 
> 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
>Index: files/patch-certbot_compat.py
>===================================================================
>--- files/patch-certbot_compat.py	(nonexistent)
>+++ files/patch-certbot_compat.py	(working copy)
>@@ -0,0 +1,32 @@
>+--- 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%%/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]
>
>Property changes on: files/patch-certbot_compat.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-setup.py
>===================================================================
>--- files/patch-setup.py	(revision 487202)
>+++ files/patch-setup.py	(working copy)
>@@ -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',

Actions: View | Diff

Attachments on bug 233909: 200016 | 200033 | 200041