network 3.1.2.1 → 3.1.2.2
raw patch · 8 files changed
+37/−16 lines, 8 filesPVP: minor bump suggested
API additions: PVP suggests at least a minor version bump
API changes (from Hackage documentation)
+ Network.Socket: StructLinger :: CInt -> CInt -> StructLinger
+ Network.Socket: [sl_linger] :: StructLinger -> CInt
+ Network.Socket: [sl_onoff] :: StructLinger -> CInt
+ Network.Socket: data StructLinger
Files
- CHANGELOG.md +9/−0
- Network/Socket.hs +1/−0
- Network/Socket/Options.hsc +11/−1
- Network/Socket/Posix/Cmsg.hsc +2/−2
- README.md +2/−1
- configure +9/−9
- network.cabal +2/−2
- tests/Network/SocketSpec.hs +1/−1
CHANGELOG.md view
@@ -1,3 +1,12 @@+## Version 3.1.2.2++* Allow bytestring 0.11+ [#490](https://github.com/haskell/network/pull/490)+* Export StructLinger+ [#491](https://github.com/haskell/network/pull/491)+* Fix a couple of broken tests on OpenBSD+ [#498](https://github.com/haskell/network/pull/498)+ ## Version 3.1.2.1 * Increasing base lower bound to 4.9.
Network/Socket.hs view
@@ -142,6 +142,7 @@ ,UseLoopBack,UserTimeout,IPv6Only ,RecvIPv4TTL,RecvIPv4TOS,RecvIPv4PktInfo ,RecvIPv6HopLimit,RecvIPv6TClass,RecvIPv6PktInfo)+ , StructLinger (..) , isSupportedSocketOption , whenSupported , getSocketOption
Network/Socket/Options.hsc view
@@ -25,6 +25,7 @@ , setSocketOption , getSockOpt , setSockOpt+ , StructLinger (..) ) where import qualified Text.Read as P@@ -313,7 +314,16 @@ {-# COMPLETE CustomSockOpt #-} #endif #ifdef SO_LINGER-data StructLinger = StructLinger CInt CInt+-- | Low level 'SO_LINBER' option value, which can be used with 'setSockOpt'.+--+data StructLinger = StructLinger {+ -- | Set the linger option on.+ sl_onoff :: CInt,++ -- | Linger timeout.+ sl_linger :: CInt+ }+ deriving (Eq, Ord, Show) instance Storable StructLinger where sizeOf _ = (#const sizeof(struct linger))
Network/Socket/Posix/Cmsg.hsc view
@@ -44,7 +44,7 @@ -- | The identifier for 'IPv4TTL'. pattern CmsgIdIPv4TTL :: CmsgId-#if defined(darwin_HOST_OS) || defined(freebsd_HOST_OS)+#if defined(darwin_HOST_OS) || defined(freebsd_HOST_OS) || defined(openbsd_HOST_OS) pattern CmsgIdIPv4TTL = CmsgId (#const IPPROTO_IP) (#const IP_RECVTTL) #else pattern CmsgIdIPv4TTL = CmsgId (#const IPPROTO_IP) (#const IP_TTL)@@ -131,7 +131,7 @@ ---------------------------------------------------------------- -- | Time to live of IPv4.-#if defined(darwin_HOST_OS) || defined(freebsd_HOST_OS)+#if defined(darwin_HOST_OS) || defined(freebsd_HOST_OS) || defined(openbsd_HOST_OS) newtype IPv4TTL = IPv4TTL CChar deriving (Eq, Show, Storable) #else newtype IPv4TTL = IPv4TTL CInt deriving (Eq, Show, Storable)
README.md view
@@ -1,4 +1,5 @@-# [`network`](http://hackage.haskell.org/package/network) [](https://travis-ci.org/haskell/network) [](https://ci.appveyor.com/project/eborden/network/branch/master)++# [`network`](http://hackage.haskell.org/package/network) To build this package directly from git, you must run `autoreconf -i`. And then use `cabal configure; cabal build` or `stack build`.
configure view
@@ -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.1.0.+# Generated by GNU Autoconf 2.69 for Haskell network package 3.1.2.1. # # Report bugs to <libraries@haskell.org>. #@@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Haskell network package' PACKAGE_TARNAME='network'-PACKAGE_VERSION='3.1.1.0'-PACKAGE_STRING='Haskell network package 3.1.1.0'+PACKAGE_VERSION='3.1.2.1'+PACKAGE_STRING='Haskell network package 3.1.2.1' PACKAGE_BUGREPORT='libraries@haskell.org' PACKAGE_URL='' @@ -1234,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.1.0 to adapt to many kinds of systems.+\`configure' configures Haskell network package 3.1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1299,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.1.0:";;+ short | recursive ) echo "Configuration of Haskell network package 3.1.2.1:";; esac cat <<\_ACEOF @@ -1384,7 +1384,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF-Haskell network package configure 3.1.1.0+Haskell network package configure 3.1.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc.@@ -1910,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.1.0, which was+It was created by Haskell network package $as_me 3.1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@@@ -4417,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.1.0, which was+This file was extended by Haskell network package $as_me 3.1.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES@@ -4470,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.1.0+Haskell network package config.status 3.1.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
network.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.18 name: network-version: 3.1.2.1+version: 3.1.2.2 license: BSD3 license-file: LICENSE maintainer: Kazu Yamamoto, Evan Borden@@ -88,7 +88,7 @@ build-depends: base >= 4.9 && < 5,- bytestring == 0.10.*,+ bytestring >= 0.10 && < 0.12, deepseq, directory
tests/Network/SocketSpec.hs view
@@ -131,7 +131,7 @@ #if defined(mingw32_HOST_OS) let lpdevname = "loopback_0"-#elif defined(darwin_HOST_OS) || defined(freebsd_HOST_OS)+#elif defined(darwin_HOST_OS) || defined(freebsd_HOST_OS) || defined(openbsd_HOST_OS) let lpdevname = "lo0" #else let lpdevname = "lo"