[Pkg-haskell-commits] [package-plan] 01/01: Actually commit the patch this time

[Clint Adams]

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

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

commit ff3d3abf348e2e18eeaa5751063a50d816f8c876
Author: Clint Adams <clint at debian.org>
Date:   Sun Jun 15 09:17:36 2014 -0400

    Actually commit the patch this time
---
 patches/mighttpd2/3.0.6/newer-wai.diff | 56 ++++++++++++++++++++++++++++++++++
 patches/mighttpd2/3.0.6/series         |  1 +
 2 files changed, 57 insertions(+)

diff --git a/patches/mighttpd2/3.0.6/newer-wai.diff b/patches/mighttpd2/3.0.6/newer-wai.diff
new file mode 100644
index 0000000..cb91a15
--- /dev/null
+++ b/patches/mighttpd2/3.0.6/newer-wai.diff
@@ -0,0 +1,56 @@
+--- a/mighttpd2.cabal
++++ b/mighttpd2.cabal
+@@ -56,9 +56,9 @@ Library
+                       , unix
+                       , unix-time
+                       , unordered-containers
+-                      , wai >= 2.1 && < 3.0
++                      , wai >= 3.0
+                       , wai-app-file-cgi >= 1.0
+-                      , warp >= 2.1 && < 3.0
++                      , warp >= 3.0
+ 
+ Executable mighty
+   Default-Language:     Haskell2010
+--- a/src/WaiApp.hs
++++ b/src/WaiApp.hs
+@@ -16,31 +16,31 @@ data Perhaps a = Found a | Redirect | Fa
+ 
+ fileCgiApp :: ClassicAppSpec -> FileAppSpec -> CgiAppSpec -> RevProxyAppSpec
+            -> RouteDB -> Application
+-fileCgiApp cspec filespec cgispec revproxyspec um req = case mmp of
++fileCgiApp cspec filespec cgispec revproxyspec um req respond = case mmp of
+     Fail -> do
+         let st = preconditionFailed412
+         liftIO $ logger cspec req' st Nothing
+-        fastResponse st defaultHeader "Precondition Failed\r\n"
++        fastResponse respond st defaultHeader "Precondition Failed\r\n"
+     Redirect -> do
+         let st = movedPermanently301
+             hdr = defaultHeader ++ redirectHeader req'
+         liftIO $ logger cspec req st Nothing
+-        fastResponse st hdr "Moved Permanently\r\n"
++        fastResponse respond st hdr "Moved Permanently\r\n"
+     Found (RouteFile  src dst) ->
+-        fileApp cspec filespec (FileRoute src dst) req'
++        fileApp cspec filespec (FileRoute src dst) req' respond
+     Found (RouteRedirect src dst) ->
+-        redirectApp cspec (RedirectRoute src dst) req'
++        redirectApp cspec (RedirectRoute src dst) req' respond
+     Found (RouteCGI   src dst) ->
+-        cgiApp cspec cgispec (CgiRoute src dst) req'
++        cgiApp cspec cgispec (CgiRoute src dst) req' respond
+     Found (RouteRevProxy src dst dom prt) ->
+-        revProxyApp cspec revproxyspec (RevProxyRoute src dst dom prt) req
++        revProxyApp cspec revproxyspec (RevProxyRoute src dst dom prt) req respond
+   where
+     (host, _) = hostPort req
+     path = urlDecode False $ rawPathInfo req
+     mmp = case getBlock host um of
+         Nothing  -> Fail
+         Just blk -> getRoute path blk
+-    fastResponse st hdr body = return $ responseLBS st hdr body
++    fastResponse respond st hdr body = respond $ responseLBS st hdr body
+     defaultHeader = [("Content-Type", "text/plain")
+                     ,("Server", softwareName cspec)]
+     req' = req { rawPathInfo = path } -- FIXME
diff --git a/patches/mighttpd2/3.0.6/series b/patches/mighttpd2/3.0.6/series
new file mode 100644
index 0000000..6968ba8
--- /dev/null
+++ b/patches/mighttpd2/3.0.6/series
@@ -0,0 +1 @@
+newer-wai.diff

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