gentoo resync : 25.08.2020

6 files changed, 134 insertions, 0 deletions

diff --git a/dev-haskell/rsa/Manifest b/dev-haskell/rsa/Manifest
new file mode 100644
index 000000000000..db6935dd55b6
--- /dev/null
+++ b/dev-haskell/rsa/Manifest
@@ -0,0 +1,6 @@
+AUX rsa-2.3.1-p1-ghc-8.8.patch 708 BLAKE2B 3f51a181c5f9b46c1ab44c1229edeb5b3c9a509ac30334b964accd937bee51bf61722fb5ad2a4d7319682d1f5a373fb74dd8f800f39437f7b7b323e188f26802 SHA512 36a4b592e021410a434f17f09cee4f508633290b0eea03fbe07313d14d4f1b39a8a65013cd5cfe7eee3f0ad9f49faecb1cb736a8a879568dfeaaab0fe9a071ff
+AUX rsa-2.3.1-p2-ghc-8.8.patch 829 BLAKE2B 3668415b8435bf760d49724cb7aa1936454c3a26dc5f8167802c55127872f1f900aef317596608d51cd494d1456c6aab70f93686b66043881b4e3a43c8b18089 SHA512 6fa30afbc5c26674b3269ff1bc746b1f353f46c718969268160fd58dc4688d6ef834c22f0f24f5ee70680cf673167f33ddb246a1f952918b7d383226713403fd
+AUX rsa-2.3.1-p3-ghc-8.8.patch 779 BLAKE2B fdb6da83db5d9a3d8d0955680256fdbcfe20e6b6e53102544f87f381198fe947aa9499c9a8b5e340019935e317bbeae47d628a73efce067bdc53e708056281a6 SHA512 a104d8f7417c06db043f6dd5a9de269ad954e0526522b4c4821221fca70d45cc57a1a098d46556f90257eb5d2e6fb6fbea55a07686aaa2932f7b36e1f14edb05
+DIST RSA-2.3.1.tar.gz 14705 BLAKE2B 065341bd3360410ca1e2ae1057b6b8112bc6cf1253ef12733d9d9564666b7c97e8088d35e0736a76768ebc8d40f497536ec0bb84565d849285666c591f1df3c6 SHA512 b4d3f406cd7b97237c2b36e2ba659f35871e02a6144b6cb48482fdc7999d9822758472c25b9eaef9ef6aeb8c503fa49b424350a543897217f3aec3084dd7572f
+EBUILD rsa-2.3.1.ebuild 1586 BLAKE2B bd065750827f7a2e6d6cfb601d4e7144739a3641b02fe3dea9d73527e005af75e2dbd115c6eecb28be5dd23efe4f43fbcd99409a6564baeb8481efb1d791430c SHA512 5178d513569c9aadae6cf02b31c74522decf90f680ab0a694d1290d39b3e24f33c7f713f4c49bf09b0dc69a5cd4b5df5a6a05fdf4efe29ef6200a64d1ac1a09b
+MISC metadata.xml 651 BLAKE2B d7fb17d99721f6a24568ae62fc8d9a40f4a89eabe7f23193af1cb1de8bc5b98e31cc3918f8970a1bb87e1441e41eac92049034ea9b2034d7d0b4bde1774dc940 SHA512 9f0c074841d168110be69469e8ce01950b1256e26f1e0e00db4a933e1541c3d55cde298715c82619757f4bd1da65035b1370d6c591f766acdadb8b278ad89610
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
new file mode 100644
index 000000000000..2c985b3b5f62
--- /dev/null
+++ b/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
@@ -0,0 +1,19 @@
+commit 8d867a693f91406f9b45e24d79a0637013c0e272
+Author: Ollie Charles <ollie@ocharles.org.uk>
+Date:   Wed Sep 18 14:48:23 2019 +0100
+
+    Update Pure.hs
+
+diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
+index 8e0f483..a69907d 100644
+--- a/src/Codec/Crypto/RSA/Pure.hs
++++ b/src/Codec/Crypto/RSA/Pure.hs
+@@ -111,7 +111,7 @@ instance Binary PrivateKey where
+               d   <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
+               return (PrivateKey pub d 0 0 0 0 0)
+ 
+-failOnError :: (Monad m, Show a) => Either a b -> m b
++failOnError :: (MonadFail m, Show a) => Either a b -> m b
+ failOnError (Left e)  = fail (show e)
+ failOnError (Right b) = return b
+ 
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
new file mode 100644
index 000000000000..e2c7348eb38c
--- /dev/null
+++ b/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
@@ -0,0 +1,21 @@
+commit d621ae1603f27b3de867b46e5ad4d28460097dac
+Author: Ollie Charles <ollie@ocharles.org.uk>
+Date:   Wed Sep 18 14:52:34 2019 +0100
+
+    Update Pure.hs
+
+diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
+index a69907d..e3513a9 100644
+--- a/src/Codec/Crypto/RSA/Pure.hs
++++ b/src/Codec/Crypto/RSA/Pure.hs
+@@ -111,8 +111,8 @@ instance Binary PrivateKey where
+               d   <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
+               return (PrivateKey pub d 0 0 0 0 0)
+ 
+-failOnError :: (MonadFail m, Show a) => Either a b -> m b
+-failOnError (Left e)  = fail (show e)
++failOnError :: (Monad m, Show a) => Either a b -> m b
++failOnError (Left e)  = error (show e)
+ failOnError (Right b) = return b
+ 
+ -- ----------------------------------------------------------------------------
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
new file mode 100644
index 000000000000..6aebe6fab6ce
--- /dev/null
+++ b/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
@@ -0,0 +1,23 @@
+commit bb712862c868975ab033e1079751d9e3787d3a33
+Author: Ollie Charles <ollie@ocharles.org.uk>
+Date:   Wed Sep 18 14:54:22 2019 +0100
+
+    Update Test.hs
+
+diff --git a/Test.hs b/Test.hs
+index dd61302..4fa26ca 100644
+--- a/Test.hs
++++ b/Test.hs
+@@ -98,10 +98,10 @@ instance Arbitrary LargePrime where
+   arbitrary =
+     do seed <- BSS.pack `fmap` replicateM 4096 arbitrary
+        case newGen seed of
+-        Left _ -> fail "DRBG initialization error."
++        Left _ -> error "DRBG initialization error."
+         Right (g :: HashDRBG) ->
+           case largeRandomPrime g 64 of
+-            Left _ -> fail "Large prime generation failure."
++            Left _ -> error "Large prime generation failure."
+             Right (i, _) -> return (LP i)
+ 
+ data KeyPairIdx = KPI Int
diff --git a/dev-haskell/rsa/metadata.xml b/dev-haskell/rsa/metadata.xml
new file mode 100644
index 000000000000..72836dbae97d
--- /dev/null
+++ b/dev-haskell/rsa/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This library implements the RSA encryption and signature
+		algorithms for arbitrarily-sized ByteStrings. While the
+		implementations work, they are not necessarily the fastest ones
+		on the planet. Particularly key generation. The algorithms
+		included are based of RFC 3447, or the Public-Key Cryptography
+		Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/rsa/rsa-2.3.1.ebuild b/dev-haskell/rsa/rsa-2.3.1.ebuild
new file mode 100644
index 000000000000..f0a8153fa08a
--- /dev/null
+++ b/dev-haskell/rsa/rsa-2.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -oldbase,-buildtestexecutable
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="RSA"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implementation of RSA, using the padding schemes of PKCS#1 v2.1"
+HOMEPAGE="https://hackage.haskell.org/package/RSA"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
+	>=dev-haskell/crypto-pubkey-types-0.2:=[profile?] <dev-haskell/crypto-pubkey-types-0.6:=[profile?]
+	>=dev-haskell/sha-1.6.4.1:=[profile?] <dev-haskell/sha-2.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/crypto-pubkey-types-0.4 <dev-haskell/crypto-pubkey-types-0.6
+		>=dev-haskell/drbg-0.5.2 <dev-haskell/drbg-0.7
+		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
+		>=dev-haskell/tagged-0.2 <dev-haskell/tagged-0.9
+		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.10
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-0.5 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}"/${P}-p1-ghc-8.8.patch
+		 "${FILESDIR}"/${P}-p2-ghc-8.8.patch
+		 "${FILESDIR}"/${P}-p3-ghc-8.8.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtestexecutable \
+		--flag=-oldbase
+}