diff --git a/ghc-network.changes b/ghc-network.changes index ecdb264..72f8dbd 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Thu Oct 4 09:42:52 UTC 2018 - psimons@suse.com + +- Update network to version 2.7.0.2. + * Removing withMVar to avoid the deadlock between "accept" and "close" + [#330](https://github.com/haskell/network/pull/330) + * "close" does not throw exceptions. A new API: "close'" throws + exceptions when necessary. + [#337](https://github.com/haskell/network/pull/337) + * Fixing the hang of lazy sendAll. + [#340](https://github.com/haskell/network/pull/340) + * Installing NetDef.h (#334) + [#334](https://github.com/haskell/network/pull/334) + * A new API: socketPortSafe. + [#319](https://github.com/haskell/network/pull/319) + * Fixing a drain bug of sendAll. + [#320](https://github.com/haskell/network/pull/320) + * Porting the new CALLCONV convention from master. + [#313](https://github.com/haskell/network/pull/313) + * Withdrawing the deprecations of packFamily and unpackFamily. + [#324](https://github.com/haskell/network/pull/324) + * Obsoleting the Network module. + * Obsoleting the Network.BSD module. + * Obsoleting APIs: MkSocket, htonl, ntohl, + getPeerCred, getPeerEid, + send, sendTo, recv, recvFrom, recvLen, + inet_addr, inet_ntoa, + isConnected, isBound, isListening, isReadable, isWritable, + aNY_PORT, iNADDR_ANY, iN6ADDR_ANY, sOMAXCONN, + sOL_SOCKET, sCM_RIGHTS, + packFamily, unpackFamily, packSocketType + * Do not closeFd within sendFd. + [#271](https://github.com/haskell/network/pull/271) + * Exporting ifNameToIndex and ifIndexToName from Network.Socket. + * New APIs: setCloseOnExecIfNeeded, getCloseOnExec and getNonBlock + * New APIs: isUnixDomainSocketAvailable and getPeerCredential + * socketPair, sendFd and recvFd are exported even on Windows. + ------------------------------------------------------------------- Wed Jul 18 14:26:33 UTC 2018 - psimons@suse.com diff --git a/ghc-network.spec b/ghc-network.spec index 3495dfa..60bd2cd 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -12,26 +12,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global pkg_name network %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.6.3.6 +Version: 2.7.0.2 Release: 0 Summary: Low-level networking interface License: BSD-3-Clause Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-directory-devel BuildRequires: ghc-doctest-devel BuildRequires: ghc-hspec-devel %endif @@ -58,6 +60,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/network-2.6.3.6.tar.gz b/network-2.6.3.6.tar.gz deleted file mode 100644 index a958e96..0000000 --- a/network-2.6.3.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bde0609ab39441daa7da376c09f501e2913305ef64be5d245c45ba84e5515a5 -size 121002 diff --git a/network-2.7.0.2.tar.gz b/network-2.7.0.2.tar.gz new file mode 100644 index 0000000..0a2fa4d --- /dev/null +++ b/network-2.7.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e0b1d86a3377512d8169865ad0a66e8092691fa460993ed7fe1057e3e674dbb +size 124420 diff --git a/network.cabal b/network.cabal new file mode 100644 index 0000000..0b9d4df --- /dev/null +++ b/network.cabal @@ -0,0 +1,106 @@ +name: network +version: 2.7.0.2 +x-revision: 2 +license: BSD3 +license-file: LICENSE +maintainer: Kazu Yamamoto, Evan Borden +synopsis: Low-level networking interface +description: + This package provides a low-level networking interface. + . + In network-2.6 the @Network.URI@ module was split off into its own + package, network-uri-2.6. If you're using the @Network.URI@ module + you can automatically get it from the right package by adding this + to your .cabal file: + . + > library + > build-depends: network-uri-flag +category: Network +build-type: Configure +cabal-version: >=1.8 +extra-tmp-files: + config.log config.status autom4te.cache network.buildinfo + include/HsNetworkConfig.h +extra-source-files: + README.md CHANGELOG.md + examples/*.hs tests/*.hs config.guess config.sub install-sh + configure.ac configure network.buildinfo.in + include/HsNetworkConfig.h.in include/HsNet.h include/HsNetDef.h + -- C sources only used on some systems + cbits/ancilData.c cbits/asyncAccept.c cbits/initWinSock.c + cbits/winSockErr.c +homepage: https://github.com/haskell/network +bug-reports: https://github.com/haskell/network/issues +tested-with: GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + +library + exposed-modules: + Network + Network.BSD + Network.Socket + Network.Socket.ByteString + Network.Socket.ByteString.Lazy + Network.Socket.Internal + other-modules: + Network.Socket.ByteString.Internal + Network.Socket.Types + + if !os(windows) + other-modules: + Network.Socket.ByteString.IOVec + Network.Socket.ByteString.Lazy.Posix + Network.Socket.ByteString.MsgHdr + if os(windows) + other-modules: + Network.Socket.ByteString.Lazy.Windows + + build-depends: + base >= 4.7 && < 5, + bytestring == 0.10.* + + if !os(windows) + build-depends: + unix >= 2 + + extensions: + CPP, DeriveDataTypeable, ForeignFunctionInterface, TypeSynonymInstances + include-dirs: include + includes: HsNet.h HsNetDef.h + install-includes: HsNet.h HsNetDef.h + c-sources: cbits/HsNet.c + ghc-options: -Wall -fwarn-tabs + +test-suite spec + hs-source-dirs: tests + main-is: Spec.hs + other-modules: RegressionSpec + SimpleSpec + type: exitcode-stdio-1.0 + ghc-options: -Wall -threaded + build-depends: + base < 5, + bytestring, + directory, + HUnit, + network, + hspec + +test-suite doctest + hs-source-dirs: tests + main-is: doctests.hs + type: exitcode-stdio-1.0 + + build-depends: + base < 5, + doctest >= 0.10.1 + + ghc-options: -Wall + +source-repository head + type: git + location: git://github.com/haskell/network.git