From d1effa25bf2af3abb1cc68e3e558e9f45a2337ba Mon Sep 17 00:00:00 2001 From: ygale Date: Thu, 5 Dec 2019 11:15:32 +0200 Subject: [PATCH 1/3] Allow newer versions of network library --- HaskellNet-SSL.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HaskellNet-SSL.cabal b/HaskellNet-SSL.cabal index 88c245d..9da04b2 100644 --- a/HaskellNet-SSL.cabal +++ b/HaskellNet-SSL.cabal @@ -1,6 +1,6 @@ name: HaskellNet-SSL synopsis: Helpers to connect to SSL/TLS mail servers with HaskellNet -version: 0.3.4.1 +version: 0.3.4.2 description: This package ties together the HaskellNet and connection packages to make it easy to open IMAP and SMTP connections over SSL. @@ -44,6 +44,6 @@ library HaskellNet >= 0.3 && < 0.6, tls >= 1.2 && < 1.5, connection >= 0.2.7 && < 0.3, - network >= 2.4 && < 2.9, + network >= 2.4 && < 3.2, bytestring, data-default From eb43be063ec5946f816cc4045a8b548c5de2ff8c Mon Sep 17 00:00:00 2001 From: ygale Date: Thu, 5 Dec 2019 12:36:41 +0200 Subject: [PATCH 2/3] Also relax upper bounds on connection and tls. --- HaskellNet-SSL.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HaskellNet-SSL.cabal b/HaskellNet-SSL.cabal index 9da04b2..bedfae7 100644 --- a/HaskellNet-SSL.cabal +++ b/HaskellNet-SSL.cabal @@ -42,8 +42,8 @@ library else build-depends: base >= 4 && < 5, HaskellNet >= 0.3 && < 0.6, - tls >= 1.2 && < 1.5, - connection >= 0.2.7 && < 0.3, + tls >= 1.2 && < 1.6, + connection >= 0.2.7 && < 0.4, network >= 2.4 && < 3.2, bytestring, data-default From 5b4f4ab49a6321b57f6dbeba64a7f4bb8ffa5cbc Mon Sep 17 00:00:00 2001 From: Yitz Gale Date: Thu, 5 Dec 2019 16:07:27 +0200 Subject: [PATCH 3/3] Use network-bsd with network 3. --- HaskellNet-SSL.cabal | 13 ++++++++++--- src/Network/HaskellNet/SSL.hs | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/HaskellNet-SSL.cabal b/HaskellNet-SSL.cabal index bedfae7..86d6529 100644 --- a/HaskellNet-SSL.cabal +++ b/HaskellNet-SSL.cabal @@ -15,10 +15,14 @@ build-type: Simple cabal-version: >=1.8 data-files: README.md -Flag NoUpperBounds +flag NoUpperBounds Description: Removes upper bounds from all packages Default: False +flag network-bsd + description: Get Network.BSD from the network-bsd package + default: True + source-repository head type: git location: git://github.com/dpwright/HaskellNet-SSL.git @@ -36,7 +40,6 @@ library HaskellNet >= 0.3, tls >= 1.2, connection >= 0.2.7, - network >= 2.4, bytestring, data-default else @@ -44,6 +47,10 @@ library HaskellNet >= 0.3 && < 0.6, tls >= 1.2 && < 1.6, connection >= 0.2.7 && < 0.4, - network >= 2.4 && < 3.2, bytestring, data-default + if flag(network-bsd) + build-depends: network >= 3.0, + network-bsd >= 2.7 + else + build-depends: network >= 2.4 && < 3.0 diff --git a/src/Network/HaskellNet/SSL.hs b/src/Network/HaskellNet/SSL.hs index acb9b84..cb5e613 100644 --- a/src/Network/HaskellNet/SSL.hs +++ b/src/Network/HaskellNet/SSL.hs @@ -1,9 +1,14 @@ +{-# LANGUAGE CPP #-} module Network.HaskellNet.SSL ( Settings (..) , defaultSettingsWithPort ) where +#if MIN_VERSION_network(3,0,0) +import Network.Socket (PortNumber) +#else import Network.Socket.Internal (PortNumber) +#endif data Settings = Settings { sslPort :: PortNumber