CVS commit: pkgsrc/security/py-certbot-nginx

["Iain Hibbert" <plunky%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   plunky
Date:           Sun Jun 21 08:00:03 UTC 2020

Modified Files:
        pkgsrc/security/py-certbot-nginx: Makefile distinfo
Added Files:
        pkgsrc/security/py-certbot-nginx/patches:
            patch-certbot__nginx___internal_constants.py

Log Message:
Look for nginx.conf in PKG_SYSCONFDIR.nginx


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/py-certbot-nginx/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/py-certbot-nginx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/py-certbot-nginx/Makefile
diff -u pkgsrc/security/py-certbot-nginx/Makefile:1.11 pkgsrc/security/py-certbot-nginx/Makefile:1.12
--- pkgsrc/security/py-certbot-nginx/Makefile:1.11      Thu May  7 10:53:46 2020
+++ pkgsrc/security/py-certbot-nginx/Makefile   Sun Jun 21 08:00:03 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2020/05/07 10:53:46 adam Exp $
+# $NetBSD: Makefile,v 1.12 2020/06/21 08:00:03 plunky Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
 DISTNAME=      certbot-nginx-${CERTBOT_VERSION}
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_PYPI:=c/certbot-nginx/}
 
 COMMENT=       Nginx plugin for Certbot
@@ -15,5 +16,13 @@ DEPENDS+=    ${PYPKGPREFIX}-pyparsing>=1.5.
 DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
+PKG_SYSCONFVAR=                nginx
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Fixing absolute paths.
+SUBST_FILES.paths=     certbot_nginx/_internal/constants.py
+SUBST_VARS.paths=      PKG_SYSCONFDIR
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-certbot-nginx/distinfo
diff -u pkgsrc/security/py-certbot-nginx/distinfo:1.17 pkgsrc/security/py-certbot-nginx/distinfo:1.18
--- pkgsrc/security/py-certbot-nginx/distinfo:1.17      Tue Jun  9 12:47:37 2020
+++ pkgsrc/security/py-certbot-nginx/distinfo   Sun Jun 21 08:00:03 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/06/21 08:00:03 plunky Exp $
 
 SHA1 (certbot-nginx-1.5.0.tar.gz) = 6e92ce5ab68a6650810e36e85291f1bc6554ab90
 RMD160 (certbot-nginx-1.5.0.tar.gz) = c2f7f325f897a38e2e83ea58290c9178603bc6da
 SHA512 (certbot-nginx-1.5.0.tar.gz) = 034cd3b9be3bd6e4e15ec4e01335814013049d48932a55f99045ebee757ccfbc19d1513abdc6f0a9ec4d1ed985d5113368f9720d8a1e4fc0ff2548a346170a9e
 Size (certbot-nginx-1.5.0.tar.gz) = 73824 bytes
+SHA1 (patch-certbot__nginx___internal_constants.py) = b6e61f8785ffa2f6e0de0052105e2996bd93075c

Added files:

Index: pkgsrc/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py
diff -u /dev/null pkgsrc/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py:1.1
--- /dev/null   Sun Jun 21 08:00:03 2020
+++ pkgsrc/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py       Sun Jun 21 08:00:03 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-certbot__nginx___internal_constants.py,v 1.1 2020/06/21 08:00:03 plunky Exp $
+
+Look for nginx.conf in PKG_SYSCONFDIR
+
+--- certbot_nginx/_internal/constants.py.orig  2020-02-04 21:46:57.000000000 +0000
++++ certbot_nginx/_internal/constants.py
+@@ -1,8 +1,8 @@
+ """nginx plugin constants."""
+ import platform
+ 
+-FREEBSD_DARWIN_SERVER_ROOT = "/usr/local/etc/nginx"
+-LINUX_SERVER_ROOT = "/etc/nginx"
++FREEBSD_DARWIN_SERVER_ROOT = "@PKG_SYSCONFDIR@/nginx"
++LINUX_SERVER_ROOT = "@PKG_SYSCONFDIR@/nginx"
+ 
+ if platform.system() in ('FreeBSD', 'Darwin'):
+     server_root_tmp = FREEBSD_DARWIN_SERVER_ROOT