From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- dev-python/pycryptopp/Manifest | 3 +- .../files/pycryptopp-0.7.1-abi-change.patch | 55 ++++++++++++++++++++++ dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild | 46 ++++++++++++++++++ dev-python/pycryptopp/pycryptopp-0.7.1.ebuild | 44 ----------------- 4 files changed, 103 insertions(+), 45 deletions(-) create mode 100644 dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch create mode 100644 dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild delete mode 100644 dev-python/pycryptopp/pycryptopp-0.7.1.ebuild (limited to 'dev-python/pycryptopp') diff --git a/dev-python/pycryptopp/Manifest b/dev-python/pycryptopp/Manifest index 0cc4a9078c21..e6d9d75d6c79 100644 --- a/dev-python/pycryptopp/Manifest +++ b/dev-python/pycryptopp/Manifest @@ -1,5 +1,6 @@ +AUX pycryptopp-0.7.1-abi-change.patch 1777 BLAKE2B c37989ae1e9d2000208bf7d74a9a06953d2273db1ecd976d0726513fe0f74fa5c2fae858e56163929d15fbde7464c8320ce2a9a8d040a39050a7d72ba74efdfd SHA512 cc0730806c637d105c35beaa19c546c31a92126481eba087ae7e055ab794ab8bb3a926f862ae7fc75e9b505c8a2612db3e26dd104046c2503889e1aa9b6614e0 DIST pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz 2009822 BLAKE2B bf25b9049d131b197352138624cc8d393e8b3b33f76e53b1087ded5cdbb365286d0db692a03eaf8c117981e95d1e2074dbbe49daeeba098c3f4a42e9625365e2 SHA512 bdd7d983bc0f8ef50c140a8da0c532883f0f1461d4a91d2761c872403133e9474d4fdbd78e275adbaacd2066cab4121034002a4730258162a618b3af913fdf7a DIST pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz 1992756 BLAKE2B 7b458d3143ad4b4d2a3f6dc385241f6ea224429c1b7e56d431dc11134ed12a8bf0c5420e079ab8f62db6fb405e10fb0edcd7bf3d18200445f258834970ac44dd SHA512 8b5996badedcd32345818f95e26487ac938c10e1790495515c74816075261a4fcedd2f80c55beddbdea54ed8899bc7c7b1a192468cb3cf434c50f9a68b65cc25 EBUILD pycryptopp-0.6.0.ebuild 954 BLAKE2B 6a62771d8707a9cdbc9293cd548406a402f6dc3a462c14cb75bf74e143b20c1202f4f3ecab1f7ca3e95e5e782a5fc03f60a484450cc57976f9290414414c3f77 SHA512 05eb4ddcebc65fb36067867c0cca0c3be573acb5ca3e4829929539a704036058aac20ae94470a9dd3a256f2c64bd7e87352d80e13322b492f4c9db0ab8b32e5f -EBUILD pycryptopp-0.7.1.ebuild 955 BLAKE2B aaa6f1b64fe35c69158d2eeb5f0c82ea1490a4fcb76095e3b79d7e0a3fcd757109d57839117945b6eb9579653877b86e3cc891cb86379d11df4dde5338bd4b75 SHA512 5d6208832b0c0f10c19fbf05156783ca4a3e748d41d9654e68fc2ad628fe3166612d2aa862c1a9d883b7540c0a486688d413c083aab670d9d2b2247937a69c41 +EBUILD pycryptopp-0.7.1-r1.ebuild 1008 BLAKE2B 620941a0714191bce4d62ee91b852db53ee67ca6f49e064c6b488fc1f2fd73996c52d8a723a24672fb735e7a3a88ada4a9ac3363941521effd3d667dca6f0d31 SHA512 0413078388c6530cc506a477a8fd108ec8b477e8984dae72c3f93da8082a1e4c5a4edb58e0331f2ea9eee6fa5f572a81905d7701f0e43b52a4a35659e04d8cd6 MISC metadata.xml 313 BLAKE2B 436153bae6b5708f1ec47d315a12328ea8ca013e983787fd41cf319ad4d92a934fef3492d13cd79caa44e6f5dc415eed4f06bcf6590e694bdb3e04eba7e41d2d SHA512 43f568076f481a7172565b251b4e5cd08567a2a0ec204713f9f1d892331d70be656694df66f47961289a99f0aac72733e75d3689054dd88dd52a6d055e19c0dc diff --git a/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch new file mode 100644 index 000000000000..d6edd2ecc630 --- /dev/null +++ b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch @@ -0,0 +1,55 @@ +https://github.com/tahoe-lafs/pycryptopp/issues/42 + +--- old/src/pycryptopp/cipher/aesmodule.cpp ++++ old/src/pycryptopp/cipher/aesmodule.cpp +@@ -20,6 +20,8 @@ + #include + #endif + ++typedef unsigned char byte; ++ + static const char*const aes___doc__ = "_aes counter mode cipher\n\ + You are advised to run aes.start_up_self_test() after importing this module."; + +--- old/src/pycryptopp/cipher/xsalsa20module.cpp ++++ old/src/pycryptopp/cipher/xsalsa20module.cpp +@@ -16,6 +16,8 @@ + #include + #endif + ++typedef unsigned char byte; ++ + static const char* const xsalsa20__doc__ = "_xsalsa20 cipher"; + + static PyObject *xsalsa20_error; +--- old/src/pycryptopp/hash/sha256module.cpp ++++ old/src/pycryptopp/hash/sha256module.cpp +@@ -21,6 +21,8 @@ + #include + #endif + ++typedef unsigned char byte; ++ + static const char*const sha256___doc__ = "_sha256 hash function"; + + static PyObject *sha256_error; +--- old/src/pycryptopp/publickey/rsamodule.cpp ++++ old/src/pycryptopp/publickey/rsamodule.cpp +@@ -87,7 +87,7 @@ + VerifyingKey_serialize(VerifyingKey *self, PyObject *dummy) { + std::string outstr; + StringSink ss(outstr); +- self->k->DEREncode(ss); ++ self->k->GetMaterial().Save(ss); + PyStringObject* result = reinterpret_cast(PyString_FromStringAndSize(outstr.c_str(), outstr.size())); + if (!result) + return NULL; +@@ -216,7 +216,7 @@ + SigningKey_serialize(SigningKey *self, PyObject *dummy) { + std::string outstr; + StringSink ss(outstr); +- self->k->DEREncode(ss); ++ self->k->GetMaterial().Save(ss); + PyStringObject* result = reinterpret_cast(PyString_FromStringAndSize(outstr.c_str(), outstr.size())); + if (!result) + return NULL; diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild new file mode 100644 index 000000000000..400c5ec5bc83 --- /dev/null +++ b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 vcs-snapshot + +NUM="869544967005693312591928092448767568728501330214" +MY_P="${P}.${NUM}" + +DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library" +HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp + https://pypi.org/project/pycryptopp/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-libs/crypto++" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +DOCS="NEWS.rst" + +PATCHES=( "${FILESDIR}"/${PN}-0.7.1-abi-change.patch ) + +S="${WORKDIR}/${MY_P}" + +python_prepare_all() { + # Don't install license files + sed -i -e "/data_files=data_files,/d" setup.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + # use system crypto++ library + distutils-r1_python_compile --disable-embedded-cryptopp +} + +python_test() { + esetup.py test +} diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild deleted file mode 100644 index 3a4257ebfa77..000000000000 --- a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 vcs-snapshot - -NUM="869544967005693312591928092448767568728501330214" -MY_P="${P}.${NUM}" - -DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library" -HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp - https://pypi.org/project/pycryptopp/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/crypto++" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -DOCS="NEWS.rst" - -S="${WORKDIR}/${MY_P}" - -python_prepare_all() { - # Don't install license files - sed -i -e "/data_files=data_files,/d" setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - # use system crypto++ library - distutils-r1_python_compile --disable-embedded-cryptopp -} - -python_test() { - esetup.py test -} -- cgit v1.2.3