[Pkg-haskell-commits] [package-plan] 01/01: And more impending patches

Clint Adams clint at moszumanska.debian.org
Sun Jun 8 05:08:10 UTC 2014


This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository package-plan.

commit 0c6ce066dc05312d7631e72f1d9dd6e7cec4d2a6
Author: Clint Adams <clint at debian.org>
Date:   Sun Jun 8 01:07:36 2014 -0400

    And more impending patches
---
 .../1.4.0.8/0001-Update-to-use-resourcet-1.0.patch | 154 +++++++++++++++++++++
 .../1.4.0.8/no-blaze-builder-conduit.diff          |  10 ++
 patches/authenticate-oauth/1.4.0.8/series          |   2 +
 patches/process-conduit/1.1.0.0/newer-conduit.diff |  19 +++
 patches/process-conduit/1.1.0.0/series             |   1 +
 ...arsec-conduit-and-no-blaze-builder-conduit.diff |  11 ++
 patches/tagstream-conduit/0.5.5.1/series           |   1 +
 ...-blaze-builder-conduit-and-no-zlib-conduit.diff |  11 ++
 patches/wai-extra/2.1.1.2/series                   |   1 +
 .../wai-test/2.0.1.3/no-blaze-builder-conduit.diff |  10 ++
 patches/wai-test/2.0.1.3/series                    |   1 +
 ...arsec-conduit-and-no-blaze-builder-conduit.diff |  11 ++
 patches/xml-conduit/1.2.0.2/series                 |   1 +
 ...-attoparsec-conduit-and-no-network-conduit.diff |  18 +++
 patches/yesod-core/1.2.15.2/series                 |   1 +
 15 files changed, 252 insertions(+)

