mighttpd2: New upstream version 3.1.1.

4 files changed, 7 insertions, 58 deletions

diff --git a/p/mighttpd2/debian/changelog b/p/mighttpd2/debian/changelog
index 9d4f9417c..4559f6eb3 100644
--- a/p/mighttpd2/debian/changelog
+++ b/p/mighttpd2/debian/changelog
@@ -1,3 +1,9 @@
+mighttpd2 (3.1.1-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Mon, 14 Jul 2014 15:33:02 -0400
+
 mighttpd2 (3.0.6-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/p/mighttpd2/debian/control b/p/mighttpd2/debian/control
index 09d5fd2c0..ade134acc 100644
--- a/p/mighttpd2/debian/control
+++ b/p/mighttpd2/debian/control
@@ -25,7 +25,7 @@ Build-Depends: ghc
   , libghc-unix-time-dev
   , libghc-unordered-containers-dev
   , libghc-wai-dev (>= 3.0)
-  , libghc-wai-app-file-cgi-dev (>= 2.0.4-2)
+  , libghc-wai-app-file-cgi-dev (>= 3.0)
   , libghc-wai-logger-dev (>= 2.1)
   , libghc-warp-dev (>= 3.0)
   , libghc-tls-dev
diff --git a/p/mighttpd2/debian/patches/newer-wai.diff b/p/mighttpd2/debian/patches/newer-wai.diff
deleted file mode 100644
index 1fcdb3c6c..000000000
--- a/p/mighttpd2/debian/patches/newer-wai.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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/p/mighttpd2/debian/patches/series b/p/mighttpd2/debian/patches/series
deleted file mode 100644
index 6968ba854..000000000
--- a/p/mighttpd2/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-wai.diff