CVS commit: pkgsrc/security/py-certbot

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Aug  3 09:36:28 UTC 2026

Modified Files:
        pkgsrc/security/py-certbot: Makefile distinfo
        pkgsrc/security/py-certbot/patches:
            patch-src_certbot___internal_plugins_nginx_constants.py

Log Message:
py-certbot: fixed finding nginx.conf


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/security/py-certbot/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/security/py-certbot/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/py-certbot/patches/patch-src_certbot___internal_plugins_nginx_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/Makefile
diff -u pkgsrc/security/py-certbot/Makefile:1.53 pkgsrc/security/py-certbot/Makefile:1.54
--- pkgsrc/security/py-certbot/Makefile:1.53    Fri May 22 09:15:13 2026
+++ pkgsrc/security/py-certbot/Makefile Mon Aug  3 09:36:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2026/05/22 09:15:13 adam Exp $
+# $NetBSD: Makefile,v 1.54 2026/08/03 09:36:28 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -30,6 +30,7 @@ SUBST_FILES.path+=    src/certbot/_internal
 SUBST_SED.path=                -e 's,/etc/letsencrypt,${PKG_SYSCONFDIR},g'
 SUBST_SED.path+=       -e 's,/var/lib/letsencrypt,${VARBASE}/letsencrypt,g'
 SUBST_SED.path+=       -e 's,/var/log/letsencrypt,${VARBASE}/letsencrypt/log,g'
+SUBST_VARS.path+=      PKG_SYSCONFBASE
 SUBST_VARS.path+=      PKG_SYSCONFDIR
 
 MAKE_DIRS+=            ${VARBASE}/letsencrypt/log

Index: pkgsrc/security/py-certbot/distinfo
diff -u pkgsrc/security/py-certbot/distinfo:1.107 pkgsrc/security/py-certbot/distinfo:1.108
--- pkgsrc/security/py-certbot/distinfo:1.107   Fri Jul 17 12:24:19 2026
+++ pkgsrc/security/py-certbot/distinfo Mon Aug  3 09:36:28 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.107 2026/07/17 12:24:19 adam Exp $
+$NetBSD: distinfo,v 1.108 2026/08/03 09:36:28 adam Exp $
 
 BLAKE2s (certbot-5.7.0.tar.gz) = ff00735405eb0f93b8e4e3c5b839db7e6e1faa20d52bafda62ac478ee8fd13a9
 SHA512 (certbot-5.7.0.tar.gz) = fb28be9059aa5717773832a2d1676f622f368ab5c69a2c4962f6ec1ae76a796d555a1f050c63accf696f1be0fe1af6dcc7ddc1ab52983fbc6612cf62ea94b6c5
 Size (certbot-5.7.0.tar.gz) = 704446 bytes
-SHA1 (patch-src_certbot___internal_plugins_nginx_constants.py) = 8fdb8e63e1a2bb32430f8872574804f2e599873b
+SHA1 (patch-src_certbot___internal_plugins_nginx_constants.py) = 38b62f20be04054c13e7278efa8f3c7254baeef5

Index: pkgsrc/security/py-certbot/patches/patch-src_certbot___internal_plugins_nginx_constants.py
diff -u pkgsrc/security/py-certbot/patches/patch-src_certbot___internal_plugins_nginx_constants.py:1.1 pkgsrc/security/py-certbot/patches/patch-src_certbot___internal_plugins_nginx_constants.py:1.2
--- pkgsrc/security/py-certbot/patches/patch-src_certbot___internal_plugins_nginx_constants.py:1.1      Mon Apr 13 12:44:45 2026
+++ pkgsrc/security/py-certbot/patches/patch-src_certbot___internal_plugins_nginx_constants.py  Mon Aug  3 09:36:28 2026
@@ -1,11 +1,12 @@
-$NetBSD: patch-src_certbot___internal_plugins_nginx_constants.py,v 1.1 2026/04/13 12:44:45 adam Exp $
+$NetBSD: patch-src_certbot___internal_plugins_nginx_constants.py,v 1.2 2026/08/03 09:36:28 adam Exp $
 
 Look for nginx.conf in PKG_SYSCONFDIR
 
---- src/certbot/_internal/plugins/nginx/constants.py.orig      2025-09-02 15:46:13.000000000 +0000
+--- src/certbot/_internal/plugins/nginx/constants.py.orig      2026-07-07 18:28:26.000000000 +0000
 +++ src/certbot/_internal/plugins/nginx/constants.py
-@@ -2,19 +2,8 @@
- import platform
+@@ -1,20 +1,8 @@
+ """nginx plugin constants."""
+-import platform
  from typing import Any
  
 -FREEBSD_DARWIN_SERVER_ROOT = "/usr/local/etc/nginx"
@@ -21,7 +22,7 @@ Look for nginx.conf in PKG_SYSCONFDIR
 -
  CLI_DEFAULTS: dict[str, Any] = {
 -    "server_root": server_root_tmp,
-+    "server_root": "@PKG_SYSCONFDIR@/nginx",
++    "server_root": "@PKG_SYSCONFBASE@/nginx",
      "ctl": "nginx",
      "sleep_seconds": 1
  }