[Pkg-haskell-commits] darcs: mighttpd2: New upstream version 3.0.6.

[Clint Adams]

Sun Jun 15 13:18:02 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 3.0.6.

    M ./changelog +7
    M ./control -5 +7
    A ./patches/newer-wai.diff
    A ./patches/series

Sun Jun 15 13:18:02 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 3.0.6.
diff -rN -u old-mighttpd2/changelog new-mighttpd2/changelog
--- old-mighttpd2/changelog	2014-06-15 13:18:36.506671535 +0000
+++ new-mighttpd2/changelog	2014-06-15 13:18:36.510671535 +0000
@@ -1,3 +1,10 @@
+mighttpd2 (3.0.6-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Patch for newer WAI.
+
+ -- Clint Adams <clint at debian.org>  Sun, 15 Jun 2014 08:39:39 -0400
+
 mighttpd2 (3.0.3-2) unstable; urgency=medium
 
   * Add missing build dependency on haskell-devscripts.
diff -rN -u old-mighttpd2/control new-mighttpd2/control
--- old-mighttpd2/control	2014-06-15 13:18:36.506671535 +0000
+++ new-mighttpd2/control	2014-06-15 13:18:36.514671535 +0000
@@ -11,21 +11,23 @@
   , libghc-blaze-builder-dev
   , libghc-byteorder-dev
   , libghc-case-insensitive-dev
-  , libghc-conduit-dev
+  , libghc-conduit-dev (>= 1.1)
+  , libghc-conduit-extra-dev
   , libghc-http-client-dev
   , libghc-http-date-dev
   , libghc-http-types-dev
   , libghc-io-choice-dev
   , libghc-network-dev
-  , libghc-network-conduit-dev
   , libghc-parsec3-dev (>= 3)
   , libghc-process-conduit-dev
+  , libghc-resourcet-dev
+  , libghc-transformers-dev
   , libghc-unix-time-dev
   , libghc-unordered-containers-dev
-  , libghc-wai-dev (>= 2.0)
-  , libghc-wai-app-file-cgi-dev (>= 2.0)
+  , libghc-wai-dev (>= 3.0)
+  , libghc-wai-app-file-cgi-dev (>= 2.0.4-2)
   , libghc-wai-logger-dev (>= 2.1)
-  , libghc-warp-dev (>= 2.0)
+  , libghc-warp-dev (>= 3.0)
   , libghc-tls-dev
   , libghc-warp-tls-dev (>= 1.4.1)
   , libghc-hspec-dev (>= 1.3)
diff -rN -u old-mighttpd2/patches/newer-wai.diff new-mighttpd2/patches/newer-wai.diff
--- old-mighttpd2/patches/newer-wai.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-mighttpd2/patches/newer-wai.diff	2014-06-15 13:18:36.514671535 +0000
@@ -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 -rN -u old-mighttpd2/patches/series new-mighttpd2/patches/series
--- old-mighttpd2/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-mighttpd2/patches/series	2014-06-15 13:18:36.514671535 +0000
@@ -0,0 +1 @@
+newer-wai.diff