diff --git a/patches/authenticate-oauth/1.4.0.8/0001-Update-to-use-resourcet-1.0.patch b/patches/authenticate-oauth/1.4.0.8/0001-Update-to-use-resourcet-1.0.patch
new file mode 100644
index 0000000..c203b72
--- /dev/null
+++ b/patches/authenticate-oauth/1.4.0.8/0001-Update-to-use-resourcet-1.0.patch
@@ -0,0 +1,154 @@
+From 332e06f5933c6b75a073349476bfae9e8d263642 Mon Sep 17 00:00:00 2001
+From: Oliver Charles <ollie at ocharles.org.uk>
+Date: Mon, 14 Apr 2014 15:07:05 +0100
+Subject: [PATCH] Update to use resourcet >= 1.0
+
+resourcet-1.0 doesn't have the `MonadUnsafeIO` class anymore, but
+authenticate-oauth seems to be abusing that anyway. I have instead opted
+to use `MonadIO` in the cases where `MonadUnsafeIO` was used.
+---
+ authenticate-oauth/Web/Authenticate/OAuth.hs    | 68 ++++++++-----------------
+ authenticate-oauth/Web/Authenticate/OAuth/IO.hs |  6 +--
+ authenticate-oauth/authenticate-oauth.cabal     |  2 +-
+ 3 files changed, 24 insertions(+), 52 deletions(-)
+
+--- haskell-authenticate-oauth-1.4.0.8.orig/Web/Authenticate/OAuth.hs
++++ haskell-authenticate-oauth-1.4.0.8/Web/Authenticate/OAuth.hs
+@@ -32,9 +32,6 @@
+ import qualified Data.ByteString.Char8        as BS
+ import qualified Data.ByteString.Lazy.Char8   as BSL
+ import           Data.Char
+-import           Data.Conduit                 (Source, ($$), ($=))
+-import           Data.Conduit.Blaze           (builderToByteString)
+-import qualified Data.Conduit.List            as CL
+ import           Data.Default
+ import           Data.Digest.Pure.SHA
+ import qualified Data.IORef                   as I
+@@ -285,7 +282,7 @@
+ injectVerifier = insert "oauth_verifier"
+ 
+ -- | Add OAuth headers & sign to 'Request'.
+-signOAuth :: (MonadUnsafeIO m)
++signOAuth :: MonadIO m
+           => OAuth              -- ^ OAuth Application
+           -> Credential         -- ^ Credential
+ #if MIN_VERSION_http_conduit(2, 0, 0)
+@@ -315,14 +312,14 @@
+ showSigMtd HMACSHA1  = "HMAC-SHA1"
+ showSigMtd (RSASHA1 _) = "RSA-SHA1"
+ 
+-addNonce :: MonadUnsafeIO m => Credential -> m Credential
++addNonce :: MonadIO m => Credential -> m Credential
+ addNonce cred = do
+-  nonce <- unsafeLiftIO $ replicateM 10 (randomRIO ('a','z')) -- FIXME very inefficient
++  nonce <- liftIO $ replicateM 10 (randomRIO ('a','z')) -- FIXME very inefficient
+   return $ insert "oauth_nonce" (BS.pack nonce) cred
+ 
+-addTimeStamp :: MonadUnsafeIO m => Credential -> m Credential
++addTimeStamp :: MonadIO m => Credential -> m Credential
+ addTimeStamp cred = do
+-  stamp <- (floor . (`diffUTCTime` baseTime)) `liftM` unsafeLiftIO getCurrentTime
++  stamp <- (floor . (`diffUTCTime` baseTime)) `liftM` liftIO getCurrentTime
+   return $ insert "oauth_timestamp" (BS.pack $ show (stamp :: Integer)) cred
+ 
+ injectOAuthToCred :: OAuth -> Credential -> Credential
+@@ -333,9 +330,9 @@
+             ] cred
+ 
+ #if MIN_VERSION_http_conduit(2, 0, 0)
+-genSign :: MonadUnsafeIO m => OAuth -> Credential -> Request -> m BS.ByteString
++genSign :: MonadIO m => OAuth -> Credential -> Request -> m BS.ByteString
+ #else
+-genSign :: MonadUnsafeIO m => OAuth -> Credential -> Request m -> m BS.ByteString
++genSign :: MonadIO m => OAuth -> Credential -> Request m -> m BS.ByteString
+ #endif
+ genSign oa tok req =
+   case oauthSignatureMethod oa of
+@@ -369,9 +366,9 @@
+                            in BS.pack oct
+ 
+ #if MIN_VERSION_http_conduit(2, 0, 0)
+-getBaseString :: MonadUnsafeIO m => Credential -> Request -> m BSL.ByteString
++getBaseString :: MonadIO m => Credential -> Request -> m BSL.ByteString
+ #else
+-getBaseString :: MonadUnsafeIO m => Credential -> Request m -> m BSL.ByteString
++getBaseString :: MonadIO m => Credential -> Request m -> m BSL.ByteString
+ #endif
+ getBaseString tok req = do
+   let bsMtd  = BS.map toUpper $ method req
+@@ -393,7 +390,7 @@
+   return $ BSL.intercalate "&" $ map (fromStrict.paramEncode) [bsMtd, bsURI, bsParams]
+ 
+ #if MIN_VERSION_http_conduit(2, 0, 0)
+-toLBS :: MonadUnsafeIO m => RequestBody -> m BS.ByteString
++toLBS :: MonadIO m => RequestBody -> m BS.ByteString
+ toLBS (RequestBodyLBS l) = return $ toStrict l
+ toLBS (RequestBodyBS s) = return s
+ toLBS (RequestBodyBuilder _ b) = return $ toByteString b
+@@ -404,9 +401,8 @@
+ type NeedsPopper a = Popper -> IO a
+ type GivesPopper a = NeedsPopper a -> IO a
+ 
+-toLBS' :: MonadUnsafeIO m => GivesPopper () -> m BS.ByteString
+--- FIXME probably shouldn't be using MonadUnsafeIO
+-toLBS' gp = unsafeLiftIO $ do
++toLBS' :: MonadIO m => GivesPopper () -> m BS.ByteString
++toLBS' gp = liftIO $ do
+     ref <- I.newIORef BS.empty
+     gp (go ref)
+     I.readIORef ref
+@@ -420,14 +416,14 @@
+                 then I.writeIORef ref $ BS.concat $ front []
+                 else loop (front . (bs:))
+ #else
+-toLBS :: MonadUnsafeIO m => RequestBody m -> m BS.ByteString
++toLBS :: MonadIO m => RequestBody m -> m BS.ByteString
+ toLBS (RequestBodyLBS l) = return $ toStrict l
+ toLBS (RequestBodyBS s) = return s
+ toLBS (RequestBodyBuilder _ b) = return $ toByteString b
+ toLBS (RequestBodySource _ src) = toLBS' src
+ toLBS (RequestBodySourceChunked src) = toLBS' src
+ 
+-toLBS' :: MonadUnsafeIO m => Source m Builder -> m BS.ByteString
++toLBS' :: MonadIO m => Source m Builder -> m BS.ByteString
+ toLBS' src = liftM BS.concat $ src $= builderToByteString $$ CL.consume
+ #endif
+ 
+--- haskell-authenticate-oauth-1.4.0.8.orig/Web/Authenticate/OAuth/IO.hs
++++ haskell-authenticate-oauth-1.4.0.8/Web/Authenticate/OAuth/IO.hs
+@@ -5,13 +5,13 @@
+ -- What this module do is just adding 'withManager' or 'runResourceT'.
+ module Web.Authenticate.OAuth.IO
+     {-# DEPRECATED "This module is deprecated; rewrite your code using MonadResource" #-}
+-    ( 
++    (
+       module Web.Authenticate.OAuth,
+       getAccessToken,
+       getTemporaryCredential, getTemporaryCredentialWithScope,
+       getTemporaryCredentialProxy, getTemporaryCredential',
+       getTokenCredential,
+-      getAccessTokenProxy, getTokenCredentialProxy, 
++      getAccessTokenProxy, getTokenCredentialProxy,
+       getAccessToken'
+     ) where
+ import Network.HTTP.Conduit
+@@ -24,7 +24,7 @@
+      getAccessTokenProxy, getTemporaryCredentialProxy,
+      getTokenCredentialProxy,
+      getAccessToken', getTemporaryCredential')
+-import Data.Conduit
++
+ import Control.Monad.IO.Class
+ import qualified Data.ByteString.Char8 as BS
+ 
+--- haskell-authenticate-oauth-1.4.0.8.orig/authenticate-oauth.cabal
++++ haskell-authenticate-oauth-1.4.0.8/authenticate-oauth.cabal
+@@ -28,7 +28,7 @@
+                    , http-types                    >= 0.6      && < 0.9
+                    , blaze-builder
+                    , conduit                       >= 0.4
+-                   , resourcet                     >= 0.3      && < 0.5
++                   , resourcet                     >= 1.0
+                    , blaze-builder-conduit         >= 0.4
+                    , monad-control                 >= 0.3      && < 0.4
+     exposed-modules: Web.Authenticate.OAuth, Web.Authenticate.OAuth.IO
diff --git a/patches/authenticate-oauth/1.4.0.8/no-blaze-builder-conduit.diff b/patches/authenticate-oauth/1.4.0.8/no-blaze-builder-conduit.diff
new file mode 100644
index 0000000..af3edd6
--- /dev/null
+++ b/patches/authenticate-oauth/1.4.0.8/no-blaze-builder-conduit.diff
@@ -0,0 +1,10 @@
+--- a/authenticate-oauth.cabal
++++ b/authenticate-oauth.cabal
+@@ -29,7 +29,6 @@
+                    , blaze-builder
+                    , conduit                       >= 0.4
+                    , resourcet                     >= 1.0
+-                   , blaze-builder-conduit         >= 0.4
+                    , monad-control                 >= 0.3      && < 0.4
+     exposed-modules: Web.Authenticate.OAuth, Web.Authenticate.OAuth.IO
+     ghc-options:     -Wall
diff --git a/patches/authenticate-oauth/1.4.0.8/series b/patches/authenticate-oauth/1.4.0.8/series
new file mode 100644
index 0000000..7c8ebf6
--- /dev/null
+++ b/patches/authenticate-oauth/1.4.0.8/series
@@ -0,0 +1,2 @@
+0001-Update-to-use-resourcet-1.0.patch
+no-blaze-builder-conduit.diff
diff --git a/patches/process-conduit/1.1.0.0/newer-conduit.diff b/patches/process-conduit/1.1.0.0/newer-conduit.diff
new file mode 100644
index 0000000..ef86210
--- /dev/null
+++ b/patches/process-conduit/1.1.0.0/newer-conduit.diff
@@ -0,0 +1,19 @@
+--- a/process-conduit.cabal
++++ b/process-conduit.cabal
+@@ -48,4 +48,6 @@
+                      , bytestring
+                      , hspec           >= 1.3
+                      , conduit
++                     , conduit-extra
+                      , process-conduit
++                     , resourcet
+--- a/test.hs
++++ b/test.hs
+@@ -3,6 +3,7 @@
+ import Data.Conduit.Process
+ import System.Process.QQ
+ 
++import Control.Monad.Trans.Resource (runResourceT)
+ import qualified Data.ByteString.Lazy.Char8 as L
+ import Data.Conduit
+ import qualified Data.Conduit.Binary as CB
diff --git a/patches/process-conduit/1.1.0.0/series b/patches/process-conduit/1.1.0.0/series
new file mode 100644
index 0000000..cc66eba
--- /dev/null
+++ b/patches/process-conduit/1.1.0.0/series
@@ -0,0 +1 @@
+newer-conduit.diff
diff --git a/patches/tagstream-conduit/0.5.5.1/no-attoparsec-conduit-and-no-blaze-builder-conduit.diff b/patches/tagstream-conduit/0.5.5.1/no-attoparsec-conduit-and-no-blaze-builder-conduit.diff
new file mode 100644
index 0000000..3b3047e
--- /dev/null
+++ b/patches/tagstream-conduit/0.5.5.1/no-attoparsec-conduit-and-no-blaze-builder-conduit.diff
@@ -0,0 +1,11 @@
+--- a/tagstream-conduit.cabal
++++ b/tagstream-conduit.cabal
+@@ -43,8 +43,6 @@
+                      , resourcet
+                      , attoparsec
+                      , blaze-builder
+-                     , blaze-builder-conduit >= 0.5 && < 1.2
+-                     , attoparsec-conduit >= 0.5
+                      , xml-conduit >= 1.1.0.0
+                      , data-default >= 0.5.0
+ 
diff --git a/patches/tagstream-conduit/0.5.5.1/series b/patches/tagstream-conduit/0.5.5.1/series
new file mode 100644
index 0000000..b779594
--- /dev/null
+++ b/patches/tagstream-conduit/0.5.5.1/series
@@ -0,0 +1 @@
+no-attoparsec-conduit-and-no-blaze-builder-conduit.diff
diff --git a/patches/wai-extra/2.1.1.2/no-blaze-builder-conduit-and-no-zlib-conduit.diff b/patches/wai-extra/2.1.1.2/no-blaze-builder-conduit-and-no-zlib-conduit.diff
new file mode 100644
index 0000000..2d84a72
--- /dev/null
+++ b/patches/wai-extra/2.1.1.2/no-blaze-builder-conduit-and-no-zlib-conduit.diff
@@ -0,0 +1,11 @@
+--- a/wai-extra.cabal
++++ b/wai-extra.cabal
+@@ -37,8 +37,6 @@
+                    , wai-logger                >= 2.0      && < 2.2
+                    , conduit                   >= 1.0      && < 1.2
+                    , conduit-extra             >= 0.1      && < 1.2
+-                   , zlib-conduit              >= 0.5      && < 1.2
+-                   , blaze-builder-conduit     >= 0.5      && < 1.2
+                    , ansi-terminal
+                    , resourcet                 >= 0.4.6    && < 1.2
+                    , void                      >= 0.5
diff --git a/patches/wai-extra/2.1.1.2/series b/patches/wai-extra/2.1.1.2/series
new file mode 100644
index 0000000..9fe5c6b
--- /dev/null
+++ b/patches/wai-extra/2.1.1.2/series
@@ -0,0 +1 @@
+no-blaze-builder-conduit-and-no-zlib-conduit.diff
diff --git a/patches/wai-test/2.0.1.3/no-blaze-builder-conduit.diff b/patches/wai-test/2.0.1.3/no-blaze-builder-conduit.diff
new file mode 100644
index 0000000..1a14dd4
--- /dev/null
+++ b/patches/wai-test/2.0.1.3/no-blaze-builder-conduit.diff
@@ -0,0 +1,10 @@
+--- a/wai-test.cabal
++++ b/wai-test.cabal
+@@ -22,7 +22,6 @@
+                    , containers                >= 0.2
+                    , conduit                   >= 0.5      && < 1.2
+                    , conduit-extra
+-                   , blaze-builder-conduit     >= 0.5      && < 1.2
+                    , cookie                    >= 0.2      && < 0.5
+                    , http-types                >= 0.7
+                    , case-insensitive          >= 0.2
diff --git a/patches/wai-test/2.0.1.3/series b/patches/wai-test/2.0.1.3/series
new file mode 100644
index 0000000..012d9d3
--- /dev/null
+++ b/patches/wai-test/2.0.1.3/series
@@ -0,0 +1 @@
+no-blaze-builder-conduit.diff
diff --git a/patches/xml-conduit/1.2.0.2/no-attoparsec-conduit-and-no-blaze-builder-conduit.diff b/patches/xml-conduit/1.2.0.2/no-attoparsec-conduit-and-no-blaze-builder-conduit.diff
new file mode 100644
index 0000000..b9ed77f
--- /dev/null
+++ b/patches/xml-conduit/1.2.0.2/no-attoparsec-conduit-and-no-blaze-builder-conduit.diff
@@ -0,0 +1,11 @@
+--- a/xml-conduit.cabal
++++ b/xml-conduit.cabal
+@@ -31,8 +31,6 @@
+                    , conduit                   >= 1.0      && < 1.2
+                    , conduit-extra
+                    , resourcet                 >= 0.3      && < 1.2
+-                   , attoparsec-conduit        >= 1.0
+-                   , blaze-builder-conduit     >= 1.0
+                    , bytestring                >= 0.9
+                    , text                      >= 0.7
+                    , containers                >= 0.2
diff --git a/patches/xml-conduit/1.2.0.2/series b/patches/xml-conduit/1.2.0.2/series
new file mode 100644
index 0000000..b779594
--- /dev/null
+++ b/patches/xml-conduit/1.2.0.2/series
@@ -0,0 +1 @@
+no-attoparsec-conduit-and-no-blaze-builder-conduit.diff
diff --git a/patches/yesod-core/1.2.15.2/no-attoparsec-conduit-and-no-network-conduit.diff b/patches/yesod-core/1.2.15.2/no-attoparsec-conduit-and-no-network-conduit.diff
new file mode 100644
index 0000000..20b0790
--- /dev/null
+++ b/patches/yesod-core/1.2.15.2/no-attoparsec-conduit-and-no-network-conduit.diff
@@ -0,0 +1,18 @@
+--- a/yesod-core.cabal
++++ b/yesod-core.cabal
+@@ -60,7 +60,6 @@
+                    , conduit               >= 1.0.11
+                    , resourcet             >= 0.4.9    && < 1.2
+                    , lifted-base           >= 0.1.2
+-                   , attoparsec-conduit
+                    , blaze-html            >= 0.5
+                    , blaze-markup          >= 0.5.1
+                    , data-default
+@@ -125,7 +124,6 @@
+                   , containers
+                   , lifted-base
+                   , resourcet
+-                  , network-conduit
+                   , network
+                   , async
+                   , conduit-extra
diff --git a/patches/yesod-core/1.2.15.2/series b/patches/yesod-core/1.2.15.2/series
new file mode 100644
index 0000000..9a10df6
--- /dev/null
+++ b/patches/yesod-core/1.2.15.2/series
@@ -0,0 +1 @@
+no-attoparsec-conduit-and-no-network-conduit.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git



More information about the Pkg-haskell-commits mailing list