HaskellNet-SSL 0.2.1 → 0.2.2

raw patch · 4 files changed

+28/−14 lines, 4 filesdep −tls-extradep ~HaskellNetdep ~connectiondep ~network

Dependencies removed: tls-extra

Dependency ranges changed: HaskellNet, connection, network, tls

Files

• HaskellNet-SSL.cabal +5/−6
• src/Network/HaskellNet/IMAP/SSL.hs +6/−2
• src/Network/HaskellNet/POP3/SSL.hs +6/−2
• src/Network/HaskellNet/SMTP/SSL.hs +11/−4

@@ -1,6 +1,6 @@ name:                HaskellNet-SSL synopsis:            Helpers to connect to SSL/TLS mail servers with HaskellNet-version:             0.2.1+version:             0.2.2 description:         This package ties together the HaskellNet and connection                      packages to make it easy to open IMAP and SMTP connections                      over SSL.@@ -28,10 +28,9 @@                        Network.HaskellNet.SSL   other-modules:       Network.HaskellNet.SSL.Internal   build-depends:       base >= 4 && < 5,-                       HaskellNet >= 0.3.1,-                       tls >= 1.1.2,-                       tls-extra >= 0.6.1,-                       connection >= 0.1.3,-                       network >= 2.3,+                       HaskellNet == 0.3.*,+                       tls == 1.1.*,+                       connection == 0.1.*,+                       network == 2.4.*,                        bytestring,                        data-default

@@ -2,6 +2,8 @@     ( -- * Establishing connection       connectIMAPSSL     , connectIMAPSSLWithSettings+      -- * Settings+    , defaultSettingsIMAPSSL     ) where  import Network.HaskellNet.IMAP.Connection@@ -11,8 +13,10 @@ import Network.HaskellNet.SSL.Internal  connectIMAPSSL :: String -> IO IMAPConnection-connectIMAPSSL hostname = connectIMAPSSLWithSettings hostname cfg-  where cfg = defaultSettingsWithPort 993+connectIMAPSSL hostname = connectIMAPSSLWithSettings hostname defaultSettingsIMAPSSL  connectIMAPSSLWithSettings :: String -> Settings -> IO IMAPConnection connectIMAPSSLWithSettings hostname cfg = connectSSL hostname cfg >>= connectStream++defaultSettingsIMAPSSL :: Settings+defaultSettingsIMAPSSL = defaultSettingsWithPort 993

@@ -2,6 +2,8 @@     ( -- * Establishing connection       connectPop3SSL     , connectPop3SSLWithSettings+      -- * Settings+    , defaultSettingsPop3SSL     ) where  import Network.HaskellNet.POP3.Connection@@ -11,8 +13,10 @@ import Network.HaskellNet.SSL.Internal  connectPop3SSL :: String -> IO POP3Connection-connectPop3SSL hostname = connectPop3SSLWithSettings hostname cfg-  where cfg = defaultSettingsWithPort 995+connectPop3SSL hostname = connectPop3SSLWithSettings hostname defaultSettingsPop3SSL  connectPop3SSLWithSettings :: String -> Settings -> IO POP3Connection connectPop3SSLWithSettings hostname cfg = connectSSL hostname cfg >>= connectStream++defaultSettingsPop3SSL :: Settings+defaultSettingsPop3SSL = defaultSettingsWithPort 995

@@ -9,6 +9,9 @@     , doSMTPSSLWithSettings     , doSMTPSTARTTLS     , doSMTPSTARTTLSWithSettings+      -- * Settings+    , defaultSettingsSMTPSSL+    , defaultSettingsSMTPSTARTTLS     ) where  import Network.HaskellNet.SMTP@@ -26,15 +29,13 @@ import Data.IORef  connectSMTPSSL :: String -> IO SMTPConnection-connectSMTPSSL hostname = connectSMTPSSLWithSettings hostname cfg-  where cfg = defaultSettingsWithPort 465+connectSMTPSSL hostname = connectSMTPSSLWithSettings hostname defaultSettingsSMTPSSL  connectSMTPSSLWithSettings :: String -> Settings -> IO SMTPConnection connectSMTPSSLWithSettings hostname cfg = connectSSL hostname cfg >>= connectStream  connectSMTPSTARTTLS :: String -> IO SMTPConnection-connectSMTPSTARTTLS hostname = connectSMTPSTARTTLSWithSettings hostname cfg-  where cfg = defaultSettingsWithPort 587+connectSMTPSTARTTLS hostname = connectSMTPSTARTTLSWithSettings hostname defaultSettingsSMTPSTARTTLS  connectSMTPSTARTTLSWithSettings :: String -> Settings -> IO SMTPConnection connectSMTPSTARTTLSWithSettings hostname cfg = connectSTARTTLS hostname cfg >>= connectStream@@ -89,3 +90,9 @@  doSMTPSTARTTLSWithSettings :: String -> Settings -> (SMTPConnection -> IO a) -> IO a doSMTPSTARTTLSWithSettings host port = bracketSMTP $ connectSMTPSTARTTLSWithSettings host port++defaultSettingsSMTPSSL :: Settings+defaultSettingsSMTPSSL = defaultSettingsWithPort 465++defaultSettingsSMTPSTARTTLS :: Settings+defaultSettingsSMTPSTARTTLS = defaultSettingsWithPort 587