CVS commit: pkgsrc/security

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security
From: "Filip Hajny" <fhajny%netbsd.org@localhost>
Date: Thu, 11 May 2017 08:23:35 +0000

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu May 11 08:23:35 UTC 2017

Modified Files:
        pkgsrc/security/py-acme: Makefile PLIST
        pkgsrc/security/py-certbot: Makefile Makefile.common PLIST distinfo
Added Files:
        pkgsrc/security/py-acme: ALTERNATIVES
        pkgsrc/security/py-certbot: ALTERNATIVES

Log Message:
Update py-certbot and py-acme to 0.14.0.
Use ALTERNATIVES to handle different Python versions better.

0.14.0 - 2017-05-04

Added

- Python 3.3+ support for all Certbot packages. certbot-auto still
  currently only supports Python 2, but the acme, certbot,
  certbot-apache, and certbot-nginx packages on PyPI now fully support
  Python 2.6, 2.7, and 3.3+.
- Certbot's Apache plugin now handles multiple virtual hosts per file.
- Lockfiles to prevent multiple versions of Certbot running
  simultaneously.

Changed

- When converting an HTTP virtual host to HTTPS in Apache, Certbot
  only copies the virtual host rather than the entire contents of the
  file it's contained in.
- The Nginx plugin now includes SSL/TLS directives in a separate file
  located in Certbot's configuration directory rather than copying the
  contents of the file into every modified server block.

Fixed

- Ensure logging is configured before parts of Certbot attempt to log
  any messages.
- Support for the --quiet flag in certbot-auto.
- Reverted a change made in a previous release to make the acme and
  certbot packages always depend on argparse. This dependency is
  conditional again on the user's Python version.
- Small bugs in the Nginx plugin such as properly handling empty
  server blocks and setting server_names_hash_bucket_size during
  challenges.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/security/py-acme/ALTERNATIVES
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/py-acme/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-acme/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/security/py-certbot/ALTERNATIVES
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-certbot/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-certbot/Makefile.common \
    pkgsrc/security/py-certbot/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/py-certbot/PLIST

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-acme/Makefile
diff -u pkgsrc/security/py-acme/Makefile:1.6 pkgsrc/security/py-acme/Makefile:1.7
--- pkgsrc/security/py-acme/Makefile:1.6        Tue Apr 11 06:32:32 2017
+++ pkgsrc/security/py-acme/Makefile    Thu May 11 08:23:35 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2017/04/11 06:32:32 fhajny Exp $
+# $NetBSD: Makefile,v 1.7 2017/05/11 08:23:35 fhajny Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/certbot/acme/}
-PKGREVISION=   1
 CATEGORIES=    security
 
 COMMENT=       ACME protocol implementation in Python
@@ -10,9 +9,9 @@ LICENSE=       apache-2.0
 
 .include "../../security/py-certbot/Makefile.common"
 
-DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
 DEPENDS+=      ${PYPKGPREFIX}-cryptography>=0.8:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.15:../../security/py-OpenSSL
+DEPENDS+=      ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=      ${PYPKGPREFIX}-requests>2.10:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339
@@ -21,10 +20,13 @@ DEPENDS+=   ${PYPKGPREFIX}-six-[0-9]*:../.
 EGG_NAME=      ${DISTNAME:S/certbot/acme/}
 
 # TEST_DEPENDS
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 
 PYSETUPSUBDIR= acme
 
