Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714940164180740"
MIME-Version: 1.0
Date: Sun, 5 May 2024 20:16:04 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/security/py27-OpenSSL
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240505201604.D5AB1FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714940164180740
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun May  5 20:16:04 UTC 2024

Modified Files:
	pkgsrc/security/py27-OpenSSL: DESCR Makefile PLIST

Log Message:
py27-OpenSSL: convert to wheel.mk.

Despite the name, this package is only used for providing
a non-Rust version of py-OpenSSL - we have no Python 2 users
left in pkgsrc.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/py27-OpenSSL/DESCR \
    pkgsrc/security/py27-OpenSSL/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py27-OpenSSL/Makefile

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


--_----------=_1714940164180740
Content-Disposition: inline
Content-Length: 3664
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/py27-OpenSSL/DESCR
diff -u pkgsrc/security/py27-OpenSSL/DESCR:1.1 pkgsrc/security/py27-OpenSSL/DESCR:1.2
--- pkgsrc/security/py27-OpenSSL/DESCR:1.1	Wed Oct 19 14:11:01 2022
+++ pkgsrc/security/py27-OpenSSL/DESCR	Sun May  5 20:16:04 2024
@@ -1,7 +1,6 @@
-pyOpenSSL is a Python module that is a rather thin wrapper around (a
-subset of) the OpenSSL library.  A lot of the object methods do
+pyOpenSSL is a Python module that is a rather thin wrapper around
+(a subset of) the OpenSSL library.  A lot of the object methods do
 nothing more than call a corresponding function in the OpenSSL
 library.
 
-This legacy version is the last version supporting non-Rust
-platforms (as well as, coincidentally, Python 2.7).
+This legacy version is the last version supporting non-Rust platforms.
Index: pkgsrc/security/py27-OpenSSL/PLIST
diff -u pkgsrc/security/py27-OpenSSL/PLIST:1.1 pkgsrc/security/py27-OpenSSL/PLIST:1.2
--- pkgsrc/security/py27-OpenSSL/PLIST:1.1	Wed Oct 19 14:11:01 2022
+++ pkgsrc/security/py27-OpenSSL/PLIST	Sun May  5 20:16:04 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/10/19 14:11:01 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/05/05 20:16:04 wiz Exp $
 ${PYSITELIB}/OpenSSL/SSL.py
 ${PYSITELIB}/OpenSSL/SSL.pyc
 ${PYSITELIB}/OpenSSL/SSL.pyo
@@ -20,8 +20,8 @@ ${PYSITELIB}/OpenSSL/rand.pyo
 ${PYSITELIB}/OpenSSL/version.py
 ${PYSITELIB}/OpenSSL/version.pyc
 ${PYSITELIB}/OpenSSL/version.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt

Index: pkgsrc/security/py27-OpenSSL/Makefile
diff -u pkgsrc/security/py27-OpenSSL/Makefile:1.4 pkgsrc/security/py27-OpenSSL/Makefile:1.5
--- pkgsrc/security/py27-OpenSSL/Makefile:1.4	Tue Oct 24 22:10:57 2023
+++ pkgsrc/security/py27-OpenSSL/Makefile	Sun May  5 20:16:04 2024
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.4 2023/10/24 22:10:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/05/05 20:16:04 wiz Exp $
 
 DISTNAME=	pyOpenSSL-21.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyOpenSSL/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pyopenssl.org/
-COMMENT=	Python interface to the OpenSSL library
+COMMENT=	Python interface to the OpenSSL library (non-Rust version)
 LICENSE=	apache-2.0
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+DEPENDS+=	${PYPKGPREFIX}-cryptography<4:../../security/py27-cryptography
 DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
-#TEST_DEPENDS+=	${PYPKGPREFIX}-flaky-[0-9]*:../../devel/py-flaky
-#TEST_DEPENDS+=	${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
-#TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+TEST_DEPENDS+=	${PYPKGPREFIX}-flaky-[0-9]*:../../devel/py-flaky
+TEST_DEPENDS+=	${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
 
-# https://github.com/pyca/pyopenssl/issues/656
-PYSETUPTESTTARGET=	pytest
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-PYTHON_VERSIONED_DEPENDENCIES=	cryptography
-
-.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


--_----------=_1714940164180740--