diff --git a/ghc-network.changes b/ghc-network.changes index 188a1ac..bbbd134 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jun 16 08:26:55 UTC 2021 - psimons@suse.com + +- Update network to version 3.1.2.2. + ## 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) + ------------------------------------------------------------------- Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup diff --git a/ghc-network.spec b/ghc-network.spec index 6868722..96aad35 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name network %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.2.1 +Version: 3.1.2.2 Release: 0 Summary: Low-level networking interface License: BSD-3-Clause 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel @@ -72,7 +71,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/network-3.1.2.1.tar.gz b/network-3.1.2.1.tar.gz deleted file mode 100644 index b34b2f8..0000000 --- a/network-3.1.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a -size 136889 diff --git a/network-3.1.2.2.tar.gz b/network-3.1.2.2.tar.gz new file mode 100644 index 0000000..9d6fef2 --- /dev/null +++ b/network-3.1.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55012c0b22f9c7548b1f7b3bacc2c6ec7058c7f92238a69561528f1a0fa60eb6 +size 136999 diff --git a/network.cabal b/network.cabal deleted file mode 100644 index cd42d66..0000000 --- a/network.cabal +++ /dev/null @@ -1,173 +0,0 @@ -cabal-version: 1.18 -name: network -version: 3.1.2.1 -x-revision: 1 -license: BSD3 -license-file: LICENSE -maintainer: Kazu Yamamoto, Evan Borden -synopsis: Low-level networking interface -description: - This package provides a low-level networking interface. - . - === High-Level Packages - Other packages provide higher level interfaces: - . - * connection - * hookup - * network-simple - . - === Extended Packages - @network@ seeks to provide a cross-platform core for networking. As such some - APIs live in extended libraries. Packages in the @network@ ecosystem are - often prefixed with @network-@. - . - ==== @network-bsd@ - In @network-3.0.0.0@ the @Network.BSD@ module was split off into its own - package, @network-bsd-3.0.0.0@. - . - ==== @network-uri@ - 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 -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 - include/HsNetworkConfig.h.in include/HsNet.h include/HsNetDef.h - -- C sources only used on some systems - cbits/asyncAccept.c cbits/initWinSock.c - cbits/winSockErr.c cbits/cmsg.c -homepage: https://github.com/haskell/network -bug-reports: https://github.com/haskell/network/issues -tested-with: GHC == 8.0.2 - , GHC == 8.2.2 - , GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.3 - , GHC == 8.10.1 - -flag devel - description: using tests for developers - default: False - -library - default-language: Haskell2010 - exposed-modules: - Network.Socket - Network.Socket.Address - Network.Socket.ByteString - Network.Socket.ByteString.Lazy - Network.Socket.Internal - other-modules: - Network.Socket.Buffer - Network.Socket.ByteString.IO - Network.Socket.ByteString.Internal - Network.Socket.Cbits - Network.Socket.Fcntl - Network.Socket.Flag - Network.Socket.Handle - Network.Socket.If - Network.Socket.Imports - Network.Socket.Info - Network.Socket.Name - Network.Socket.Options - Network.Socket.ReadShow - Network.Socket.Shutdown - Network.Socket.SockAddr - Network.Socket.Syscall - Network.Socket.Types - Network.Socket.Unix - - build-depends: - base >= 4.9 && < 5, - bytestring >= 0.10 && < 0.12, - deepseq, - directory - - include-dirs: include - includes: HsNet.h HsNetDef.h alignment.h win32defs.h - install-includes: HsNet.h HsNetDef.h alignment.h win32defs.h - c-sources: cbits/HsNet.c cbits/cmsg.c - ghc-options: -Wall -fwarn-tabs - build-tools: hsc2hs - - - -- Add some platform specific stuff - if !os(windows) - other-modules: - Network.Socket.ByteString.Lazy.Posix - Network.Socket.Posix.Cmsg - Network.Socket.Posix.CmsgHdr - Network.Socket.Posix.IOVec - Network.Socket.Posix.MsgHdr - - if os(solaris) - extra-libraries: nsl, socket - - if os(windows) - other-modules: - Network.Socket.ByteString.Lazy.Windows - Network.Socket.Win32.Cmsg - Network.Socket.Win32.CmsgHdr - Network.Socket.Win32.WSABuf - Network.Socket.Win32.MsgHdr - c-sources: cbits/initWinSock.c, cbits/winSockErr.c, cbits/asyncAccept.c - extra-libraries: ws2_32, iphlpapi, mswsock - -- See https://github.com/haskell/network/pull/362 - if impl(ghc >= 7.10) - cpp-options: -D_WIN32_WINNT=0x0600 - cc-options: -D_WIN32_WINNT=0x0600 - -test-suite spec - default-language: Haskell2010 - hs-source-dirs: tests - main-is: Spec.hs - if flag(devel) - cpp-options: -DDEVELOPMENT - other-modules: - Network.Test.Common - Network.SocketSpec - Network.Socket.ByteStringSpec - Network.Socket.ByteString.LazySpec - type: exitcode-stdio-1.0 - ghc-options: -Wall -threaded - -- NB: make sure to versions of hspec and hspec-discover - -- that work together; easiest way is to constraint - -- both packages to a small enough version range. - build-tools: hspec-discover >= 2.6 - build-depends: - base >= 4.9 && < 5, - bytestring, - directory, - HUnit, - network, - temporary, - hspec >= 2.6, - QuickCheck - -test-suite doctests - buildable: False - default-language: Haskell2010 - hs-source-dirs: tests - main-is: doctests.hs - type: exitcode-stdio-1.0 - - build-depends: - base >= 4.9 && < 5, - doctest >= 0.10.1, - network - - ghc-options: -Wall - -source-repository head - type: git - location: git://github.com/haskell/network.git