[Pkg-haskell-commits] darcs: haskell-authenticate-oauth: New upstream release
Joachim Breitner
mail at joachim-breitner.de
Mon Dec 22 13:28:52 UTC 2014
Sat Dec 20 18:30:19 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* New upstream release
M ./changelog -2 +3
M ./control -18 +5
R ./patches/0001-Update-to-use-resourcet-1.0.patch
M ./patches/series -1
Sat Dec 20 18:30:19 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* New upstream release
diff -rN -u old-haskell-authenticate-oauth/changelog new-haskell-authenticate-oauth/changelog
--- old-haskell-authenticate-oauth/changelog 2014-12-22 13:28:52.037876504 +0000
+++ new-haskell-authenticate-oauth/changelog 2014-12-22 13:28:52.049876510 +0000
@@ -1,8 +1,9 @@
-haskell-authenticate-oauth (1.4.0.8-3) UNRELEASED; urgency=medium
+haskell-authenticate-oauth (1.5-1) UNRELEASED; urgency=medium
* Depend on haskell-devscripts 0.9, found in experimental
+ * New upstream release
- -- Joachim Breitner <nomeata at debian.org> Sat, 20 Dec 2014 16:56:16 +0100
+ -- Joachim Breitner <nomeata at debian.org> Sat, 20 Dec 2014 17:03:20 +0100
haskell-authenticate-oauth (1.4.0.8-2) unstable; urgency=medium
diff -rN -u old-haskell-authenticate-oauth/control new-haskell-authenticate-oauth/control
--- old-haskell-authenticate-oauth/control 2014-12-22 13:28:52.037876504 +0000
+++ new-haskell-authenticate-oauth/control 2014-12-22 13:28:52.045876508 +0000
@@ -8,8 +8,8 @@
, cdbs
, ghc
, ghc-prof
- , libghc-rsa-dev (>= 1.2)
- , libghc-rsa-dev (<< 1.3)
+ , libghc-rsa-dev (>= 2.0)
+ , libghc-rsa-dev (<< 2.0.1)
, libghc-rsa-prof
, libghc-sha-dev (>= 1.4)
, libghc-sha-dev (<< 1.7)
@@ -26,22 +26,12 @@
, libghc-crypto-pubkey-types-prof
, libghc-data-default-dev
, libghc-data-default-prof
- , libghc-http-conduit-dev (>= 1.4)
- , libghc-http-conduit-prof
+ , libghc-http-client-dev (>= 0.3)
+ , libghc-http-client-prof
, libghc-http-types-dev (>= 0.6)
- , libghc-http-types-dev (<< 0.9)
, libghc-http-types-prof
- , libghc-monad-control-dev (>= 0.3)
- , libghc-monad-control-dev (<< 0.4)
- , libghc-monad-control-prof
, libghc-random-dev
, libghc-random-prof
- , libghc-resourcet-dev (>= 0.3)
- , libghc-resourcet-dev (<< 1.2)
- , libghc-resourcet-prof
- , libghc-transformers-dev (>= 0.1)
- , libghc-transformers-dev (<< 0.4)
- , libghc-transformers-prof
Build-Depends-Indep: ghc-doc
, libghc-rsa-doc
, libghc-sha-doc
@@ -50,12 +40,9 @@
, libghc-conduit-doc
, libghc-crypto-pubkey-types-doc
, libghc-data-default-doc
- , libghc-http-conduit-doc
+ , libghc-http-client-doc
, libghc-http-types-doc
- , libghc-monad-control-doc
, libghc-random-doc
- , libghc-resourcet-doc
- , libghc-transformers-doc
Standards-Version: 3.9.5
Homepage: http://github.com/yesodweb/authenticate
diff -rN -u old-haskell-authenticate-oauth/patches/0001-Update-to-use-resourcet-1.0.patch new-haskell-authenticate-oauth/patches/0001-Update-to-use-resourcet-1.0.patch
--- old-haskell-authenticate-oauth/patches/0001-Update-to-use-resourcet-1.0.patch 2014-12-22 13:28:52.037876504 +0000
+++ new-haskell-authenticate-oauth/patches/0001-Update-to-use-resourcet-1.0.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-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 -rN -u old-haskell-authenticate-oauth/patches/series new-haskell-authenticate-oauth/patches/series
--- old-haskell-authenticate-oauth/patches/series 2014-12-22 13:28:52.037876504 +0000
+++ new-haskell-authenticate-oauth/patches/series 2014-12-22 13:28:52.049876510 +0000
@@ -1,2 +1 @@
-0001-Update-to-use-resourcet-1.0.patch
no-blaze-builder-conduit.diff
More information about the Pkg-haskell-commits
mailing list