diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ -Welcome to Pontarius XMPP! -========================== +Pontarius XMPP +============== -Pontarius XMPP is an active work in progress to build a Haskell XMPP client -library that implements the capabilities of [RFC 6120 -("XMPP CORE")](http://tools.ietf.org/html/rfc6120), [RFC 6121 ("XMPP -IM")](http://tools.ietf.org/html/rfc6121), and [RFC 6122 ("XMPP -ADDR")](http://tools.ietf.org/html/rfc6122). Pontarius XMPP is part of [the -Pontarius project](http://www.pontarius.org/), an effort to produce free and -open source, uncentralized, and privacy-aware software solutions. +Pontarius XMPP is a Haskell XMPP client library that implements the capabilities +of [RFC 6120 ("XMPP CORE")](http://tools.ietf.org/html/rfc6120), [RFC 6121 +("XMPP IM")](http://tools.ietf.org/html/rfc6121), and [RFC 6122 ("XMPP +ADDR")](http://tools.ietf.org/html/rfc6122). Pontarius XMPP was part of the +Pontarius project, an effort to produce free and open source, uncentralized, and +privacy-aware software solutions. While in alpha, Pontarius XMPP works quite well and fulfills most requirements of the RFCs. @@ -111,11 +110,3 @@ For a public domain example of a simple Pontarius XMPP (Cabal) project, refer to the examples/echoclient directory. - -More information ----------------- - -Feel free to [contact Jon Kristensen](http://www.jonkri.com/contact/) if you -have any questions or comments. - -You are also welcome to join the #pontarius IRC channel at Freenode. diff --git a/pontarius-xmpp.cabal b/pontarius-xmpp.cabal --- a/pontarius-xmpp.cabal +++ b/pontarius-xmpp.cabal @@ -1,23 +1,23 @@ Name: pontarius-xmpp -Version: 0.5.6 -Cabal-Version: >= 1.9.2 +Version: 0.5.6.1 +Cabal-Version: >= 1.10 Build-Type: Custom License: BSD3 License-File: LICENSE.md Copyright: Dmitry Astapov, Pierre Kovalev, Mahdi Abdinejadi, Jon Kristensen, - IETF Trust, Philipp Balzarek + IETF Trust, Philipp Balzarek, Sergey Alirzaev Author: Philipp Balzarek -Maintainer: info@jonkri.com +Maintainer: l29ah@cock.li Stability: alpha -Homepage: https://github.com/pontarius/pontarius-xmpp/ -Bug-Reports: https://github.com/pontarius/pontarius-xmpp/issues/ +Homepage: https://github.com/l29ah/pontarius-xmpp/ +Bug-Reports: https://github.com/l29ah/pontarius-xmpp/issues/ Synopsis: An XMPP client library Description: Pontarius XMPP is a work in progress implementation of RFC 6120 ("XMPP CORE"), RFC 6121 ("XMPP IM"), and RFC 6122 ("XMPP ADDR"). While in alpha, Pontarius XMPP works quite well and fulfills most requirements of the RFCs. Category: Network -Tested-With: GHC ==7.10.1 +Tested-With: GHC == 8.6.5 Extra-Source-Files: README.md , ChangeLog.md @@ -120,6 +120,7 @@ if flag(with-th) && impl(ghc >= 7.6.1) CPP-Options: -DWITH_TEMPLATE_HASKELL GHC-Options: -Wall -fwarn-tabs + default-language: Haskell2010 Test-Suite tests Type: exitcode-stdio-1.0 @@ -163,6 +164,7 @@ , Tests.Picklers , Tests.Stream ghc-options: -Wall -O2 -fno-warn-orphans + default-language: Haskell2010 Test-Suite doctest Type: exitcode-stdio-1.0 @@ -176,6 +178,7 @@ , QuickCheck , derive , quickcheck-instances + default-language: Haskell2010 Test-Suite runtests Type: exitcode-stdio-1.0 @@ -204,6 +207,7 @@ , tasty , tasty-hunit , tls + default-language: Haskell2010 benchmark benchmarks type: exitcode-stdio-1.0 @@ -213,7 +217,13 @@ hs-source-dirs: benchmarks main-is: Bench.hs ghc-options: -O2 + default-language: Haskell2010 Source-Repository head Type: git - Location: git://github.com/pontarius/pontarius-xmpp.git + Location: https://github.com/l29ah/pontarius-xmpp.git + +Source-Repository this + Type: git + Location: https://github.com/l29ah/pontarius-xmpp.git + Tag: 0.5.6.1 diff --git a/source/Network/Xmpp/Concurrent.hs b/source/Network/Xmpp/Concurrent.hs --- a/source/Network/Xmpp/Concurrent.hs +++ b/source/Network/Xmpp/Concurrent.hs @@ -30,7 +30,7 @@ import Data.Maybe import Data.Text as Text import Data.XML.Types -import Network +import Network.Socket import Network.Xmpp.Concurrent.Basic import Network.Xmpp.Concurrent.IQ import Network.Xmpp.Concurrent.Message diff --git a/source/Network/Xmpp/Concurrent/Types.hs b/source/Network/Xmpp/Concurrent/Types.hs --- a/source/Network/Xmpp/Concurrent/Types.hs +++ b/source/Network/Xmpp/Concurrent/Types.hs @@ -15,7 +15,7 @@ import qualified Data.Text as Text import Data.Typeable import Data.XML.Types (Element) -import Network +import Network.Socket import Network.Xmpp.IM.Roster.Types import Network.Xmpp.IM.PresenceTracker.Types import Network.Xmpp.Sasl.Types diff --git a/source/Network/Xmpp/Stream.hs b/source/Network/Xmpp/Stream.hs --- a/source/Network/Xmpp/Stream.hs +++ b/source/Network/Xmpp/Stream.hs @@ -37,7 +37,7 @@ import Data.XML.Pickle import Data.XML.Types import qualified GHC.IO.Exception as GIE -import Network +import Network.Socket hiding (Stream,connect) import Network.DNS hiding (encode, lookup) import qualified Network.Socket as S import Network.Socket (AddrInfo) @@ -654,17 +654,6 @@ "The hostname could not be validated." throwError XmppIllegalTcpDetails where for = flip fmap - -showPort :: PortID -> String -#if MIN_VERSION_network(2, 4, 1) -showPort = show -#else -showPort (PortNumber x) = "PortNumber " ++ show x -showPort (Service x) = "Service " ++ show x -#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__) -showPort (UnixSocket x) = "UnixSocket " ++ show x -#endif -#endif connectHandle :: AddrInfo -> IO Handle connectHandle addrInfo = do diff --git a/source/Network/Xmpp/Types.hs b/source/Network/Xmpp/Types.hs --- a/source/Network/Xmpp/Types.hs +++ b/source/Network/Xmpp/Types.hs @@ -108,7 +108,7 @@ import Language.Haskell.TH.Quote import qualified Language.Haskell.TH.Syntax as TH #endif -import Network +import Network.Socket import Network.DNS import Network.TLS hiding (Version, HostName) import Network.TLS.Extra @@ -945,9 +945,9 @@ case jidFromText t of Nothing -> fail $ "Could not parse JID " ++ s Just j -> TH.lift j - , quotePat = fail "Jid patterns aren't implemented" - , quoteType = fail "jid QQ can't be used in type context" - , quoteDec = fail "jid QQ can't be used in declaration context" + , quotePat = error "Jid patterns aren't implemented" + , quoteType = error "jid QQ can't be used in type context" + , quoteDec = error "jid QQ can't be used in declaration context" } -- | Synonym for 'jid' @@ -1000,11 +1000,11 @@ map textE (subtags lt)) |] - , quotePat = fail $ "LanguageTag patterns aren't" + , quotePat = error $ "LanguageTag patterns aren't" ++ " implemented" - , quoteType = fail $ "LanguageTag QQ can't be used" + , quoteType = error $ "LanguageTag QQ can't be used" ++ " in type context" - , quoteDec = fail $ "LanguageTag QQ can't be used" + , quoteDec = error $ "LanguageTag QQ can't be used" ++ " in declaration context" } diff --git a/tests/Doctest.hs b/tests/Doctest.hs --- a/tests/Doctest.hs +++ b/tests/Doctest.hs @@ -21,7 +21,6 @@ : "-XQuasiQuotes" : "-XOverloadedStrings" : "-DWITH_TEMPLATE_HASKELL" - : "-optP-includedist/build/autogen/cabal_macros.h" : map ("-package="++) deps ++ sources diff --git a/tests/Run/SendReceive.hs b/tests/Run/SendReceive.hs --- a/tests/Run/SendReceive.hs +++ b/tests/Run/SendReceive.hs @@ -13,7 +13,7 @@ import qualified Data.Configurator.Types as Conf import Data.Maybe import qualified Data.Text as Text -import Network +import Network.Socket import Network.Xmpp import System.Exit import System.Log.Logger diff --git a/tests/Tests/Arbitrary/Xmpp.hs b/tests/Tests/Arbitrary/Xmpp.hs --- a/tests/Tests/Arbitrary/Xmpp.hs +++ b/tests/Tests/Arbitrary/Xmpp.hs @@ -28,7 +28,7 @@ instance Arbitrary Jid where arbitrary = do - Just jid <- tryJid `suchThat` isJust + ~(Just jid) <- tryJid `suchThat` isJust return jid where tryJid = jidFromTexts <$> maybeGen (genString nodeprepProfile False)