CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct 19 14:17:54 UTC 2022

Modified Files:
        pkgsrc/lang/python: versioned_dependencies.mk
Added Files:
        pkgsrc/security/py-OpenSSL: dependency.mk

Log Message:
fighting a losing battle against the py-cryptography rustification, part 4

Add support for py-OpenSSL to versioned_dependencies.mk


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/lang/python/versioned_dependencies.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/security/py-OpenSSL/dependency.mk

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

Modified files:

Index: pkgsrc/lang/python/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.88 pkgsrc/lang/python/versioned_dependencies.mk:1.89
--- pkgsrc/lang/python/versioned_dependencies.mk:1.88   Wed Oct 19 13:42:46 2022
+++ pkgsrc/lang/python/versioned_dependencies.mk        Wed Oct 19 14:17:54 2022
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.88 2022/10/19 13:42:46 nia Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.89 2022/10/19 14:17:54 nia Exp $
 #
 # This file determines which separate distribution of a Python
 # package is used as dependency, depending on the Python version
@@ -17,6 +17,7 @@
 
 # format: short name for PYTHON_VERSIONED_DEPENDENCIES<space>Python-2.x path<space>Python-3.x path
 _SUPPORTED_PACKAGES=   # empty
+_SUPPORTED_PACKAGES+=  OpenSSL security/py27-OpenSSL security/py-OpenSSL
 _SUPPORTED_PACKAGES+=  Pillow graphics/py-Pillow6 graphics/py-Pillow
 _SUPPORTED_PACKAGES+=  X textproc/py-X2 textproc/py-X
 _SUPPORTED_PACKAGES+=  cairo graphics/py-cairo118 graphics/py-cairo
@@ -53,6 +54,10 @@ type:=       ${pattern:C/[^:]*//}
 # Special due to Rust handling.
 _PKG_MATCHED=  yes
 .      include "../../security/py-cryptography/dependency.mk"
+.    elif "${pkg}" == "${name}" && "${pkg}" == "OpenSSL"
+# Special due to Rust handling.
+_PKG_MATCHED=  yes
+.      include "../../security/py-OpenSSL/dependency.mk"
 .    elif "${pkg}" == "${name}"
 _PKG_MATCHED=  yes
 .      if ${_PYTHON_VERSION} == 27

Added files:

Index: pkgsrc/security/py-OpenSSL/dependency.mk
diff -u /dev/null pkgsrc/security/py-OpenSSL/dependency.mk:1.1
--- /dev/null   Wed Oct 19 14:17:54 2022
+++ pkgsrc/security/py-OpenSSL/dependency.mk    Wed Oct 19 14:17:54 2022
@@ -0,0 +1,24 @@
+# $NetBSD: dependency.mk,v 1.1 2022/10/19 14:17:54 nia Exp $
+#
+# Not for public use - use through versioned_dependencies.mk.
+#
+
+.include "../../security/py-cryptography/dependency.mk"
+
+.if ${PYCRYPTOGRAPHY_TYPE:tl} == "rust"
+PYOPENSSL_VERSION?=    OpenSSL>=0
+PYOPENSSL_DIR?=                security/py-OpenSSL
+.else
+PYOPENSSL_VERSION?=    OpenSSL>=0<22.0.0
+PYOPENSSL_DIR?=                security/py27-OpenSSL
+.endif
+
+.if "${type}" == ":build"
+BUILD_DEPENDS:=        ${BUILD_DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.elif "${type}" == ":test"
+TEST_DEPENDS:= ${TEST_DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.elif "${type}" == ":tool"
+TOOL_DEPENDS:= ${TOOL_DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.else
+DEPENDS:=      ${DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.endif