Added fix for OpenSSL 1.1.0

c4dae8ed · José Mª. Fernández · 5893d81b · c4dae8ed · c4dae8ed · c4dae8ed
Commit c4dae8ed authored Jan 19, 2019 by José Mª. Fernández
3 changed files
--- a/app-backup/attic/Manifest
+++ b/app-backup/attic/Manifest
-DIST attic-0.16.tar.gz 87985 SHA256 ce44800b08540cbe334f0a4f5da49585850c1eea1bf621c2766bbdcc98a13e09 SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c WHIRLPOOL e3f0963cca0ede9d5400393cb5aabf66433c87bbc0dd997e2d63991e69d380113c6a25075ecac0ab61e5807676bf2aa87e72257133df0f2ee879ccaef586e5a3
-EBUILD attic-0.16.ebuild 753 SHA256 885fe1a83ff251a2cd395d6d7b4383adf0c45a59850549de696ef947a279e00e SHA512 1991deb36bd11f08d16f1c386379cb94eeeca737289ebb015258c06473f364882125389fb6f914eca7f80ca82aefc758d61518bcdbcfd94764a68f3a77bc7278 WHIRLPOOL f070d3113e002ed1923bc0ea09cc6db7c114abce0e519f7092f5a3c11340e2005fa6d7290cc3a5ad92891b35639b21069faaeeafdbe31040942941418e137ba8
-MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
+AUX attic-0.16-openssl-1.1-fix.patch 2307 BLAKE2B 7912e884d3d0ea75d544972b76bf67331e7320d14bb5df2a78ba3e35c8cca25d61b5d42221cb867f6e5c40a9d9f194f0dfa203aa27acf4dde0dcec625afd9218 SHA512 33be569a55597eb4bf0e7373fcc55297a3ac8de93e6d992f639a0cffb357d3b34e675cd3090c9c4c9b9c6d55d25023936c3f772d38f47ccc1489aea9431deb1b
+DIST attic-0.16.tar.gz 87985 BLAKE2B cc801d8e3b28f6041c053f368c1d5ab00b1b419928d6a84647da7dccb7fb46b477898249873e90ba15c721468c09ae243d450fc978fe8cc3947b2c2e035f2aae SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c
+EBUILD attic-0.16-r2.ebuild 992 BLAKE2B ddac09004255badf7e4ef734e2655b22a633c746d86a960904c7612f353b95f27cd5f6ea8e10e26658d68366fe6e83ccaa6382c2a65fcb4992fe71a75b6025ab SHA512 167e281630a36e844041100be41cd70c1906a80d16b15b7b9ffca850f17842b67b32a38257d11735b72447c8afc3ed4c96fd5a7d1d80543755aed60f0fd8374e
+EBUILD attic-0.16.ebuild 753 BLAKE2B 904067158e6ccf4356891e8a233384cc0be6f3e9da1fd000b69c5f0fa67ce1e423664f008b90d1561b98f78d01d5481e0a6389887af6b5fc9a5125d2bfa21a54 SHA512 1991deb36bd11f08d16f1c386379cb94eeeca737289ebb015258c06473f364882125389fb6f914eca7f80ca82aefc758d61518bcdbcfd94764a68f3a77bc7278
+MISC metadata.xml 231 BLAKE2B bb1a594a42a4896599e92bcfcc8045bce1ab665c76e5c31b5d991db8d64c6181652247b4ae429bf25c199fd7fa6672f50320ec944d00dbd9b7cf012cf5669f32 SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83
--- a/app-backup/attic/attic-0.16-r2.ebuild
+++ b/app-backup/attic/attic-0.16-r2.ebuild
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jborg/attic.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Attic is a deduplicating backup program written in Python."
+HOMEPAGE="https://attic-backup.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+PATCHES=(
+"${FILESDIR}"/${P}-openssl-1.1-fix.patch
+)
+
+RDEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	!libressl? (
+		>=dev-libs/openssl-1.1.0
+	)
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/llfuse[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
--- a/app-backup/attic/files/attic-0.16-openssl-1.1-fix.patch
+++ b/app-backup/attic/files/attic-0.16-openssl-1.1-fix.patch
+diff -Nru attic-0.16/attic/crypto.pyx attic-0.16-fixed-base/attic/crypto.pyx
+--- attic-0.16/attic/crypto.pyx	2015-05-16 21:35:31.000000000 +0200
+++ attic-0.16-fixed-base/attic/crypto.pyx	2019-01-18 23:59:39.172993670 +0100
+@@ -23,8 +23,9 @@
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
+    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
+    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
+    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
+    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+        self.ctx = EVP_CIPHER_CTX_new();
+        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
+        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
+        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
+        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
+            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally: