pycryptodome/pycryptodomex: update to 3.17 (#7961)

- Dropped patchset, fix was made upstream.
- Also build for Python 3.10.
- Mention package differences in their descriptions.
This commit is contained in:
OscarL
2023-03-14 14:09:09 -03:00
committed by GitHub
parent a5ec9cdbd5
commit da6f123984
3 changed files with 32 additions and 41 deletions

View File

@@ -1,22 +0,0 @@
From 4fde02e923cc6f62a000caa66c12705ae5d2c6d3 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 1 Jan 2023 07:35:12 -0300
Subject: Change header guard to not clash with the one from Haiku's Errors.h
It was causing some compilation errors that were a bit puzzling.
diff --git a/src/errors.h b/src/errors.h
index 831980d..89834ce 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -1,5 +1,5 @@
-#ifndef _ERRORS_H
-#define _ERRORS_H
+#ifndef _ERRORS_CRYPTODOME_H
+#define _ERRORS_CRYPTODOME_H
/** Standard errors common to all ciphers **/
#define ERR_NULL 1
--
2.37.3

View File

@@ -4,19 +4,21 @@ primitives.
PyCryptodome is a fork of PyCrypto. It brings several enhancements with respect \
to the last official version of PyCrypto (2.6.1).
"
This package provides an almost drop-in replacement for PyCrypto (and thus \
conflicts with the 'pycrypto' packages, as it installs as a Python module with \
the name 'Crypto')."
HOMEPAGE="https://www.pycryptodome.org/"
COPYRIGHT="2014-2022 Legrandin"
COPYRIGHT="2014-2023 Legrandin"
LICENSE="BSD (2-clause)
Public Domain
Unlicense
"
REVISION="1"
SOURCE_URI="https://pypi.python.org/packages/source/p/pycryptodome/pycryptodome-$portVersion.tar.gz"
CHECKSUM_SHA256="0e45d2d852a66ecfb904f090c3f87dc0dfb89a499570abad8590f10d9cffb350"
CHECKSUM_SHA256="bce2e2d8e82fcf972005652371a3e8731956a0c1fbb719cc897943b3695ad91b"
SOURCE_FILENAME="pycryptodome-$portVersion.tar.gz"
SOURCE_DIR="pycryptodome-$portVersion"
PATCHES="pycryptodome-$portVersion.patchset"
ARCHITECTURES="x86_64 !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -28,8 +30,13 @@ REQUIRES="
haiku$secondaryArchSuffix
"
PYTHON_PACKAGES=(python39)
PYTHON_VERSIONS=(3.9)
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgmp$secondaryArchSuffix
"
PYTHON_PACKAGES=(python39 python310)
PYTHON_VERSIONS=(3.9 3.10)
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]}
pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -44,9 +51,7 @@ REQUIRES_$pythonPackage=\"\
eval "CONFLICTS_$pythonPackage='
pycrypto_$pythonPackage
'"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgmp$secondaryArchSuffix
BUILD_REQUIRES="$BUILD_REQUIRES
setuptools_$pythonPackage"
BUILD_PREREQUIRES="
cmd:cc$secondaryArchSuffix
@@ -69,6 +74,10 @@ INSTALL()
mkdir -p $installLocation
rm -rf build
# Just in case... to avoid building as pycryptodomex (Cryptodome)
# when building locally (maybe after running "hp pycryptodomex").
rm -f ".separate_namespace"
$python setup.py build install \
--root=/ --prefix=$prefix

View File

@@ -4,19 +4,20 @@ primitives.
PyCryptodome is a fork of PyCrypto. It brings several enhancements with respect \
to the last official version of PyCrypto (2.6.1).
"
This package ('pycryptodomex', mind the final "x") can co-exist with the 'pycrypto' \
packages, as it installs as a Python module under the name 'Cryptodome'."
HOMEPAGE="https://www.pycryptodome.org/"
COPYRIGHT="2014-2022 Legrandin"
COPYRIGHT="2014-2023 Legrandin"
LICENSE="BSD (2-clause)
Public Domain
Unlicense
"
REVISION="1"
SOURCE_URI="https://pypi.python.org/packages/source/p/pycryptodome/pycryptodome-$portVersion.tar.gz"
CHECKSUM_SHA256="0e45d2d852a66ecfb904f090c3f87dc0dfb89a499570abad8590f10d9cffb350"
CHECKSUM_SHA256="bce2e2d8e82fcf972005652371a3e8731956a0c1fbb719cc897943b3695ad91b"
SOURCE_FILENAME="pycryptodome-$portVersion.tar.gz"
SOURCE_DIR="pycryptodome-$portVersion"
PATCHES="pycryptodome-$portVersion.patchset"
ARCHITECTURES="x86_64 !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -28,8 +29,13 @@ REQUIRES="
haiku$secondaryArchSuffix
"
PYTHON_PACKAGES=(python39)
PYTHON_VERSIONS=(3.9)
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgmp$secondaryArchSuffix
"
PYTHON_PACKAGES=(python39 python310)
PYTHON_VERSIONS=(3.9 3.10)
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]}
pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -41,9 +47,7 @@ REQUIRES_$pythonPackage=\"\
lib:libgmp$secondaryArchSuffix\n\
cmd:python$pythonVersion\
\""
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgmp$secondaryArchSuffix
BUILD_REQUIRES="$BUILD_REQUIRES
setuptools_$pythonPackage"
BUILD_PREREQUIRES="
cmd:cc$secondaryArchSuffix
@@ -66,7 +70,7 @@ INSTALL()
mkdir -p $installLocation
rm -rf build
# to build as pycryptodomex (Cryptodome):
# This causes it to build as pycryptodomex (Cryptodome):
touch ".separate_namespace"
$python setup.py build install \