[PR PATCH] python3-openssl: update to 22.0.0.

[PR PATCH] python3-openssl: update to 22.0.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1688 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages python3-openssl
https://github.com/void-linux/void-packages/pull/35795

python3-openssl: update to 22.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (tested with synapse)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
I had to do the same thing I did for Twisted--drop the python3 subpackage from python-openssl since versions >21.0.0 don't support python2 anymore.

Dependents to test:
- [ ] gajim
- [ ] impacket
- [x] python3-Twisted
- [x] python3-TxSNI
- [ ] python3-acme
- [ ] python3-josepy
- [ ] python3-nbxmpp
- [ ] python3-ndg_httpsclient
- [x] python3-saml2
- [ ] ripe-atlas-tools
- [x] synapse
- [ ] yubikey-manager

A patch file from https://github.com/void-linux/void-packages/pull/35795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-openssl-35795.patch --]
[-- Type: text/x-diff, Size: 3538 bytes --]

From 6c8f0cb58338a5559fe63af56a9bc196d64b5747 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:02:40 -0500
Subject: [PATCH 1/2] python-openssl: remove python3 subpackage

---
 srcpkgs/python-openssl/template | 22 ++++------------------
 srcpkgs/python3-openssl         |  1 -
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-openssl

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index 60f32336e39d..32f63643facb 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -1,29 +1,15 @@
 # Template file for 'python-openssl'
 pkgname=python-openssl
 version=20.0.1
-revision=2
+revision=3
 wrksrc="pyOpenSSL-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-cryptography python-six"
-checkdepends="python3-cryptography python3-six
- python3-pytest python3-flaky python3-pretend"
 short_desc="Python2 interface to the OpenSSL library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
 checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
