On 2022/02/08 08:59, Aaron Bieber wrote:
>
> Stuart Henderson <stu@spacehopper.org> writes:
>
> > Thought I'd send out a diff for this update since I have it.
> >
> > I have held off on committing the update because rust is no longer
> > optional, therefore it would break packages using it on non-rust
> > archs (of the ones we're building packages for anyway, that's
> > armv7/mips64/powerpc/powerpc64/riscv64).
> >
> > The other side of the coin is that, as more things are moved to rust
> > code, there's less that will break with LibreSSL updates..and some
> > other programs (not in ports, but still) have started wanting newer
> > versions, so we'll have to do it sometime.
>
> I am no snake charmer, but IMO the sooner we jump to this the
> better. One of those why prolong the pain sorta things.
>
> Maybe people can file bugs with upstreams when things stop working on
> their rust-less arch!
Here's an updated diff. (Needs newer py-test if you want to run the
test suite).
BTW those archs are all supported by Rust, just not by our port yet.
So filing bugs with upstreams wouldn't be useful.
Index: py-cryptography/Makefile
===================================================================
RCS file: /cvs/ports/security/py-cryptography/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- py-cryptography/Makefile 14 Jan 2022 10:59:10 -0000 1.56
+++ py-cryptography/Makefile 8 Feb 2022 21:54:13 -0000
@@ -2,11 +2,11 @@
COMMENT= cryptographic recipes and primitives for Python
-MODPY_EGG_VERSION= 3.4.8
-REVISION= 5
+MODPY_EGG_VERSION= 36.0.1
DISTNAME= cryptography-${MODPY_EGG_VERSION}
DISTFILES= cryptography-${MODPY_EGG_VERSION}${EXTRACT_SUFX}
PKGNAME= ${MODPY_PY_PREFIX}${DISTNAME}
+
.include "crates.inc"
PATCHORIG= .patch.orig
@@ -18,24 +18,30 @@ HOMEPAGE= https://cryptography.io/
# dual: BSD or Apache 2
PERMIT_PACKAGE= Yes
-WANTLIB= ${MODPY_WANTLIB} crypto pthread ssl
+WANTLIB= ${MODPY_WANTLIB} c crypto c++abi pthread ssl
+
+FLAVORS= python3
+FLAVOR= python3
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c
-MODULES= lang/python
+MODULES= devel/cargo \
+ lang/python
+
MODPY_SETUPTOOLS= Yes
MODPY_PI= Yes
-FLAVORS= python3
-FLAVOR= python3
-
-RUN_DEPENDS= devel/py-cffi${MODPY_FLAVOR}>=1.4.2
+MODCARGO_CARGOTOML= ${WRKSRC}/src/rust/Cargo.toml
+MODCARGO_INSTALL= No
+MODCARGO_TEST= No
BUILD_DEPENDS= ${RUN_DEPENDS} \
devel/py-setuptools-rust${MODPY_FLAVOR}
-# needs newer pytest than is in-tree
+RUN_DEPENDS= devel/py-cffi${MODPY_FLAVOR}>=1.4.2
+
+# XXX needs pytest >=6
MODPY_PYTEST= Yes
PORTHOME= ${WRKDIR}
TEST_DEPENDS= devel/py-coverage${MODPY_FLAVOR} \
@@ -44,26 +50,11 @@ TEST_DEPENDS= devel/py-coverage${MODPY_F
devel/py-test-subtests${MODPY_FLAVOR} \
devel/py-test-xdist${MODPY_FLAVOR} \
devel/py-tz${MODPY_FLAVOR} \
+ security/py-bcrypt${MODPY_FLAVOR} \
security/py-cryptography_vectors${MODPY_FLAVOR}=${MODPY_EGG_VERSION} \
textproc/py-iso8601${MODPY_FLAVOR}
-.include <bsd.port.arch.mk>
-.if ${PROPERTIES:Mrust}
-MODULES+= devel/cargo
-RUST_COMMENT=
-MODCARGO_CARGOTOML= ${WRKSRC}/src/rust/Cargo.toml
-WANTLIB+= c c++abi
-
do-configure:
@${MODCARGO_configure}
-.else
-RUST_COMMENT= "@comment "
-MAKE_ENV= CRYPTOGRAPHY_DONT_BUILD_RUST=1
-MASTER_SITES9= https://crates.io/api/v1/crates/
-. for _cratename _cratever in ${MODCARGO_CRATES}
-SUPDISTFILES += cargo/${_cratename}-${_cratever}.tar.gz{${_cratename}/${_cratever}/download}:9
-. endfor
-.endif
-SUBST_VARS+= RUST_COMMENT
.include <bsd.port.mk>
Index: py-cryptography/crates.inc
===================================================================
RCS file: /cvs/ports/security/py-cryptography/crates.inc,v
retrieving revision 1.1
diff -u -p -r1.1 crates.inc
--- py-cryptography/crates.inc 6 Sep 2021 20:56:50 -0000 1.1
+++ py-cryptography/crates.inc 8 Feb 2022 21:54:13 -0000
@@ -1,32 +1,49 @@
-# $OpenBSD: crates.inc,v 1.1 2021/09/06 20:56:50 sthen Exp $
+# $OpenBSD$
-MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0
+MODCARGO_CRATES += Inflector 0.11.4 # BSD-2-Clause
+MODCARGO_CRATES += aliasable 0.1.3 # MIT
+MODCARGO_CRATES += asn1 0.8.7 # BSD-3-Clause
+MODCARGO_CRATES += asn1_derive 0.8.7 # BSD-3-Clause
+MODCARGO_CRATES += autocfg 1.0.1 # Apache-2.0 OR MIT
+MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
+MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
-MODCARGO_CRATES += ctor 0.1.19 # Apache-2.0 OR MIT
-MODCARGO_CRATES += ghost 0.1.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += chrono 0.4.19 # MIT/Apache-2.0
MODCARGO_CRATES += indoc 0.3.6 # MIT OR Apache-2.0
MODCARGO_CRATES += indoc-impl 0.3.6 # MIT OR Apache-2.0
-MODCARGO_CRATES += instant 0.1.9 # BSD-3-Clause
-MODCARGO_CRATES += inventory 0.1.10 # MIT OR Apache-2.0
-MODCARGO_CRATES += inventory-impl 0.1.10 # MIT OR Apache-2.0
-MODCARGO_CRATES += libc 0.2.85 # MIT OR Apache-2.0
-MODCARGO_CRATES += lock_api 0.4.2 # Apache-2.0/MIT
-MODCARGO_CRATES += parking_lot 0.11.1 # Apache-2.0/MIT
-MODCARGO_CRATES += parking_lot_core 0.8.3 # Apache-2.0/MIT
+MODCARGO_CRATES += instant 0.1.12 # BSD-3-Clause
+MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
+MODCARGO_CRATES += libc 0.2.107 # MIT OR Apache-2.0
+MODCARGO_CRATES += lock_api 0.4.5 # Apache-2.0/MIT
+MODCARGO_CRATES += num-integer 0.1.44 # MIT OR Apache-2.0
+MODCARGO_CRATES += num-traits 0.2.14 # MIT OR Apache-2.0
+MODCARGO_CRATES += once_cell 1.8.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ouroboros 0.13.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ouroboros_macro 0.13.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += parking_lot 0.11.2 # Apache-2.0/MIT
+MODCARGO_CRATES += parking_lot_core 0.8.5 # Apache-2.0/MIT
MODCARGO_CRATES += paste 0.1.18 # MIT OR Apache-2.0
MODCARGO_CRATES += paste-impl 0.1.18 # MIT OR Apache-2.0
+MODCARGO_CRATES += pem 1.0.1 # MIT
+MODCARGO_CRATES += proc-macro-error 1.0.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += proc-macro-error-attr 1.0.4 # MIT OR Apache-2.0
MODCARGO_CRATES += proc-macro-hack 0.5.19 # MIT OR Apache-2.0
-MODCARGO_CRATES += proc-macro2 1.0.24 # MIT OR Apache-2.0
-MODCARGO_CRATES += pyo3 0.13.2 # Apache-2.0
-MODCARGO_CRATES += pyo3-macros 0.13.2 # Apache-2.0
-MODCARGO_CRATES += pyo3-macros-backend 0.13.2 # Apache-2.0
-MODCARGO_CRATES += quote 1.0.9 # MIT OR Apache-2.0
-MODCARGO_CRATES += redox_syscall 0.2.4 # MIT
+MODCARGO_CRATES += proc-macro2 1.0.32 # MIT OR Apache-2.0
+MODCARGO_CRATES += pyo3 0.15.1 # Apache-2.0
+MODCARGO_CRATES += pyo3-build-config 0.15.1 # Apache-2.0
+MODCARGO_CRATES += pyo3-macros 0.15.1 # Apache-2.0
+MODCARGO_CRATES += pyo3-macros-backend 0.15.1 # Apache-2.0
+MODCARGO_CRATES += quote 1.0.10 # MIT OR Apache-2.0
+MODCARGO_CRATES += redox_syscall 0.2.10 # MIT
+MODCARGO_CRATES += regex 1.5.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += regex-syntax 0.6.25 # MIT/Apache-2.0
MODCARGO_CRATES += scopeguard 1.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += smallvec 1.6.1 # MIT/Apache-2.0
-MODCARGO_CRATES += syn 1.0.60 # MIT OR Apache-2.0
-MODCARGO_CRATES += unicode-xid 0.2.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += smallvec 1.7.0 # MIT/Apache-2.0
+MODCARGO_CRATES += stable_deref_trait 1.2.0 # MIT/Apache-2.0
+MODCARGO_CRATES += syn 1.0.81 # MIT OR Apache-2.0
+MODCARGO_CRATES += unicode-xid 0.2.2 # MIT OR Apache-2.0
MODCARGO_CRATES += unindent 0.1.7 # MIT OR Apache-2.0
+MODCARGO_CRATES += version_check 0.9.3 # MIT/Apache-2.0
MODCARGO_CRATES += winapi 0.3.9 # MIT/Apache-2.0
MODCARGO_CRATES += winapi-i686-pc-windows-gnu 0.4.0 # MIT/Apache-2.0
MODCARGO_CRATES += winapi-x86_64-pc-windows-gnu 0.4.0 # MIT/Apache-2.0
Index: py-cryptography/distinfo
===================================================================
RCS file: /cvs/ports/security/py-cryptography/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- py-cryptography/distinfo 6 Sep 2021 20:56:50 -0000 1.27
+++ py-cryptography/distinfo 8 Feb 2022 21:54:13 -0000
@@ -1,62 +1,96 @@
-SHA256 (cargo/bitflags-1.2.1.tar.gz) = zx3i/ox1vBRaL1d63ZUfgTSIm0eV1HRmpUpchG1pFpM=
+SHA256 (cargo/Inflector-0.11.4.tar.gz) = /kOMY0WHBuA0eUQnQ7qubIglZJjmQxcI9t/FIKJlFdM=
+SHA256 (cargo/aliasable-0.1.3.tar.gz) = JQ9inAFhrYEHz4kxnpkAUfrmKDL9NDCDvqRS2T4iBf0=
+SHA256 (cargo/asn1-0.8.7.tar.gz) = z/+zUZX+rv+wca8PemQ0BWZ4E92GKcJ8sMMQ+3ZlSrE=
+SHA256 (cargo/asn1_derive-0.8.7.tar.gz) = vIlPoF94a2SBBlUU5v9eGDijNi9UP3H24akv8nsFHCU=
+SHA256 (cargo/autocfg-1.0.1.tar.gz) = zbAx3XjihzHYfVbMj/70qPNsomw4/i3nAFQ+Yn+KRko=
+SHA256 (cargo/base64-0.13.0.tar.gz) = kE3+rFDzzauij8b1f9zdt19J7WE0ZnanjE/+VYd4Av0=
+SHA256 (cargo/bitflags-1.3.2.tar.gz) = vvONRRY8Lx3eCUp9/TPM9ZXJKQXI+PT9wY0G+xA3cYo=
SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=
-SHA256 (cargo/ctor-0.1.19.tar.gz) = 6PRdmtQXvO9IF9YUpQGrVc3Zam/bJPSaq4mlSs/Waxk=
-SHA256 (cargo/ghost-0.1.2.tar.gz) = GlvPG76rc6pM8v3mCoRoWNwDYWPHwzvsMJ+NF954VHk=
+SHA256 (cargo/chrono-0.4.19.tar.gz) = ZwrWjJCIwqljqqKYyzaWiM8/lGXOXi1MoQ5uAJihznM=
SHA256 (cargo/indoc-0.3.6.tar.gz) = R3Qai8YPsm641uAji7sm2Fdf9iP9yXsaLADAULloTtg=
SHA256 (cargo/indoc-impl-0.3.6.tar.gz) = zgRtFh8AD//eX0MqDQNNA0HcFSZDslmO1b/ORMTzqPA=
-SHA256 (cargo/instant-0.1.9.tar.gz) = YRJO7rvWm4GQVY3yJa335Mqvzg10ORnl1rGWUjFOxew=
-SHA256 (cargo/inventory-0.1.10.tar.gz) = Dw9++4BOyV4z25rUnkJS8EnjfosKRlLjzWH3mZ8u/38=
-SHA256 (cargo/inventory-impl-0.1.10.tar.gz) = dcCU6UgWcjq5NkhGZpaPW1gGBJLogPPI0ASJoeJE+lE=
-SHA256 (cargo/libc-0.2.85.tar.gz) = fMrEsAcAh15qB8bN43DUTTL6AcWmXN0vymhYxHnSi7M=
-SHA256 (cargo/lock_api-0.4.2.tar.gz) = 3Zb/0TWy/XuXOsAm0oCF3vvomD3wV87T608hMLCDExI=
-SHA256 (cargo/parking_lot-0.11.1.tar.gz) = bXdErAKd8i3KYoTv5OiYmR0o4whccGyXK819pKJ6Fes=
-SHA256 (cargo/parking_lot_core-0.8.3.tar.gz) = +np4KTjnRXY/5pB/xrqGlG1y9J/n4h3gdOCBKKmfsBg=
+SHA256 (cargo/instant-0.1.12.tar.gz) = elu+gkxQfF2llWNV6Gp0bYLg4UZPZdhizF5x2nDpSyw=
+SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY=
+SHA256 (cargo/libc-0.2.107.tar.gz) = ++XiNATaW09VXvhevtmPtAg+VaAMMXgAvCpQ7enz0hk=
+SHA256 (cargo/lock_api-0.4.5.tar.gz) = cSpNCTyZduJOfbykHbiV2ry6w4619ARTk9F6lb37EQk=
+SHA256 (cargo/num-integer-0.1.44.tar.gz) = 0sxpimO1SacLwEcHPSlJzOJ80cewpKhi0IqAMbwoAds=
+SHA256 (cargo/num-traits-0.2.14.tar.gz) = mmSx7FzaJYbihHIkhtgCrPH329xiPiv8V+Zcoc0JkpA=
+SHA256 (cargo/once_cell-1.8.0.tar.gz) = aS/LY7ZLF1gCngqW7mPgSc6MWUhYfy9yCN8EYl5fa1Y=
+SHA256 (cargo/ouroboros-0.13.0.tar.gz) = 81fvgtG022b77QuNVCy9PCLQv1s5Ozwle5ukVo5wycM=
+SHA256 (cargo/ouroboros_macro-0.13.0.tar.gz) = RKC1LCy6733/pf7BpDJ0r+i9KmRPqfxQqe9P8CabElc=
+SHA256 (cargo/parking_lot-0.11.2.tar.gz) = fRe3gDamBmO3l63q7kb1yd/ruGlI0SVQB6HWvgJx/5k=
+SHA256 (cargo/parking_lot_core-0.8.5.tar.gz) = 126OFJO8rA0nZsQnN/NEWPHIxQwNI7yyTqlTr/snMhY=
SHA256 (cargo/paste-0.1.18.tar.gz) = Rcogx32AvmZq7ytFSG2oYjj6vjPjgwa9MRj+SvM/qIA=
SHA256 (cargo/paste-impl-0.1.18.tar.gz) = 2Vp9sgC5fvNwyObeAIglL34N//fQR6KFKOR0VsD8mLY=
+SHA256 (cargo/pem-1.0.1.tar.gz) = Bmc4YNuE0CpjlC+mnNlUPyYkpd866n8zFzBI+nrVzxo=
+SHA256 (cargo/proc-macro-error-1.0.4.tar.gz) = 2iVJD/mJKqs/z3w28Iz7kC3T5xyg+flRe+oCpzpc44w=
+SHA256 (cargo/proc-macro-error-attr-1.0.4.tar.gz) = ob5AGA5S7MmK2AsYSTS689DSn5eVdOQ5r1pVJ0s1+Gk=
SHA256 (cargo/proc-macro-hack-0.5.19.tar.gz) = 2/DEi8HZE3WuXDzYHjci3/Grz4GjCWAkBkDSI/Wf4OU=
-SHA256 (cargo/proc-macro2-1.0.24.tar.gz) = HgcE7hp+ANe7QX0HcOowPBvMur8O8WZ9rpK1ln9finE=
-SHA256 (cargo/pyo3-0.13.2.tar.gz) = SDe46OGKECwj950emhELWX6jtoTJXodOsa2I+GgxCcM=
-SHA256 (cargo/pyo3-macros-0.13.2.tar.gz) = pH8sMAzuw+WAZP1fj1thIw8v/WS95JcMgf3QVjotsbs=
-SHA256 (cargo/pyo3-macros-backend-0.13.2.tar.gz) = h7CX5dhPy+PhZ/QA++3WV4IKN1sDTHi9hSBQdJpXXWY=
-SHA256 (cargo/quote-1.0.9.tar.gz) = w9C5dF3C3r9QfIQi3gXXImzB8GRCFt/f6tmI+bGrMqc=
-SHA256 (cargo/redox_syscall-0.2.4.tar.gz) = BeyMqUFsXqNwYrUCcDzX/LIHc2vClPbgzzZ6xvwjRXA=
+SHA256 (cargo/proc-macro2-1.0.32.tar.gz) = ulCMwRdCwNxcFll3FnOvureg76sjqhfoVMurCDftC0M=
+SHA256 (cargo/pyo3-0.15.1.tar.gz) = fPAdvxwFrwoUx3ee1vOqnerJw0GWBqyd5Tei1kkAVyA=
+SHA256 (cargo/pyo3-build-config-0.15.1.tar.gz) = 2/nk0Si/vdyJitNAmQAIDY1QlcN5Yy+7+7nIz7H7hSs=
+SHA256 (cargo/pyo3-macros-0.15.1.tar.gz) = Z3AesysfmpcitLxUtUj/nX6/3tARwS2uznuQY74f11U=
+SHA256 (cargo/pyo3-macros-backend-0.15.1.tar.gz) = 9E8J6CXuSaEF8seyPr7lCIapruB0b03VpwQTimSwIYo=
+SHA256 (cargo/quote-1.0.10.tar.gz) = OLyMxqXy42VeCJnBuEhkOyVi+FPxFL/se+EgZ446zgU=
+SHA256 (cargo/redox_syscall-0.2.10.tar.gz) = g4PzljkmnN6X0lWjK9towEczcpVBSUDGi90wwuEyA/8=
+SHA256 (cargo/regex-1.5.4.tar.gz) = 0HqGKTWetW8eL7FlK7BCEsByqHumhUagQGXVJWc6xGE=
+SHA256 (cargo/regex-syntax-0.6.25.tar.gz) = 9JcoWITz/P9CT/yTPlbXy8pRHe8MmDGn+bX2FT48yJs=
SHA256 (cargo/scopeguard-1.1.0.tar.gz) = 0pqwxtP8Dukv5m4tmfcA6rF6jVfRwdO3SDgPsguqeM0=
-SHA256 (cargo/smallvec-1.6.1.tar.gz) = /g83yejzxaSmatZVqTx02qxK0AxEFTO/XG55kLtCYE4=
-SHA256 (cargo/syn-1.0.60.tar.gz) = xwBZfsqKWnYr6zV1Pva5TfIByBzKZ2YE9UdJWg1/AIE=
-SHA256 (cargo/unicode-xid-0.2.1.tar.gz) = 9/4Ls0eWUUOckRL3K2xQUDhXTJ+7V17Rvzt5f6Od1WQ=
+SHA256 (cargo/smallvec-1.7.0.tar.gz) = Hsq2xzWmu0E5wMqv0Mw2NXSLuzrPRVDoE4EiCZJR8wk=
+SHA256 (cargo/stable_deref_trait-1.2.0.tar.gz) = qPEScpUS+ORC2B+VqKfd8rfGuKGm9QmpWGQUKzDKstM=
+SHA256 (cargo/syn-1.0.81.tar.gz) = 8q/uGLi+taWW7LSi3OEoxxm0ujmdNBJrnkOW4/mGCWY=
+SHA256 (cargo/unicode-xid-0.2.2.tar.gz) = jMuC1h+ApmPv4feHpRsWtaUeMxTWrDZbCGOfUjh7M/M=
SHA256 (cargo/unindent-0.1.7.tar.gz) = 8U7gTZQVtSs66rBiWKPwcJMYK4i6D5uNID8hGnp9Qcc=
+SHA256 (cargo/version_check-0.9.3.tar.gz) = X+zcqaUpHMK43PfcAkU/7nkaKA83Q8sJBfiCKuRjs/4=
SHA256 (cargo/winapi-0.3.9.tar.gz) = XIOaZ0/NepiVLlkyQupACr6TmSdGdh44ZBQF0osA9Bk=
SHA256 (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = rDuHxjYgQm3ZuZHlzgMp7/VFvMu7NPO+Cf9vtqtRt7Y=
SHA256 (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = cS4ieEHQV8HuHNL7Ivp+WlRhro5I+iynnsQs/BkxGD8=
-SHA256 (cryptography-3.4.8.tar.gz) = lMxe1M6u/L5b84yPumoh/B02W7j7gm6haI4zcLLiShw=
-SIZE (cargo/bitflags-1.2.1.tar.gz) = 16745
+SHA256 (cryptography-36.0.1.tar.gz) = U+XB3D16lT3gVdd77y/2B87veiqsA1O11jCrZ/dCNjg=
+SIZE (cargo/Inflector-0.11.4.tar.gz) = 17438
+SIZE (cargo/aliasable-0.1.3.tar.gz) = 6169
+SIZE (cargo/asn1-0.8.7.tar.gz) = 26288
+SIZE (cargo/asn1_derive-0.8.7.tar.gz) = 4305
+SIZE (cargo/autocfg-1.0.1.tar.gz) = 12908
+SIZE (cargo/base64-0.13.0.tar.gz) = 62070
+SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021
SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934
-SIZE (cargo/ctor-0.1.19.tar.gz) = 9307
-SIZE (cargo/ghost-0.1.2.tar.gz) = 12777
+SIZE (cargo/chrono-0.4.19.tar.gz) = 155663
SIZE (cargo/indoc-0.3.6.tar.gz) = 9663
SIZE (cargo/indoc-impl-0.3.6.tar.gz) = 7933
-SIZE (cargo/instant-0.1.9.tar.gz) = 5213
-SIZE (cargo/inventory-0.1.10.tar.gz) = 11572
-SIZE (cargo/inventory-impl-0.1.10.tar.gz) = 6228
-SIZE (cargo/libc-0.2.85.tar.gz) = 516872
-SIZE (cargo/lock_api-0.4.2.tar.gz) = 20375
-SIZE (cargo/parking_lot-0.11.1.tar.gz) = 39854
-SIZE (cargo/parking_lot_core-0.8.3.tar.gz) = 32147
+SIZE (cargo/instant-0.1.12.tar.gz) = 6128
+SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443
+SIZE (cargo/libc-0.2.107.tar.gz) = 554639
+SIZE (cargo/lock_api-0.4.5.tar.gz) = 25199
+SIZE (cargo/num-integer-0.1.44.tar.gz) = 22216
+SIZE (cargo/num-traits-0.2.14.tar.gz) = 45476
+SIZE (cargo/once_cell-1.8.0.tar.gz) = 28925
+SIZE (cargo/ouroboros-0.13.0.tar.gz) = 5929
+SIZE (cargo/ouroboros_macro-0.13.0.tar.gz) = 15755
+SIZE (cargo/parking_lot-0.11.2.tar.gz) = 39869
+SIZE (cargo/parking_lot_core-0.8.5.tar.gz) = 32466
SIZE (cargo/paste-0.1.18.tar.gz) = 12259
SIZE (cargo/paste-impl-0.1.18.tar.gz) = 9451
+SIZE (cargo/pem-1.0.1.tar.gz) = 9669
+SIZE (cargo/proc-macro-error-1.0.4.tar.gz) = 25293
+SIZE (cargo/proc-macro-error-attr-1.0.4.tar.gz) = 7971
SIZE (cargo/proc-macro-hack-0.5.19.tar.gz) = 15556
-SIZE (cargo/proc-macro2-1.0.24.tar.gz) = 37716
-SIZE (cargo/pyo3-0.13.2.tar.gz) = 281372
-SIZE (cargo/pyo3-macros-0.13.2.tar.gz) = 5434
-SIZE (cargo/pyo3-macros-backend-0.13.2.tar.gz) = 33106
-SIZE (cargo/quote-1.0.9.tar.gz) = 25042
-SIZE (cargo/redox_syscall-0.2.4.tar.gz) = 23234
+SIZE (cargo/proc-macro2-1.0.32.tar.gz) = 41003
+SIZE (cargo/pyo3-0.15.1.tar.gz) = 370722
+SIZE (cargo/pyo3-build-config-0.15.1.tar.gz) = 22095
+SIZE (cargo/pyo3-macros-0.15.1.tar.gz) = 7555
+SIZE (cargo/pyo3-macros-backend-0.15.1.tar.gz) = 46111
+SIZE (cargo/quote-1.0.10.tar.gz) = 29960
+SIZE (cargo/redox_syscall-0.2.10.tar.gz) = 23582
+SIZE (cargo/regex-1.5.4.tar.gz) = 236581
+SIZE (cargo/regex-syntax-0.6.25.tar.gz) = 293293
SIZE (cargo/scopeguard-1.1.0.tar.gz) = 11470
-SIZE (cargo/smallvec-1.6.1.tar.gz) = 26444
-SIZE (cargo/syn-1.0.60.tar.gz) = 231087
-SIZE (cargo/unicode-xid-0.2.1.tar.gz) = 14392
+SIZE (cargo/smallvec-1.7.0.tar.gz) = 27459
+SIZE (cargo/stable_deref_trait-1.2.0.tar.gz) = 8054
+SIZE (cargo/syn-1.0.81.tar.gz) = 234144
+SIZE (cargo/unicode-xid-0.2.2.tar.gz) = 14955
SIZE (cargo/unindent-0.1.7.tar.gz) = 8346
+SIZE (cargo/version_check-0.9.3.tar.gz) = 12547
SIZE (cargo/winapi-0.3.9.tar.gz) = 1200382
SIZE (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
SIZE (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SIZE (cryptography-3.4.8.tar.gz) = 546907
+SIZE (cryptography-36.0.1.tar.gz) = 572145
Index: py-cryptography/patches/patch-src__cffi_src_openssl_ct_py
===================================================================
RCS file: py-cryptography/patches/patch-src__cffi_src_openssl_ct_py
diff -N py-cryptography/patches/patch-src__cffi_src_openssl_ct_py
--- py-cryptography/patches/patch-src__cffi_src_openssl_ct_py 14 Jan 2022 10:59:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src__cffi_src_openssl_ct_py,v 1.2 2022/01/14 10:59:10 tb Exp $
-
-LibreSSL 3.5 has Certificate Transparency code, so enable it to fix build
-breakage.
-
-Index: src/_cffi_src/openssl/ct.py
---- src/_cffi_src/openssl/ct.py.orig
-+++ src/_cffi_src/openssl/ct.py
-@@ -4,7 +4,8 @@
-
-
- INCLUDES = """
--#if CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER && !defined(OPENSSL_NO_CT)
-+#if (CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER && !defined(OPENSSL_NO_CT)) || \
-+ defined(LIBRESSL_VERSION_NUMBER)
- #include <openssl/ct.h>
-
- typedef STACK_OF(SCT) Cryptography_STACK_OF_SCT;
-@@ -65,7 +66,8 @@ int SCT_set_log_entry_type(SCT *, ct_log_entry_type_t)
- """
-
- CUSTOMIZATIONS = """
--#if CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER && !defined(OPENSSL_NO_CT)
-+#if CRYPTOGRAPHY_OPENSSL_110F_OR_GREATER && !defined(OPENSSL_NO_CT) || \
-+ defined(LIBRESSL_VERSION_NUMBER)
- static const long Cryptography_HAS_SCT = 1;
- #else
- static const long Cryptography_HAS_SCT = 0;
Index: py-cryptography/patches/patch-src__cffi_src_openssl_dh_py
===================================================================
RCS file: /cvs/ports/security/py-cryptography/patches/patch-src__cffi_src_openssl_dh_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src__cffi_src_openssl_dh_py
--- py-cryptography/patches/patch-src__cffi_src_openssl_dh_py 14 Jan 2022 10:59:10 -0000 1.1
+++ py-cryptography/patches/patch-src__cffi_src_openssl_dh_py 8 Feb 2022 21:54:13 -0000
@@ -5,7 +5,7 @@ LibreSSL 3.5 provides this define.
Index: src/_cffi_src/openssl/dh.py
--- src/_cffi_src/openssl/dh.py.orig
+++ src/_cffi_src/openssl/dh.py
-@@ -37,7 +37,7 @@ int Cryptography_i2d_DHxparams_bio(BIO *bp, DH *x);
+@@ -36,7 +36,7 @@ int Cryptography_i2d_DHxparams_bio(BIO *, DH *);
"""
CUSTOMIZATIONS = """
Index: py-cryptography/patches/patch-src__cffi_src_openssl_evp_py
===================================================================
RCS file: py-cryptography/patches/patch-src__cffi_src_openssl_evp_py
diff -N py-cryptography/patches/patch-src__cffi_src_openssl_evp_py
--- py-cryptography/patches/patch-src__cffi_src_openssl_evp_py 10 May 2021 17:27:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src__cffi_src_openssl_evp_py,v 1.1 2021/05/10 17:27:45 tb Exp $
-
-Index: src/_cffi_src/openssl/evp.py
---- src/_cffi_src/openssl/evp.py.orig
-+++ src/_cffi_src/openssl/evp.py
-@@ -204,14 +204,10 @@ int (*EVP_PKEY_set1_tls_encodedpoint)(EVP_PKEY *, cons
-
No comments:
Post a Comment