[Pkg-ganeti-devel] [ganeti] 02/03: Add a patch to allow compiling against haskell-zlib 0.6 and relax attoparsec and zlib deps.

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ganeti.

commit 100de6cb864579367decc6fcfc25b0024922e874
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Mon Jan 18 15:44:44 2016 +0200

    Add a patch to allow compiling against haskell-zlib 0.6 and relax attoparsec and
    zlib deps.
    
    Closes: #811233
---
 debian/patches/relax-deps             | 16 +++++++++++++---
 debian/patches/series                 |  1 +
 debian/patches/zlib-0.6-compatibility | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/debian/patches/relax-deps b/debian/patches/relax-deps
index ed10ed1..8ad0e28 100644
--- a/debian/patches/relax-deps
+++ b/debian/patches/relax-deps
@@ -9,7 +9,15 @@ Last-Update: 2015-07-21
 
 --- a/cabal/ganeti.template.cabal
 +++ b/cabal/ganeti.template.cabal
-@@ -61,8 +61,8 @@
+@@ -54,15 +54,15 @@
+     , transformers                  >= 0.3.0.0
+     , unix                          >= 2.5.1.0
+ 
+-    , attoparsec                    >= 0.10.1.1   && < 0.13
++    , attoparsec                    >= 0.10.1.1   && < 0.14
+     , base64-bytestring             >= 1.0.0.1    && < 1.1
+     , case-insensitive              >= 0.4.0.1    && < 1.3
+     , Crypto                        >= 4.2.4      && < 4.3
      , curl                          >= 1.3.7      && < 1.4
      , hinotify                      >= 0.3.2      && < 0.4
      , hslogger                      >= 1.1.4      && < 1.3
@@ -20,12 +28,14 @@ Last-Update: 2015-07-21
      , lifted-base                   >= 0.2.0.3    && < 0.3
      , monad-control                 >= 0.3.1.3    && < 1.1
      , MonadCatchIO-transformers     >= 0.3.0.0    && < 0.4
-@@ -71,7 +71,7 @@
+@@ -71,8 +71,8 @@
      , regex-pcre                    >= 0.94.2     && < 0.95
      , temporary                     >= 1.1.2.3    && < 1.3
      , transformers-base             >= 0.4.1      && < 0.5
 -    , utf8-string                   >= 0.3.7      && < 0.4
+-    , zlib                          >= 0.5.3.3    && < 0.6
 +    , utf8-string                   >= 0.3.7
-     , zlib                          >= 0.5.3.3    && < 0.6
++    , zlib                          >= 0.5.3.3    && < 0.7
  
      -- Executables:
+     -- , happy
diff --git a/debian/patches/series b/debian/patches/series
index 12a1ea2..6e16163 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ do-not-backup-export-dir.patch
 Makefile.am-use-C.UTF-8
 relax-deps
 ghc-7.10-compatibility.patch
+zlib-0.6-compatibility
diff --git a/debian/patches/zlib-0.6-compatibility b/debian/patches/zlib-0.6-compatibility
new file mode 100644
index 0000000..f8c847d
--- /dev/null
+++ b/debian/patches/zlib-0.6-compatibility
@@ -0,0 +1,34 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: haskell-zlib 0.6 compatibility
+ Based on a patch by Klaus Aehlig submitted to ganeti-devel, Message-Id:
+ <052c6c02393324a9403f4291c112c4689dc1c507.1453302634.git.aehlig at google.com>
+
+Last-Update: 2016-01-21
+Forwarded: not-needed
+--- a/src/Ganeti/Codec.hs
++++ b/src/Ganeti/Codec.hs
+@@ -1,3 +1,5 @@
++{-# LANGUAGE CPP #-}
++
+ {-| Provides interface to the 'zlib' library.
+ 
+ -}
+@@ -51,6 +53,13 @@
+ -- | Decompresses a lazy bytestring, throwing decoding errors using
+ -- 'throwError'.
+ decompressZlib :: (MonadError e m, Error e) => BL.ByteString -> m BL.ByteString
++#if MIN_VERSION_zlib(0, 6, 0)
++decompressZlib = I.foldDecompressStreamWithInput
++                   (liftM . BL.chunk)
++                   return
++                   (throwError . strMsg . (++)"Zlib: " . show)
++                   $ I.decompressST I.zlibFormat I.defaultDecompressParams
++#else
+ decompressZlib = I.foldDecompressStream
+                      (liftM . BL.chunk)
+                      (return mempty)
+@@ -58,3 +67,4 @@
+                  . I.decompressWithErrors
+                      I.zlibFormat
+                      I.defaultDecompressParams
++#endif

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