+post-install:
+       ${MV} ${DESTDIR}${PREFIX}/bin/jws \
+               ${DESTDIR}${PREFIX}/bin/jws${PYVERSSUFFIX}
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-acme/PLIST
diff -u pkgsrc/security/py-acme/PLIST:1.4 pkgsrc/security/py-acme/PLIST:1.5
--- pkgsrc/security/py-acme/PLIST:1.4   Tue Feb  7 14:03:14 2017
+++ pkgsrc/security/py-acme/PLIST       Thu May 11 08:23:35 2017
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2017/02/07 14:03:14 wiz Exp $
-bin/jws
+@comment $NetBSD: PLIST,v 1.5 2017/05/11 08:23:35 fhajny Exp $
+bin/jws${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt

Index: pkgsrc/security/py-certbot/Makefile
diff -u pkgsrc/security/py-certbot/Makefile:1.4 pkgsrc/security/py-certbot/Makefile:1.5
--- pkgsrc/security/py-certbot/Makefile:1.4     Mon Apr 10 10:29:38 2017
+++ pkgsrc/security/py-certbot/Makefile Thu May 11 08:23:35 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/04/10 10:29:38 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2017/05/11 08:23:35 fhajny Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    security
 
 COMMENT=       Client for the Let's Encrypt CA
@@ -10,14 +9,9 @@ LICENSE=      apache-2.0
 
 EGG_NAME=      ${DISTNAME}
 
-# Only supports Python 2.6 and 2.7 so far
-# https://github.com/certbot/certbot#system-requirements
-PYTHON_VERSIONS_ACCEPTED=      27
-
 .include "Makefile.common"
 
 DEPENDS+=      ${PYPKGPREFIX}-acme-${PKGVERSION_NOREV}{nb*,}:../../security/py-acme
-DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
 DEPENDS+=      ${PYPKGPREFIX}-configargparse>=0.9.3:../../devel/py-configargparse
 DEPENDS+=      ${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
 DEPENDS+=      ${PYPKGPREFIX}-cryptography>=0.7:../../security/py-cryptography
@@ -52,6 +46,8 @@ MAKE_DIRS+=           ${VARBASE}/letsencrypt/log
 INSTALLATION_DIRS+=    share/examples/certbot
 
 post-install:
+       ${MV} ${DESTDIR}${PREFIX}/bin/certbot \
+               ${DESTDIR}${PREFIX}/bin/certbot${PYVERSSUFFIX}
        ${INSTALL_DATA} ${WRKSRC}/examples/cli.ini \
                ${DESTDIR}${PREFIX}/share/examples/certbot
 

Index: pkgsrc/security/py-certbot/Makefile.common
diff -u pkgsrc/security/py-certbot/Makefile.common:1.9 pkgsrc/security/py-certbot/Makefile.common:1.10
--- pkgsrc/security/py-certbot/Makefile.common:1.9      Thu Apr  6 19:51:15 2017
+++ pkgsrc/security/py-certbot/Makefile.common  Thu May 11 08:23:35 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2017/04/06 19:51:15 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.10 2017/05/11 08:23:35 fhajny Exp $
 #
 # used by security/py-acme/Makefile
 # used by security/py-certbot/Makefile
 
-DISTNAME=      certbot-0.13.0
+DISTNAME=      certbot-0.14.0
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=certbot/}
 
 HOMEPAGE=      https://letsencrypt.org/
Index: pkgsrc/security/py-certbot/distinfo
diff -u pkgsrc/security/py-certbot/distinfo:1.9 pkgsrc/security/py-certbot/distinfo:1.10
--- pkgsrc/security/py-certbot/distinfo:1.9     Thu Apr  6 19:51:15 2017
+++ pkgsrc/security/py-certbot/distinfo Thu May 11 08:23:35 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2017/04/06 19:51:15 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2017/05/11 08:23:35 fhajny Exp $
 
-SHA1 (certbot-0.13.0.tar.gz) = ac2ea402d61bbd528fb3278131e42e797f9b190f
-RMD160 (certbot-0.13.0.tar.gz) = c7ac22572f072c0d06654b1db7fd6d4bbf3018da
-SHA512 (certbot-0.13.0.tar.gz) = c0bc38b48f0c9731236bba9f4c05da960bfc038be629c5f4c63e80812595c6e0fb679ff901a8bf160efa119b532b5a629435ed595e3b1049f7a15f2c2dd8eb40
-Size (certbot-0.13.0.tar.gz) = 827956 bytes
+SHA1 (certbot-0.14.0.tar.gz) = a9797f51e00b83b4950e42a56e25bef670a2d09b
+RMD160 (certbot-0.14.0.tar.gz) = ba3e6295e992d424d8efeda642ad4671bc737f27
+SHA512 (certbot-0.14.0.tar.gz) = da278e1ac75464c2dfe3d7d649c1010468f5c873f366fc308a9e2ba5b1210f2d03e07d84ffd7a499d9a39d3f66518e7ca87964c1ef121173d3172a0803ad02c5
+Size (certbot-0.14.0.tar.gz) = 850922 bytes

Index: pkgsrc/security/py-certbot/PLIST
diff -u pkgsrc/security/py-certbot/PLIST:1.7 pkgsrc/security/py-certbot/PLIST:1.8
--- pkgsrc/security/py-certbot/PLIST:1.7        Thu Apr  6 19:51:15 2017
+++ pkgsrc/security/py-certbot/PLIST    Thu May 11 08:23:35 2017
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2017/04/06 19:51:15 fhajny Exp $
-bin/certbot
+@comment $NetBSD: PLIST,v 1.8 2017/05/11 08:23:35 fhajny Exp $
+bin/certbot${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -69,6 +69,9 @@ ${PYSITELIB}/certbot/hooks.pyo
 ${PYSITELIB}/certbot/interfaces.py
 ${PYSITELIB}/certbot/interfaces.pyc
 ${PYSITELIB}/certbot/interfaces.pyo
+${PYSITELIB}/certbot/lock.py
+${PYSITELIB}/certbot/lock.pyc
+${PYSITELIB}/certbot/lock.pyo
 ${PYSITELIB}/certbot/log.py
 ${PYSITELIB}/certbot/log.pyc
 ${PYSITELIB}/certbot/log.pyo
@@ -198,6 +201,9 @@ ${PYSITELIB}/certbot/tests/errors_test.p
 ${PYSITELIB}/certbot/tests/hook_test.py
 ${PYSITELIB}/certbot/tests/hook_test.pyc
 ${PYSITELIB}/certbot/tests/hook_test.pyo
+${PYSITELIB}/certbot/tests/lock_test.py
+${PYSITELIB}/certbot/tests/lock_test.pyc
+${PYSITELIB}/certbot/tests/lock_test.pyo
 ${PYSITELIB}/certbot/tests/log_test.py
 ${PYSITELIB}/certbot/tests/log_test.pyc
 ${PYSITELIB}/certbot/tests/log_test.pyo
@@ -231,7 +237,6 @@ ${PYSITELIB}/certbot/tests/testdata/cli.
 ${PYSITELIB}/certbot/tests/testdata/csr-6sans.pem
 ${PYSITELIB}/certbot/tests/testdata/csr-nonames.pem
 ${PYSITELIB}/certbot/tests/testdata/csr-nosans.pem
-${PYSITELIB}/certbot/tests/testdata/csr-san.der
 ${PYSITELIB}/certbot/tests/testdata/csr-san.pem
 ${PYSITELIB}/certbot/tests/testdata/csr.der
 ${PYSITELIB}/certbot/tests/testdata/csr.pem

Added files:

Index: pkgsrc/security/py-acme/ALTERNATIVES
diff -u /dev/null pkgsrc/security/py-acme/ALTERNATIVES:1.1
--- /dev/null   Thu May 11 08:23:35 2017
+++ pkgsrc/security/py-acme/ALTERNATIVES        Thu May 11 08:23:35 2017
@@ -0,0 +1 @@
+bin/jws @PREFIX@/bin/jws@PYVERSSUFFIX@

Index: pkgsrc/security/py-certbot/ALTERNATIVES
diff -u /dev/null pkgsrc/security/py-certbot/ALTERNATIVES:1.1
--- /dev/null   Thu May 11 08:23:35 2017
+++ pkgsrc/security/py-certbot/ALTERNATIVES     Thu May 11 08:23:35 2017
@@ -0,0 +1 @@
+bin/certbot @PREFIX@/bin/certbot@PYVERSSUFFIX@

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index