reinit the tree, so we can have metadata

6 files changed, 240 insertions, 0 deletions

diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
new file mode 100644
index 000000000000..2682e2c1981e
--- /dev/null
+++ b/x11-misc/revelation/Manifest
@@ -0,0 +1,8 @@
+AUX revelation-0.4.14-random.patch 2127 SHA256 5a8bc38629c685bb755a949269f7a9c9ba12e8ca01ebe121b8f9490350ab0d71 SHA512 be5e805e58d04c0be29ad9c30a6aa867a869a4d0a8df31ce234fbe331d0191cc3bf7b82e11ec6a7c1c8306b68ddbc5ed29d9f5e8c9e3838b293896adb69c5d13 WHIRLPOOL 8a2ce3a68471950c27f61a7e94c7f3df83defccfd226fd75f6822f4291f4919e52dbf96d98f606a5af8d18a557f41bd526c7d6b95845d2c8788eb9082007a3bf
+AUX revelation-0.4.14-xor.patch 1874 SHA256 b90222a6f42718dbd550ced97965308f3d8eb021b92b2fdbcf1f13f371b02548 SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc WHIRLPOOL 3f485f2d3568b06fae9a5004240a538e5de086c5449551190d67390e9064c731c95561ec1dbb613a6de28de913b1dac6a11602cd33198956b494cec77923bfe9
+DIST revelation-0.4.14.tar.xz 316096 SHA256 38a532e7c528076f82ef3564b5a75d0a37387492007cf49f2e4ef2c3eee9454d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145 WHIRLPOOL 5e65fa3e4e2ee1c13b5095ed00426987d74898113135e5ede878b206d01877bfa732eb145234a4a8889ca633a7b830a6d3621386dc8fa3579defdfbc66c3aeb8
+EBUILD revelation-0.4.14-r1.ebuild 957 SHA256 568d1b775a27f4f5bac29fa71fffc9665c35113cc998a7e9143ffbab81396d3b SHA512 379a283a17d3ca7bdf8349df7ceada185e2c86549c14eec45ad05c85cbf912eacf2da7c559d500563170223f8630c878a9987671a5d9eea72785bddf77975585 WHIRLPOOL 9a77f1363f69a303b1fbf6e4ddb46a744eb3bae73e82379c2d4d777a01259bbcc3761d4f14cf7e6f9e3eff2803c5a487e44951dc2de2648bed679dbecd42e890
+EBUILD revelation-0.4.14-r2.ebuild 1051 SHA256 a66b52346e4126b07f09e3530f039371116ad500c864909447c1692e09359396 SHA512 0548637f2932d677a9ec7c04fde0a53a470ed0612e74015df0e6a7254c8ee03436ea8f22df173d28ba7ef39c4185a2c6d60e3bd7f061d3caf2b197a20bc66aac WHIRLPOOL 6acfda30652181224180d2bf68da6128ffd70798eb6838fbeb330dff48b5e3620541724a65a921f2f14cd24767430a8cc3682c74132df60d9c0f8095ca13eb09
+MISC ChangeLog 2444 SHA256 934e2baba7401785361b98458b733e77001ec94c1c68f15da0823ba948c9bdd3 SHA512 392f3402b1b70d89045a3acbbb3c133c0f9b55cea1ddd1f477b151044280a8f8c96faeb4b1550a1915e806ff40c40b9b9179d2c1b5a4a28f908d5d109a97a19c WHIRLPOOL 21bcfc4166774cafb59e9391c21f00deb277df0cd2801743f097c6d2f1886f7a8824ccab8f6f180ed5cd19b3f586269bc50d455364c1851e4aa3f48a29064319
+MISC ChangeLog-2015 5157 SHA256 bc2341eac2c62e802ce2af059880d4b04fd94462c7466689650242214df54f37 SHA512 3751bc14000b5632120e91c19595745c11a6639a7882e88eb517f4aefe494e9d3df975d61ed96434cf17b6d0feab056268fa937ba664eac75b4d020c7f3e135d WHIRLPOOL 24178205010d960742f5783b5cb03c8b4a8bd980e7e0e24decbc238363a187d1cb87e57776c7e6dab277c5dbbdfdf27c753b5527a2c8177df871e5a34a0e1f7d
+MISC metadata.xml 221 SHA256 25ddec6716a967f6220d3a31887c10e94855eb9e33ad104acd3efa3404708f70 SHA512 9ca3dafa7e44ec0f210681f8f524549f103695d57d0f8463a9044ac9456e6bf99ad6c7448e62a672471b7e82535b76214b924e3b336f186bced032750e68754b WHIRLPOOL 8eecc5fb7722b5bdce6901dc19f6019c53a0b7ae1bc17c1ddb23027704064aaf29e7cbf6c1ad016fdcef58b95fcba16e29c107cf1a9c1ac81cdb07a4ae3a5c02
diff --git a/x11-misc/revelation/files/revelation-0.4.14-random.patch b/x11-misc/revelation/files/revelation-0.4.14-random.patch
new file mode 100644
index 000000000000..e54ac2bf0661
--- /dev/null
+++ b/x11-misc/revelation/files/revelation-0.4.14-random.patch
@@ -0,0 +1,73 @@
+--- 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
new file mode 100644
index 000000000000..bac45c68b18b
--- /dev/null
+++ b/x11-misc/revelation/files/revelation-0.4.14-xor.patch
@@ -0,0 +1,59 @@
+--- 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
new file mode 100644
index 000000000000..8bf69628e798
--- /dev/null
+++ b/x11-misc/revelation/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/revelation/revelation-0.4.14-r1.ebuild b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
new file mode 100644
index 000000000000..0a270428d9e1
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+GCONF_DEBUG="no"
+
+inherit python-single-r1 gnome2
+
+DESCRIPTION="A password manager for GNOME"
+HOMEPAGE="http://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}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/libgnome-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	sys-libs/cracklib[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	gnome2_src_configure \
+		--without-applet \
+		--disable-desktop-update \
+		--disable-mime-update
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/x11-misc/revelation/revelation-0.4.14-r2.ebuild b/x11-misc/revelation/revelation-0.4.14-r2.ebuild
new file mode 100644
index 000000000000..b3589929fc21
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.4.14-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 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 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/libgnome-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	sys-libs/cracklib[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-random.patch" \
+		   "${FILESDIR}/${P}-xor.patch"
+	eapply_user
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--without-applet \
+		--disable-desktop-update \
+		--disable-mime-update
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}