dns 1.4.4 → 1.4.5

raw patch · 3 files changed

+6/−10 lines, 3 filesdep ~iproutePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: iproute

API changes (from Hackage documentation)

Files

• Network/DNS/Decode.hs +2/−6
• Network/DNS/Encode.hs +2/−2
• dns.cabal +2/−2

@@ -16,7 +16,7 @@ import qualified Data.ByteString.Lazy as BL import Data.Conduit (($$), Source) import Data.Conduit.Network (sourceSocket)-import Data.IP (toIPv4, toIPv6)+import Data.IP (toIPv4, toIPv6b) import Data.Traversable (traverse) import Data.Typeable (Typeable) import Network (Socket)@@ -157,11 +157,7 @@   where     ignoreLength = BS.tail decodeRData A len  = (RD_A . toIPv4) <$> getNBytes len-decodeRData AAAA len  = (RD_AAAA . toIPv6 . combine) <$> getNBytes len-  where-    combine [] = []-    combine [_] = fail "combine"-    combine (a:b:cs) =  a * 256 + b : combine cs+decodeRData AAAA len  = (RD_AAAA . toIPv6b) <$> getNBytes len decodeRData SOA _ = RD_SOA <$> decodeDomain                            <*> decodeDomain                            <*> decodeSerial

@@ -12,7 +12,7 @@ import Data.Bits ((.|.), bit, shiftL) import qualified Data.ByteString.Char8 as BS import Data.ByteString.Lazy.Char8 (ByteString)-import Data.IP (fromIPv4, fromIPv6)+import Data.IP (fromIPv4, fromIPv6b) import Data.Monoid (Monoid, mappend, mconcat) import Network.DNS.Internal import Network.DNS.StateBinary@@ -121,7 +121,7 @@ encodeRDATA :: RDATA -> SPut encodeRDATA rd = case rd of     (RD_A ip)          -> mconcat $ map putInt8 (fromIPv4 ip)-    (RD_AAAA ip)       -> mconcat $ map putInt16 (fromIPv6 ip)+    (RD_AAAA ip)       -> mconcat $ map putInt8 (fromIPv6b ip)     (RD_NS dom)        -> encodeDomain dom     (RD_CNAME dom)     -> encodeDomain dom     (RD_DNAME dom)     -> encodeDomain dom

@@ -1,5 +1,5 @@ Name:                   dns-Version:                1.4.4+Version:                1.4.5 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -33,7 +33,7 @@                       , conduit >= 1.1                       , conduit-extra >= 1.1                       , containers-                      , iproute >= 1.2.4+                      , iproute >= 1.3.2                       , mtl                       , network >= 2.3                       , random