diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -## Unreleased +## Version 3.1.2.1 + +* Increasing base lower bound to 4.9. + [#473](https://github.com/haskell/network/pull/473) +* Suppressing errors from removeFile in UNIX bind. + [#478](https://github.com/haskell/network/pull/478) +* Restoring UNIX stub functions on Windows. + [#489](https://github.com/haskell/network/pull/489) ## Version 3.1.2.0 diff --git a/Network/Socket.hs b/Network/Socket.hs --- a/Network/Socket.hs +++ b/Network/Socket.hs @@ -208,14 +208,12 @@ , socketPortSafe , socketPort -#if !defined(mingw32_HOST_OS) -- * UNIX-domain socket , isUnixDomainSocketAvailable , socketPair , sendFd , recvFd , getPeerCredential -#endif -- * Name information , getNameInfo @@ -252,7 +250,7 @@ , filterCmsg , decodeCmsg , encodeCmsg - -- ** Class and yypes for control message + -- ** Class and types for control message , ControlMessage(..) , IPv4TTL(..) , IPv6HopLimit(..) @@ -278,9 +276,9 @@ import Network.Socket.SockAddr import Network.Socket.Syscall hiding (connect, bind, accept) import Network.Socket.Types +import Network.Socket.Unix #if !defined(mingw32_HOST_OS) import Network.Socket.Posix.Cmsg -import Network.Socket.Unix #else import Network.Socket.Win32.Cmsg #endif diff --git a/Network/Socket/Posix/Cmsg.hsc b/Network/Socket/Posix/Cmsg.hsc --- a/Network/Socket/Posix/Cmsg.hsc +++ b/Network/Socket/Posix/Cmsg.hsc @@ -253,5 +253,3 @@ where defname = "CmsgId" def = defRead defname (uncurry CmsgId) readIntInt - - diff --git a/Network/Socket/SockAddr.hs b/Network/Socket/SockAddr.hs --- a/Network/Socket/SockAddr.hs +++ b/Network/Socket/SockAddr.hs @@ -61,7 +61,7 @@ Left e2 | not (isDoesNotExistError e2) -> throwIO (e2 :: IOException) _ -> do -- socket not actually in use, remove it and retry bind - removeFile p + void (try $ removeFile p :: IO (Either IOError ())) G.bind s a _ -> G.bind s a diff --git a/Network/Socket/Unix.hsc b/Network/Socket/Unix.hsc --- a/Network/Socket/Unix.hsc +++ b/Network/Socket/Unix.hsc @@ -17,7 +17,9 @@ import Network.Socket.Buffer import Network.Socket.Imports +#if !defined(mingw32_HOST_OS) import Network.Socket.Posix.Cmsg +#endif import Network.Socket.Types #if defined(HAVE_GETPEEREID) diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ The `network` package support [3 major versions of GHC](https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/intro.html#ghc-version-numbering-policy) only. This means that the current stable version and two previous stable versions are supported. +However, all GHC 8.x are supported currently. ### Windows diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Haskell network package 3.1.0.0. +# Generated by GNU Autoconf 2.69 for Haskell network package 3.1.1.0. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Haskell network package' PACKAGE_TARNAME='network' -PACKAGE_VERSION='3.1.0.0' -PACKAGE_STRING='Haskell network package 3.1.0.0' +PACKAGE_VERSION='3.1.1.0' +PACKAGE_STRING='Haskell network package 3.1.1.0' PACKAGE_BUGREPORT='libraries@haskell.org' PACKAGE_URL='' @@ -661,7 +661,6 @@ docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -733,7 +732,6 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -986,15 +984,6 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1132,7 +1121,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1245,7 +1234,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Haskell network package 3.1.0.0 to adapt to many kinds of systems. +\`configure' configures Haskell network package 3.1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1285,7 +1274,6 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1311,7 +1299,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Haskell network package 3.1.0.0:";; + short | recursive ) echo "Configuration of Haskell network package 3.1.1.0:";; esac cat <<\_ACEOF @@ -1396,7 +1384,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Haskell network package configure 3.1.0.0 +Haskell network package configure 3.1.1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1922,7 +1910,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Haskell network package $as_me 3.1.0.0, which was +It was created by Haskell network package $as_me 3.1.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4429,7 +4417,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Haskell network package $as_me 3.1.0.0, which was +This file was extended by Haskell network package $as_me 3.1.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4482,7 +4470,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Haskell network package config.status 3.1.0.0 +Haskell network package config.status 3.1.1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([Haskell network package], - [3.1.2.0], + [3.1.2.1], [libraries@haskell.org], [network]) diff --git a/network.cabal b/network.cabal --- a/network.cabal +++ b/network.cabal @@ -1,6 +1,6 @@ cabal-version: 1.18 name: network -version: 3.1.2.0 +version: 3.1.2.1 license: BSD3 license-file: LICENSE maintainer: Kazu Yamamoto, Evan Borden @@ -84,9 +84,10 @@ Network.Socket.SockAddr Network.Socket.Syscall Network.Socket.Types + Network.Socket.Unix build-depends: - base >= 4.7 && < 5, + base >= 4.9 && < 5, bytestring == 0.10.*, deepseq, directory @@ -107,7 +108,6 @@ Network.Socket.Posix.CmsgHdr Network.Socket.Posix.IOVec Network.Socket.Posix.MsgHdr - Network.Socket.Unix if os(solaris) extra-libraries: nsl, socket @@ -144,7 +144,7 @@ -- both packages to a small enough version range. build-tools: hspec-discover >= 2.6 build-depends: - base >= 4.7 && < 5, + base >= 4.9 && < 5, bytestring, directory, HUnit, @@ -161,7 +161,7 @@ type: exitcode-stdio-1.0 build-depends: - base >= 4.7 && < 5, + base >= 4.9 && < 5, doctest >= 0.10.1, network diff --git a/tests/Network/SocketSpec.hs b/tests/Network/SocketSpec.hs --- a/tests/Network/SocketSpec.hs +++ b/tests/Network/SocketSpec.hs @@ -34,7 +34,7 @@ return sock it "fails to connect and throws an IOException" $ do - connect' (8080 :: Int) `shouldThrow` anyIOException + connect' (8003 :: Int) `shouldThrow` anyIOException it "successfully connects to a socket with no exception" $ do withPort $ \portVar -> test (tcp serverAddr return portVar)