diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-misc/revelation | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'x11-misc/revelation')
-rw-r--r-- | x11-misc/revelation/Manifest | 6 | ||||
-rw-r--r-- | x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch | 28 | ||||
-rw-r--r-- | x11-misc/revelation/files/revelation-0.4.14-random.patch | 73 | ||||
-rw-r--r-- | x11-misc/revelation/files/revelation-0.4.14-xor.patch | 59 | ||||
-rw-r--r-- | x11-misc/revelation/metadata.xml | 5 | ||||
-rw-r--r-- | x11-misc/revelation/revelation-0.4.14-r4.ebuild | 52 |
6 files changed, 0 insertions, 223 deletions
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest deleted file mode 100644 index 12a4958f5df6..000000000000 --- a/x11-misc/revelation/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX revelation-0.4.14-gnome-python.patch 925 BLAKE2B 83bf8889d0de3a6d6077929ef76e9dc7ce96f750ae485ff064a6ae95b73d5b1853bb26e80cc9a24578b17436167c5498389f2a192f22a6544d15434ba6ecdca6 SHA512 679fd27df6b73d4a5003db791165bf02f7ded6d998e78a760412e5fc4b0ccf94b3d55cbb0be1a47c1e0bc0756f3f97cbdf738025a86cf2fe86ea452121a4fbb1 -AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f23104aed615a1e1087f7f6b63051027136435ef51e8ac794c78c7e554211a5f125a4641e9572c52a1279b8eaef3170738 SHA512 be5e805e58d04c0be29ad9c30a6aa867a869a4d0a8df31ce234fbe331d0191cc3bf7b82e11ec6a7c1c8306b68ddbc5ed29d9f5e8c9e3838b293896adb69c5d13 -AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc -DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145 -EBUILD revelation-0.4.14-r4.ebuild 1136 BLAKE2B 0fa578d41b7eaae6aab27e8d5784633d67b73442bac3d7e2e56a6991c541244fc8b7a452fd53a75811455c7b6c82acc98c7a4cbfd9ec38ea43419071376b3509 SHA512 14c7a4b4691ab3e7a4e9c6e5d8a29b11b4c518ad155f181477a0daa85b03f9ffc91b7ffe61bfbb845d2fb1790fc14b7e6f836784f8093761ce2405cedf3c8a69 -MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch b/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch deleted file mode 100644 index 82a02fb259bd..000000000000 --- a/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dffb8b7722865a82c3a5d7ce9615b6da2313d583 Mon Sep 17 00:00:00 2001 -Message-Id: <dffb8b7722865a82c3a5d7ce9615b6da2313d583.1486417682.git.tommyhebb@gmail.com> -From: Thomas Hebb <tommyhebb@gmail.com> -Date: Mon, 6 Feb 2017 21:44:06 +0000 -Subject: [PATCH] Remove deprecated gnome-python dependency from configure.ac - -The code has not depended on the module for many years (the module was -removed in 125cf9dc28f95617fc3b37bc29a714f708b7d2ef); however, the -configure script was never updated to match. ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bdfae2a..5b6ad72 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,6 @@ RVL_FDO_MIME() - RVL_PYTHON_MODULE(Crypto, yes) - RVL_PYTHON_MODULE(gconf, yes) - RVL_PYTHON_MODULE(gtk, yes) --RVL_PYTHON_MODULE(gnome, yes) - RVL_PYTHON_MODULE(gio, yes) - RVL_PYTHON_MODULE(gobject, yes) - RVL_PYTHON_MODULE(pango, yes) --- -2.11.1 - diff --git a/x11-misc/revelation/files/revelation-0.4.14-random.patch b/x11-misc/revelation/files/revelation-0.4.14-random.patch deleted file mode 100644 index e54ac2bf0661..000000000000 --- a/x11-misc/revelation/files/revelation-0.4.14-random.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- src/bundle/AfSplitter.py.~1~ 2012-05-26 14:19:34.000000000 +0200 -+++ src/bundle/AfSplitter.py 2017-07-15 10:10:57.817775246 +0200 -@@ -42,7 +42,7 @@ - - # will need changed to use Crypto.Random (now in python-crypt git) - # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html --from Crypto.Util.randpool import RandomPool -+from Crypto import Random - from Crypto.Cipher import XOR - - def _xor(a, b): -@@ -81,7 +81,7 @@ - - blockSize = len(data) - -- rand = RandomPool() -+ rand = Random.new() - - bufblock = "\x00" * blockSize - -@@ -89,12 +89,7 @@ - for i in range(0, stripes-1): - - # Get some random data -- rand.randomize() -- rand.stir() -- r = rand.get_bytes(blockSize) -- if rand.entropy < 0: -- print "Warning: RandomPool entropy dropped below 0" -- -+ r = rand.rand(blockSize) - ret += r - bufblock = _xor(r, bufblock) - bufblock = _diffuse(bufblock, blockSize, digesttype) ---- src/bundle/luks.py.~1~ 2012-05-26 14:19:34.000000000 +0200 -+++ src/bundle/luks.py 2017-07-15 10:10:08.735052052 +0200 -@@ -65,7 +65,7 @@ - - # will need changed to use Crypto.Random (now in python-crypt git) - # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html --from Crypto.Util.randpool import RandomPool -+from Crypto import Random - from Crypto.Cipher import * - import PBKDFv2, AfSplitter - -@@ -178,13 +178,13 @@ - self.keyBytes = masterSize - self.hashSpec = hashSpec - -- rand = RandomPool(self.SALT_SIZE + 16 + masterSize) -+ rand = Random.new() - - # Generate the salt -- self.mkDigestSalt = rand.get_bytes(self.SALT_SIZE) -+ self.mkDigestSalt = rand.read(self.SALT_SIZE) - - # Generate a random master key -- self.masterKey = rand.get_bytes(self.keyBytes) -+ self.masterKey = rand.read(self.keyBytes) - self.ivGen.set_key(self.masterKey) - - # generate the master key digest -@@ -263,8 +263,8 @@ - key.passwordIterations = iterations - - # Generate a random salt for this key -- rand = RandomPool(self.SALT_SIZE) -- key.passwordSalt = rand.get_bytes(self.SALT_SIZE) -+ rand = Random.new() -+ key.passwordSalt = rand.read(self.SALT_SIZE) - - # Hash the key using PBKDFv2 - pbkdf = PBKDFv2.PBKDFv2() diff --git a/x11-misc/revelation/files/revelation-0.4.14-xor.patch b/x11-misc/revelation/files/revelation-0.4.14-xor.patch deleted file mode 100644 index bac45c68b18b..000000000000 --- a/x11-misc/revelation/files/revelation-0.4.14-xor.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- src/bundle/AfSplitter.py.~1~ 2017-07-15 10:25:21.503324481 +0200 -+++ src/bundle/AfSplitter.py 2017-07-15 10:26:39.589273253 +0200 -@@ -43,13 +43,7 @@ - # will need changed to use Crypto.Random (now in python-crypt git) - # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html - from Crypto import Random --from Crypto.Cipher import XOR -- --def _xor(a, b): -- """Internal function to performs XOR on two strings a and b""" -- -- xor = XOR.new(a) -- return xor.encrypt(b) -+from Crypto import Util - - def _diffuse(block, size, digest): - """Internal function to diffuse information inside a buffer""" -@@ -91,11 +85,11 @@ - # Get some random data - r = rand.rand(blockSize) - ret += r -- bufblock = _xor(r, bufblock) -+ bufblock = strxor(r, bufblock) - bufblock = _diffuse(bufblock, blockSize, digesttype) - rand.add_event(bufblock) - -- ret += _xor(bufblock, data) -+ ret += strxor(bufblock, data) - return ret - - def AFMerge(data, stripes, digesttype='sha1'): -@@ -108,7 +102,7 @@ - - bufblock = "\x00" * blockSize - for i in range(0, stripes - 1): -- bufblock = _xor(data[i*blockSize:(i+1)*blockSize], bufblock) -+ bufblock = strxor(data[i*blockSize:(i+1)*blockSize], bufblock) - bufblock = _diffuse(bufblock, blockSize, digesttype) - -- return _xor(data[(stripes-1)*blockSize:], bufblock) -+ return strxor(data[(stripes-1)*blockSize:], bufblock) ---- src/bundle/PBKDFv2.py.~1~ 2012-05-26 14:19:34.000000000 +0200 -+++ src/bundle/PBKDFv2.py 2017-07-15 10:31:27.009731785 +0200 -@@ -32,7 +32,7 @@ - """ - - import struct, string, math, hashlib, hmac # RFC2104 --from Crypto.Cipher import XOR -+from Crypto import Util - - ################ PBKDFv2 - class PBKDFv2: -@@ -145,5 +145,4 @@ - if len(a) != len(b): - raise ValueError("ERROR: Strings are of different size! %s %s" % (len(a), len(b))) - -- xor = XOR.new(a) -- return xor.encrypt(b) -+ return strxor(a, b) diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml deleted file mode 100644 index 1b2becffa26c..000000000000 --- a/x11-misc/revelation/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/x11-misc/revelation/revelation-0.4.14-r4.ebuild b/x11-misc/revelation/revelation-0.4.14-r4.ebuild deleted file mode 100644 index 704d9967b80e..000000000000 --- a/x11-misc/revelation/revelation-0.4.14-r4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 autotools gnome2 - -DESCRIPTION="A password manager for GNOME" -HOMEPAGE="https://revelation.olasagasti.info/" -SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygtk[${PYTHON_MULTI_USEDEP}] - dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] - dev-python/gconf-python[${PYTHON_MULTI_USEDEP}] - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - sys-libs/cracklib[python,${PYTHON_MULTI_USEDEP}] - ') -" - -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-random.patch" \ - "${FILESDIR}/${P}-xor.patch" \ - "${FILESDIR}/${P}-gnome-python.patch" - eapply_user - eautoreconf -} - -src_configure() { - gnome2_src_configure \ - --without-applet \ - --disable-desktop-update \ - --disable-mime-update -} - -src_install() { - gnome2_src_install - python_fix_shebang "${ED}" -} |