1 |
commit: 86c212c3a1e62287f46f0cc0d094ad7dc415951b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 26 23:29:49 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 26 23:33:46 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c212c3 |
7 |
|
8 |
x11-misc/revelation: Remove last-rited package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708142 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
profiles/package.mask | 5 -- |
14 |
x11-misc/revelation/Manifest | 1 - |
15 |
.../files/revelation-0.4.14-gnome-python.patch | 28 --------- |
16 |
.../files/revelation-0.4.14-random.patch | 73 ---------------------- |
17 |
.../revelation/files/revelation-0.4.14-xor.patch | 59 ----------------- |
18 |
x11-misc/revelation/metadata.xml | 5 -- |
19 |
x11-misc/revelation/revelation-0.4.14-r4.ebuild | 52 --------------- |
20 |
7 files changed, 223 deletions(-) |
21 |
|
22 |
diff --git a/profiles/package.mask b/profiles/package.mask |
23 |
index cae93d170df..f33631df990 100644 |
24 |
--- a/profiles/package.mask |
25 |
+++ b/profiles/package.mask |
26 |
@@ -461,11 +461,6 @@ app-misc/fslint |
27 |
# Last release in 2012, bug #708124, masked for removal in 30 days. |
28 |
app-text/keepnote |
29 |
|
30 |
-# Andreas Sturmlechner <asturm@g.o> (2020-02-26) |
31 |
-# Unmaintained revdep on dev-python/pygtk blocking its removal, py2-only |
32 |
-# Last release in 2012, bug #708142, masked for removal in 30 days. |
33 |
-x11-misc/revelation |
34 |
- |
35 |
# Michał Górny <mgorny@g.o> (2020-02-24) |
36 |
# app-admin/packagekit-base is Python 2 only and behind upstream. |
37 |
# The Portage backend is unmaintained. Other packages are its reverse |
38 |
|
39 |
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest |
40 |
deleted file mode 100644 |
41 |
index 06d1ce2691a..00000000000 |
42 |
--- a/x11-misc/revelation/Manifest |
43 |
+++ /dev/null |
44 |
@@ -1 +0,0 @@ |
45 |
-DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145 |
46 |
|
47 |
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 |
48 |
deleted file mode 100644 |
49 |
index 82a02fb259b..00000000000 |
50 |
--- a/x11-misc/revelation/files/revelation-0.4.14-gnome-python.patch |
51 |
+++ /dev/null |
52 |
@@ -1,28 +0,0 @@ |
53 |
-From dffb8b7722865a82c3a5d7ce9615b6da2313d583 Mon Sep 17 00:00:00 2001 |
54 |
-Message-Id: <dffb8b7722865a82c3a5d7ce9615b6da2313d583.1486417682.git.tommyhebb@×××××.com> |
55 |
-From: Thomas Hebb <tommyhebb@×××××.com> |
56 |
-Date: Mon, 6 Feb 2017 21:44:06 +0000 |
57 |
-Subject: [PATCH] Remove deprecated gnome-python dependency from configure.ac |
58 |
- |
59 |
-The code has not depended on the module for many years (the module was |
60 |
-removed in 125cf9dc28f95617fc3b37bc29a714f708b7d2ef); however, the |
61 |
-configure script was never updated to match. |
62 |
---- |
63 |
- configure.ac | 1 - |
64 |
- 1 file changed, 1 deletion(-) |
65 |
- |
66 |
-diff --git a/configure.ac b/configure.ac |
67 |
-index bdfae2a..5b6ad72 100644 |
68 |
---- a/configure.ac |
69 |
-+++ b/configure.ac |
70 |
-@@ -19,7 +19,6 @@ RVL_FDO_MIME() |
71 |
- RVL_PYTHON_MODULE(Crypto, yes) |
72 |
- RVL_PYTHON_MODULE(gconf, yes) |
73 |
- RVL_PYTHON_MODULE(gtk, yes) |
74 |
--RVL_PYTHON_MODULE(gnome, yes) |
75 |
- RVL_PYTHON_MODULE(gio, yes) |
76 |
- RVL_PYTHON_MODULE(gobject, yes) |
77 |
- RVL_PYTHON_MODULE(pango, yes) |
78 |
--- |
79 |
-2.11.1 |
80 |
- |
81 |
|
82 |
diff --git a/x11-misc/revelation/files/revelation-0.4.14-random.patch b/x11-misc/revelation/files/revelation-0.4.14-random.patch |
83 |
deleted file mode 100644 |
84 |
index e54ac2bf066..00000000000 |
85 |
--- a/x11-misc/revelation/files/revelation-0.4.14-random.patch |
86 |
+++ /dev/null |
87 |
@@ -1,73 +0,0 @@ |
88 |
---- src/bundle/AfSplitter.py.~1~ 2012-05-26 14:19:34.000000000 +0200 |
89 |
-+++ src/bundle/AfSplitter.py 2017-07-15 10:10:57.817775246 +0200 |
90 |
-@@ -42,7 +42,7 @@ |
91 |
- |
92 |
- # will need changed to use Crypto.Random (now in python-crypt git) |
93 |
- # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html |
94 |
--from Crypto.Util.randpool import RandomPool |
95 |
-+from Crypto import Random |
96 |
- from Crypto.Cipher import XOR |
97 |
- |
98 |
- def _xor(a, b): |
99 |
-@@ -81,7 +81,7 @@ |
100 |
- |
101 |
- blockSize = len(data) |
102 |
- |
103 |
-- rand = RandomPool() |
104 |
-+ rand = Random.new() |
105 |
- |
106 |
- bufblock = "\x00" * blockSize |
107 |
- |
108 |
-@@ -89,12 +89,7 @@ |
109 |
- for i in range(0, stripes-1): |
110 |
- |
111 |
- # Get some random data |
112 |
-- rand.randomize() |
113 |
-- rand.stir() |
114 |
-- r = rand.get_bytes(blockSize) |
115 |
-- if rand.entropy < 0: |
116 |
-- print "Warning: RandomPool entropy dropped below 0" |
117 |
-- |
118 |
-+ r = rand.rand(blockSize) |
119 |
- ret += r |
120 |
- bufblock = _xor(r, bufblock) |
121 |
- bufblock = _diffuse(bufblock, blockSize, digesttype) |
122 |
---- src/bundle/luks.py.~1~ 2012-05-26 14:19:34.000000000 +0200 |
123 |
-+++ src/bundle/luks.py 2017-07-15 10:10:08.735052052 +0200 |
124 |
-@@ -65,7 +65,7 @@ |
125 |
- |
126 |
- # will need changed to use Crypto.Random (now in python-crypt git) |
127 |
- # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html |
128 |
--from Crypto.Util.randpool import RandomPool |
129 |
-+from Crypto import Random |
130 |
- from Crypto.Cipher import * |
131 |
- import PBKDFv2, AfSplitter |
132 |
- |
133 |
-@@ -178,13 +178,13 @@ |
134 |
- self.keyBytes = masterSize |
135 |
- self.hashSpec = hashSpec |
136 |
- |
137 |
-- rand = RandomPool(self.SALT_SIZE + 16 + masterSize) |
138 |
-+ rand = Random.new() |
139 |
- |
140 |
- # Generate the salt |
141 |
-- self.mkDigestSalt = rand.get_bytes(self.SALT_SIZE) |
142 |
-+ self.mkDigestSalt = rand.read(self.SALT_SIZE) |
143 |
- |
144 |
- # Generate a random master key |
145 |
-- self.masterKey = rand.get_bytes(self.keyBytes) |
146 |
-+ self.masterKey = rand.read(self.keyBytes) |
147 |
- self.ivGen.set_key(self.masterKey) |
148 |
- |
149 |
- # generate the master key digest |
150 |
-@@ -263,8 +263,8 @@ |
151 |
- key.passwordIterations = iterations |
152 |
- |
153 |
- # Generate a random salt for this key |
154 |
-- rand = RandomPool(self.SALT_SIZE) |
155 |
-- key.passwordSalt = rand.get_bytes(self.SALT_SIZE) |
156 |
-+ rand = Random.new() |
157 |
-+ key.passwordSalt = rand.read(self.SALT_SIZE) |
158 |
- |
159 |
- # Hash the key using PBKDFv2 |
160 |
- pbkdf = PBKDFv2.PBKDFv2() |
161 |
|
162 |
diff --git a/x11-misc/revelation/files/revelation-0.4.14-xor.patch b/x11-misc/revelation/files/revelation-0.4.14-xor.patch |
163 |
deleted file mode 100644 |
164 |
index bac45c68b18..00000000000 |
165 |
--- a/x11-misc/revelation/files/revelation-0.4.14-xor.patch |
166 |
+++ /dev/null |
167 |
@@ -1,59 +0,0 @@ |
168 |
---- src/bundle/AfSplitter.py.~1~ 2017-07-15 10:25:21.503324481 +0200 |
169 |
-+++ src/bundle/AfSplitter.py 2017-07-15 10:26:39.589273253 +0200 |
170 |
-@@ -43,13 +43,7 @@ |
171 |
- # will need changed to use Crypto.Random (now in python-crypt git) |
172 |
- # see: http://lists.dlitz.net/pipermail/pycrypto/2008q3/000020.html |
173 |
- from Crypto import Random |
174 |
--from Crypto.Cipher import XOR |
175 |
-- |
176 |
--def _xor(a, b): |
177 |
-- """Internal function to performs XOR on two strings a and b""" |
178 |
-- |
179 |
-- xor = XOR.new(a) |
180 |
-- return xor.encrypt(b) |
181 |
-+from Crypto import Util |
182 |
- |
183 |
- def _diffuse(block, size, digest): |
184 |
- """Internal function to diffuse information inside a buffer""" |
185 |
-@@ -91,11 +85,11 @@ |
186 |
- # Get some random data |
187 |
- r = rand.rand(blockSize) |
188 |
- ret += r |
189 |
-- bufblock = _xor(r, bufblock) |
190 |
-+ bufblock = strxor(r, bufblock) |
191 |
- bufblock = _diffuse(bufblock, blockSize, digesttype) |
192 |
- rand.add_event(bufblock) |
193 |
- |
194 |
-- ret += _xor(bufblock, data) |
195 |
-+ ret += strxor(bufblock, data) |
196 |
- return ret |
197 |
- |
198 |
- def AFMerge(data, stripes, digesttype='sha1'): |
199 |
-@@ -108,7 +102,7 @@ |
200 |
- |
201 |
- bufblock = "\x00" * blockSize |
202 |
- for i in range(0, stripes - 1): |
203 |
-- bufblock = _xor(data[i*blockSize:(i+1)*blockSize], bufblock) |
204 |
-+ bufblock = strxor(data[i*blockSize:(i+1)*blockSize], bufblock) |
205 |
- bufblock = _diffuse(bufblock, blockSize, digesttype) |
206 |
- |
207 |
-- return _xor(data[(stripes-1)*blockSize:], bufblock) |
208 |
-+ return strxor(data[(stripes-1)*blockSize:], bufblock) |
209 |
---- src/bundle/PBKDFv2.py.~1~ 2012-05-26 14:19:34.000000000 +0200 |
210 |
-+++ src/bundle/PBKDFv2.py 2017-07-15 10:31:27.009731785 +0200 |
211 |
-@@ -32,7 +32,7 @@ |
212 |
- """ |
213 |
- |
214 |
- import struct, string, math, hashlib, hmac # RFC2104 |
215 |
--from Crypto.Cipher import XOR |
216 |
-+from Crypto import Util |
217 |
- |
218 |
- ################ PBKDFv2 |
219 |
- class PBKDFv2: |
220 |
-@@ -145,5 +145,4 @@ |
221 |
- if len(a) != len(b): |
222 |
- raise ValueError("ERROR: Strings are of different size! %s %s" % (len(a), len(b))) |
223 |
- |
224 |
-- xor = XOR.new(a) |
225 |
-- return xor.encrypt(b) |
226 |
-+ return strxor(a, b) |
227 |
|
228 |
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml |
229 |
deleted file mode 100644 |
230 |
index 1b2becffa26..00000000000 |
231 |
--- a/x11-misc/revelation/metadata.xml |
232 |
+++ /dev/null |
233 |
@@ -1,5 +0,0 @@ |
234 |
-<?xml version="1.0" encoding="UTF-8"?> |
235 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
236 |
-<pkgmetadata> |
237 |
- <!-- maintainer-needed --> |
238 |
-</pkgmetadata> |
239 |
|
240 |
diff --git a/x11-misc/revelation/revelation-0.4.14-r4.ebuild b/x11-misc/revelation/revelation-0.4.14-r4.ebuild |
241 |
deleted file mode 100644 |
242 |
index 704d9967b80..00000000000 |
243 |
--- a/x11-misc/revelation/revelation-0.4.14-r4.ebuild |
244 |
+++ /dev/null |
245 |
@@ -1,52 +0,0 @@ |
246 |
-# Copyright 1999-2020 Gentoo Authors |
247 |
-# Distributed under the terms of the GNU General Public License v2 |
248 |
- |
249 |
-EAPI=6 |
250 |
-PYTHON_COMPAT=( python2_7 ) |
251 |
- |
252 |
-inherit python-single-r1 autotools gnome2 |
253 |
- |
254 |
-DESCRIPTION="A password manager for GNOME" |
255 |
-HOMEPAGE="https://revelation.olasagasti.info/" |
256 |
-SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz" |
257 |
- |
258 |
-LICENSE="GPL-2" |
259 |
-SLOT="0" |
260 |
-KEYWORDS="amd64 ppc x86" |
261 |
- |
262 |
-IUSE="" |
263 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
264 |
- |
265 |
-RESTRICT="test" |
266 |
- |
267 |
-RDEPEND="${PYTHON_DEPS} |
268 |
- $(python_gen_cond_dep ' |
269 |
- dev-python/pygtk[${PYTHON_MULTI_USEDEP}] |
270 |
- dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] |
271 |
- dev-python/gconf-python[${PYTHON_MULTI_USEDEP}] |
272 |
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] |
273 |
- sys-libs/cracklib[python,${PYTHON_MULTI_USEDEP}] |
274 |
- ') |
275 |
-" |
276 |
- |
277 |
-DEPEND="${RDEPEND}" |
278 |
- |
279 |
-src_prepare() { |
280 |
- epatch "${FILESDIR}/${P}-random.patch" \ |
281 |
- "${FILESDIR}/${P}-xor.patch" \ |
282 |
- "${FILESDIR}/${P}-gnome-python.patch" |
283 |
- eapply_user |
284 |
- eautoreconf |
285 |
-} |
286 |
- |
287 |
-src_configure() { |
288 |
- gnome2_src_configure \ |
289 |
- --without-applet \ |
290 |
- --disable-desktop-update \ |
291 |
- --disable-mime-update |
292 |
-} |
293 |
- |
294 |
-src_install() { |
295 |
- gnome2_src_install |
296 |
- python_fix_shebang "${ED}" |
297 |
-} |