-
-do_check() {
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
-python3-openssl_package() {
-	depends="python3-cryptography python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-openssl b/srcpkgs/python3-openssl
deleted file mode 120000
index e9a49d32e012..000000000000
--- a/srcpkgs/python3-openssl
+++ /dev/null
@@ -1 +0,0 @@
-python-openssl
\ No newline at end of file

From 57384c9d4dd7dfb8eb574fc761dbbe92cad96c81 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:03:17 -0500
Subject: [PATCH 2/2] python3-openssl: update to 22.0.0.

---
 srcpkgs/python3-openssl/template | 17 +++++++++++++++++
 srcpkgs/python3-openssl/update   |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-openssl/template
 create mode 100644 srcpkgs/python3-openssl/update

diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template
new file mode 100644
index 000000000000..3119740d3163
--- /dev/null
+++ b/srcpkgs/python3-openssl/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-openssl'
+pkgname=python3-openssl
+version=22.0.0
+revision=1
+wrksrc="pyOpenSSL-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-cryptography python3-six"
+checkdepends="python3-cryptography python3-six python3-pytest python3-flaky
+python3-pretend"
+short_desc="Python3 interface to the OpenSSL library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://pyopenssl.org/"
+changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
+checksum=660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf
diff --git a/srcpkgs/python3-openssl/update b/srcpkgs/python3-openssl/update
new file mode 100644
index 000000000000..9946902a8048
--- /dev/null
+++ b/srcpkgs/python3-openssl/update
@@ -0,0 +1 @@
+pkgname=pyOpenSSL

Re: [PR PATCH] [Updated] python3-openssl: update to 22.0.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages python3-openssl
https://github.com/void-linux/void-packages/pull/35795

python3-openssl: update to 22.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (tested with synapse)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
I had to do the same thing I did for Twisted--drop the python3 subpackage from python-openssl since versions >21.0.0 don't support python2 anymore.

Dependents to test:
- [ ] gajim
- [ ] impacket
- [x] python3-Twisted
- [x] python3-TxSNI
- [ ] python3-acme
- [ ] python3-josepy
- [ ] python3-nbxmpp
- [ ] python3-ndg_httpsclient
- [x] python3-saml2
- [ ] ripe-atlas-tools
- [x] synapse
- [ ] yubikey-manager

A patch file from https://github.com/void-linux/void-packages/pull/35795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-openssl-35795.patch --]
[-- Type: text/x-diff, Size: 3691 bytes --]

From 6c8f0cb58338a5559fe63af56a9bc196d64b5747 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:02:40 -0500
Subject: [PATCH 1/2] python-openssl: remove python3 subpackage

---
 srcpkgs/python-openssl/template | 22 ++++------------------
 srcpkgs/python3-openssl         |  1 -
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-openssl

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index 60f32336e39d..32f63643facb 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -1,29 +1,15 @@
 # Template file for 'python-openssl'
 pkgname=python-openssl
 version=20.0.1
-revision=2
+revision=3
 wrksrc="pyOpenSSL-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-cryptography python-six"
-checkdepends="python3-cryptography python3-six
- python3-pytest python3-flaky python3-pretend"
 short_desc="Python2 interface to the OpenSSL library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
 checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
-
-do_check() {
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
-python3-openssl_package() {
-	depends="python3-cryptography python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-openssl b/srcpkgs/python3-openssl
deleted file mode 120000
index e9a49d32e012..000000000000
--- a/srcpkgs/python3-openssl
+++ /dev/null
@@ -1 +0,0 @@
-python-openssl
\ No newline at end of file

From acb1611a7d7afc7dea18a9e330975d8ea64ebaff Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:03:17 -0500
Subject: [PATCH 2/2] python3-openssl: update to 22.0.0.

---
 srcpkgs/python3-openssl/template | 22 ++++++++++++++++++++++
 srcpkgs/python3-openssl/update   |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-openssl/template
 create mode 100644 srcpkgs/python3-openssl/update

diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template
new file mode 100644
index 000000000000..74bc75842ea3
--- /dev/null
+++ b/srcpkgs/python3-openssl/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-openssl'
+pkgname=python3-openssl
+version=22.0.0
+revision=1
+wrksrc="pyOpenSSL-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-cryptography python3-six"
+checkdepends="python3-cryptography python3-six python3-pytest python3-flaky
+python3-pretend"
+short_desc="Python3 interface to the OpenSSL library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://pyopenssl.org/"
+changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
+checksum=660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf
+
+case "$XBPS_TARGET_MACHINE" in
+	# https://github.com/pyca/pyopenssl/issues/974
+	i686*) make_check_args="-k not(test_verify_with_time)";;
+esac
diff --git a/srcpkgs/python3-openssl/update b/srcpkgs/python3-openssl/update
new file mode 100644
index 000000000000..9946902a8048
--- /dev/null
+++ b/srcpkgs/python3-openssl/update
@@ -0,0 +1 @@
+pkgname=pyOpenSSL

Re: python3-openssl: update to 22.0.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35795#issuecomment-1054672990

Comment:
Everything looking good here, should be ready for merge.

Re: [PR REVIEW] python3-openssl: update to 22.0.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35795#discussion_r816318303

Comment:
If I understand the issue, this test should be disabled on all 32bit archs:
```suggestion
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
	make_check_args="-k not(test_verify_with_time)"
fi
```

Re: [PR REVIEW] python3-openssl: update to 22.0.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35795#discussion_r816315111

Comment:
```suggestion
depends="python3-cryptography"
```

Re: [PR REVIEW] python3-openssl: update to 22.0.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35795#discussion_r816315492

Comment:
```suggestion
checkdepends="python3-pytest $depends python3-flaky python3-pretend"
```

Re: [PR PATCH] [Updated] python3-openssl: update to 22.0.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages python3-openssl
https://github.com/void-linux/void-packages/pull/35795

python3-openssl: update to 22.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (tested with synapse)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
I had to do the same thing I did for Twisted--drop the python3 subpackage from python-openssl since versions >21.0.0 don't support python2 anymore.

Dependents to test:
- [x] gajim
- [x] impacket
- [x] python3-Twisted
- [x] python3-TxSNI
- [x] python3-acme
- [x] python3-josepy
- [x] python3-nbxmpp
- [x] python3-ndg_httpsclient
- [x] python3-saml2
- [x] ripe-atlas-tools
- [x] synapse
- [x] yubikey-manager

A patch file from https://github.com/void-linux/void-packages/pull/35795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-openssl-35795.patch --]
[-- Type: text/x-diff, Size: 3657 bytes --]

From eac7b1ae42f975896bc25f3ac120db4476bc32dd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:02:40 -0500
Subject: [PATCH 1/2] python-openssl: remove python3 subpackage

---
 srcpkgs/python-openssl/template | 22 ++++------------------
 srcpkgs/python3-openssl         |  1 -
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-openssl

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index 60f32336e39d..32f63643facb 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -1,29 +1,15 @@
 # Template file for 'python-openssl'
 pkgname=python-openssl
 version=20.0.1
-revision=2
+revision=3
 wrksrc="pyOpenSSL-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-cryptography python-six"
-checkdepends="python3-cryptography python3-six
- python3-pytest python3-flaky python3-pretend"
 short_desc="Python2 interface to the OpenSSL library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
 checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
-
-do_check() {
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
-python3-openssl_package() {
-	depends="python3-cryptography python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-openssl b/srcpkgs/python3-openssl
deleted file mode 120000
index e9a49d32e012..000000000000
--- a/srcpkgs/python3-openssl
+++ /dev/null
@@ -1 +0,0 @@
-python-openssl
\ No newline at end of file

From 10c90f98c94ba9faf00c2d2c4bbf2df557b4f4fd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:03:17 -0500
Subject: [PATCH 2/2] python3-openssl: update to 22.0.0.

---
 srcpkgs/python3-openssl/template | 21 +++++++++++++++++++++
 srcpkgs/python3-openssl/update   |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-openssl/template
 create mode 100644 srcpkgs/python3-openssl/update

diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template
new file mode 100644
index 000000000000..f9960d669e8f
--- /dev/null
+++ b/srcpkgs/python3-openssl/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-openssl'
+pkgname=python3-openssl
+version=22.0.0
+revision=1
+wrksrc="pyOpenSSL-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-cryptography"
+checkdepends="python3-pytest $depends python3-flaky python3-pretend"
+short_desc="Python3 interface to the OpenSSL library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://pyopenssl.org/"
+changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
+checksum=660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf
+
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	# https://github.com/pyca/pyopenssl/issues/974
+	make_check_args="-k not(test_verify_with_time)";;
+fi
diff --git a/srcpkgs/python3-openssl/update b/srcpkgs/python3-openssl/update
new file mode 100644
index 000000000000..9946902a8048
--- /dev/null
+++ b/srcpkgs/python3-openssl/update
@@ -0,0 +1 @@
+pkgname=pyOpenSSL

Re: [PR PATCH] [Updated] python3-openssl: update to 22.0.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages python3-openssl
https://github.com/void-linux/void-packages/pull/35795

python3-openssl: update to 22.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (tested with synapse)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
I had to do the same thing I did for Twisted--drop the python3 subpackage from python-openssl since versions >21.0.0 don't support python2 anymore.

Dependents to test:
- [x] gajim
- [x] impacket
- [x] python3-Twisted
- [x] python3-TxSNI
- [x] python3-acme
- [x] python3-josepy
- [x] python3-nbxmpp
- [x] python3-ndg_httpsclient
- [x] python3-saml2
- [x] ripe-atlas-tools
- [x] synapse
- [x] yubikey-manager

A patch file from https://github.com/void-linux/void-packages/pull/35795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-openssl-35795.patch --]
[-- Type: text/x-diff, Size: 3655 bytes --]

From eac7b1ae42f975896bc25f3ac120db4476bc32dd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:02:40 -0500
Subject: [PATCH 1/2] python-openssl: remove python3 subpackage

---
 srcpkgs/python-openssl/template | 22 ++++------------------
 srcpkgs/python3-openssl         |  1 -
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-openssl

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index 60f32336e39d..32f63643facb 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -1,29 +1,15 @@
 # Template file for 'python-openssl'
 pkgname=python-openssl
 version=20.0.1
-revision=2
+revision=3
 wrksrc="pyOpenSSL-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-cryptography python-six"
-checkdepends="python3-cryptography python3-six
- python3-pytest python3-flaky python3-pretend"
 short_desc="Python2 interface to the OpenSSL library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
 checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
-
-do_check() {
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
-python3-openssl_package() {
-	depends="python3-cryptography python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-openssl b/srcpkgs/python3-openssl
deleted file mode 120000
index e9a49d32e012..000000000000
--- a/srcpkgs/python3-openssl
+++ /dev/null
@@ -1 +0,0 @@
-python-openssl
\ No newline at end of file

From d68ed2c1eea1d10d2a67d6f05272f10fe8a4ca58 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Feb 2022 16:03:17 -0500
Subject: [PATCH 2/2] python3-openssl: update to 22.0.0.

---
 srcpkgs/python3-openssl/template | 21 +++++++++++++++++++++
 srcpkgs/python3-openssl/update   |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-openssl/template
 create mode 100644 srcpkgs/python3-openssl/update

diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template
new file mode 100644
index 000000000000..03ec72bfcc17
--- /dev/null
+++ b/srcpkgs/python3-openssl/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-openssl'
+pkgname=python3-openssl
+version=22.0.0
+revision=1
+wrksrc="pyOpenSSL-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-cryptography"
+checkdepends="python3-pytest $depends python3-flaky python3-pretend"
+short_desc="Python3 interface to the OpenSSL library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://pyopenssl.org/"
+changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
+checksum=660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf
+
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	# https://github.com/pyca/pyopenssl/issues/974
+	make_check_args="-k not(test_verify_with_time)"
+fi
diff --git a/srcpkgs/python3-openssl/update b/srcpkgs/python3-openssl/update
new file mode 100644
index 000000000000..9946902a8048
--- /dev/null
+++ b/srcpkgs/python3-openssl/update
@@ -0,0 +1 @@
+pkgname=pyOpenSSL

Re: [PR REVIEW] python3-openssl: update to 22.0.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35795#discussion_r816552524

Comment:
We shouldn't need this revision bump, the new version should have exactly the same content as the old one.

Re: [PR PATCH] [Updated] python3-openssl: update to 22.0.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1693 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages python3-openssl
https://github.com/void-linux/void-packages/pull/35795

python3-openssl: update to 22.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (tested with synapse)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
I had to do the same thing I did for Twisted--drop the python3 subpackage from python-openssl since versions >21.0.0 don't support python2 anymore.

Dependents to test:
- [x] gajim
- [x] impacket
- [x] python3-Twisted
- [x] python3-TxSNI
- [x] python3-acme
- [x] python3-josepy
- [x] python3-nbxmpp
- [x] python3-ndg_httpsclient
- [x] python3-saml2
- [x] ripe-atlas-tools
- [x] synapse
- [x] yubikey-manager

A patch file from https://github.com/void-linux/void-packages/pull/35795.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-openssl-35795.patch --]
[-- Type: text/x-diff, Size: 3438 bytes --]

From 7e5ccea3cfcdae6b2e22b3c84b2b54a855a88488 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 1 Mar 2022 07:52:01 -0500
Subject: [PATCH] python3-openssl: update to 22.0.0.

Split python3-openssl into own package since versions >21.0.0 don't
support python2 anymore.
---
 srcpkgs/python-openssl/template  | 20 +++-----------------
 srcpkgs/python3-openssl          |  1 -
 srcpkgs/python3-openssl/template | 21 +++++++++++++++++++++
 srcpkgs/python3-openssl/update   |  1 +
 4 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 120000 srcpkgs/python3-openssl
 create mode 100644 srcpkgs/python3-openssl/template
 create mode 100644 srcpkgs/python3-openssl/update

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index 60f32336e39d..b26391d9fca1 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -3,27 +3,13 @@ pkgname=python-openssl
 version=20.0.1
 revision=2
 wrksrc="pyOpenSSL-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-cryptography python-six"
-checkdepends="python3-cryptography python3-six
- python3-pytest python3-flaky python3-pretend"
 short_desc="Python2 interface to the OpenSSL library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
 checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
-
-do_check() {
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
-python3-openssl_package() {
-	depends="python3-cryptography python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-openssl b/srcpkgs/python3-openssl
deleted file mode 120000
index e9a49d32e012..000000000000
--- a/srcpkgs/python3-openssl
+++ /dev/null
@@ -1 +0,0 @@
-python-openssl
\ No newline at end of file
diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template
new file mode 100644
index 000000000000..03ec72bfcc17
--- /dev/null
+++ b/srcpkgs/python3-openssl/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-openssl'
+pkgname=python3-openssl
+version=22.0.0
+revision=1
+wrksrc="pyOpenSSL-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-cryptography"
+checkdepends="python3-pytest $depends python3-flaky python3-pretend"
+short_desc="Python3 interface to the OpenSSL library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://pyopenssl.org/"
+changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
+checksum=660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf
+
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	# https://github.com/pyca/pyopenssl/issues/974
+	make_check_args="-k not(test_verify_with_time)"
+fi
diff --git a/srcpkgs/python3-openssl/update b/srcpkgs/python3-openssl/update
new file mode 100644
index 000000000000..9946902a8048
--- /dev/null
+++ b/srcpkgs/python3-openssl/update
@@ -0,0 +1 @@
+pkgname=pyOpenSSL

Re: [PR PATCH] [Merged]: python3-openssl: update to 22.0.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]

There's a merged pull request on the void-packages repository

python3-openssl: update to 22.0.0.
https://github.com/void-linux/void-packages/pull/35795

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (tested with synapse)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->
I had to do the same thing I did for Twisted--drop the python3 subpackage from python-openssl since versions >21.0.0 don't support python2 anymore.

Dependents to test:
- [x] gajim
- [x] impacket
- [x] python3-Twisted
- [x] python3-TxSNI
- [x] python3-acme
- [x] python3-josepy
- [x] python3-nbxmpp
- [x] python3-ndg_httpsclient
- [x] python3-saml2
- [x] ripe-atlas-tools
- [x] synapse
- [x] yubikey-manager