mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
x11-misc/revelation: Remove last-rited package
Closes: https://bugs.gentoo.org/708142 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -461,11 +461,6 @@ app-misc/fslint
|
||||
# Last release in 2012, bug #708124, masked for removal in 30 days.
|
||||
app-text/keepnote
|
||||
|
||||
# Andreas Sturmlechner <asturm@gentoo.org> (2020-02-26)
|
||||
# Unmaintained revdep on dev-python/pygtk blocking its removal, py2-only
|
||||
# Last release in 2012, bug #708142, masked for removal in 30 days.
|
||||
x11-misc/revelation
|
||||
|
||||
# Michał Górny <mgorny@gentoo.org> (2020-02-24)
|
||||
# app-admin/packagekit-base is Python 2 only and behind upstream.
|
||||
# The Portage backend is unmaintained. Other packages are its reverse
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
@@ -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)
|
||||
@@ -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>
|
||||
@@ -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}"
|
||||
}
|
||||
Reference in New Issue
Block a user