From eac7b1ae42f975896bc25f3ac120db4476bc32dd Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer 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 " +maintainer="Orphaned " 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 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 " +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