From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch | 19 +++++++++++++++++++ dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch | 21 +++++++++++++++++++++ dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch | 23 +++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch create mode 100644 dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch create mode 100644 dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch (limited to 'dev-haskell/rsa/files') 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 +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 +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 +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 -- cgit v1.2.3