diff --git a/ghc-network.changes b/ghc-network.changes index 4a01e36..5efa9cb 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon May 14 17:02:11 UTC 2018 - psimons@suse.com + +- Update network to version 2.6.3.5. + * Reverting "Do not closeFd within sendFd" + [#271](https://github.com/haskell/network/pull/271) + * Don't touch IPv6Only when running on OpenBSD + [#227](https://github.com/haskell/network/pull/227) + * Do not closeFd within sendFd + [#271](https://github.com/haskell/network/pull/271) + * Updating examples and docs. + * Adds a function to show the defaultHints without reading their undefined fields + [#291](https://github.com/haskell/network/pull/291) + * Improve exception error messages for getAddrInfo and getNameInfo + [#289](https://github.com/haskell/network/pull/289) + * Deprecating SockAddrCan. + ------------------------------------------------------------------- Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com diff --git a/ghc-network.spec b/ghc-network.spec index a596a3d..901c0eb 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,13 @@ %global pkg_name network %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.6.3.2 +Version: 2.6.3.5 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros @@ -34,8 +33,7 @@ BuildRequires: ghc-unix-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-doctest-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-hspec-devel %endif %description @@ -45,12 +43,7 @@ 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: -> flag network-uri > description: Get Network.URI from the network-uri package -> default: True > > library > -- ... > if flag(network-uri) > build-depends: -network-uri >= 2.6, network >= 2.6 > else > build-depends: network-uri < 2.6, -network < 2.6 - -That is, get the module from either network < 2.6 or from network-uri >= 2.6. +> library > build-depends: network-uri-flag. %package devel Summary: Haskell %{pkg_name} library development files @@ -65,7 +58,6 @@ 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 @@ -83,7 +75,7 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %doc CHANGELOG.md README.md examples diff --git a/network-2.6.3.2.tar.gz b/network-2.6.3.2.tar.gz deleted file mode 100644 index be2197c..0000000 --- a/network-2.6.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:354477074eaf2c0e134f4a7ae17694ffc747d484133463e95fae57ecbe48c0b6 -size 122892 diff --git a/network-2.6.3.5.tar.gz b/network-2.6.3.5.tar.gz new file mode 100644 index 0000000..3d7943c --- /dev/null +++ b/network-2.6.3.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a18f6e4c930a4c4ebb7fea7d1fd7a6046564ee007104d0b845d5f71ccbe0441 +size 120972 diff --git a/network.cabal b/network.cabal deleted file mode 100644 index 32ce1da..0000000 --- a/network.cabal +++ /dev/null @@ -1,125 +0,0 @@ -name: network -version: 2.6.3.2 -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. - . - 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: - . - > flag network-uri - > description: Get Network.URI from the network-uri package - > default: True - > - > library - > -- ... - > if flag(network-uri) - > build-depends: network-uri >= 2.6, network >= 2.6 - > else - > build-depends: network-uri < 2.6, network < 2.6 - . - That is, get the module from either network < 2.6 or from - network-uri >= 2.6. -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 - -- 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.8.4, GHC == 7.10.1, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.0.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.6 && < 5, - bytestring < 0.11 - - if !os(windows) - build-depends: - unix >= 2 - - extensions: - CPP, DeriveDataTypeable, ForeignFunctionInterface, TypeSynonymInstances - include-dirs: include - includes: HsNet.h - install-includes: HsNet.h HsNetworkConfig.h - c-sources: cbits/HsNet.c - ghc-options: -Wall -fwarn-tabs - -test-suite simple - hs-source-dirs: tests - main-is: Simple.hs - type: exitcode-stdio-1.0 - - build-depends: - base < 5, - bytestring, - HUnit, - network, - test-framework, - test-framework-hunit - -test-suite regression - hs-source-dirs: tests - main-is: Regression.hs - type: exitcode-stdio-1.0 - - build-depends: - base < 5, - bytestring, - HUnit, - network, - test-framework, - test-framework-hunit - -- Some of the bugs only occur in the threaded RTS - ghc-options: -Wall -threaded - -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