From 73af6a14164a479ec71af3ab339fee6251010de2a6862e49bfc7d0fd0658516b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:11 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=70 --- ghc-network.changes | 71 +++++++++++++++++ ghc-network.spec | 33 +++++--- network-2.8.0.1.tar.gz | 3 - network-3.1.2.0.tar.gz | 3 + network.cabal | 173 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 271 insertions(+), 12 deletions(-) delete mode 100644 network-2.8.0.1.tar.gz create mode 100644 network-3.1.2.0.tar.gz create mode 100644 network.cabal diff --git a/ghc-network.changes b/ghc-network.changes index 56ff1f5..0c48629 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,74 @@ +------------------------------------------------------------------- +Mon Aug 31 09:34:30 UTC 2020 - psimons@suse.com + +- Update network to version 3.1.2.0 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Tue Aug 18 10:45:32 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Mon Aug 10 08:46:46 UTC 2020 - psimons@suse.com + +- Update network to version 3.1.2.0. + ## Unreleased + + ## Version 3.1.2.0 + + * Added `-f devel` for test cases that are known to fail. + [#471](https://github.com/haskell/network/pull/471) + * Improved precedence-compliant Read/Show instances. Verified via QuickCheck. + [#465](https://github.com/haskell/network/pull/465) + [#466](https://github.com/haskell/network/pull/466) + * Removed the racing graceful close implementation to avoid issues with `CLOSE_WAIT`. + [#460](https://github.com/haskell/network/pull/438) + * Gracefully handle binding of UNIX domain sockets. + [#460](https://github.com/haskell/network/pull/460) + * Replace Socket type and family with extensible `CInt` pattern and synonyms. + [#459](https://github.com/haskell/network/pull/459) + * Fixed race conditions in tests. + [#458](https://github.com/haskell/network/pull/458) + * Removed many legacy uses of `undefined`. + [#456](https://github.com/haskell/network/pull/456) + * Defined extensible `CustomSockOpt` via `ViewPatterns`. + [#455](https://github.com/haskell/network/pull/455) + * Defined `openSocket` in terms of `AddrInfo`. + [5b0987197fe2ed7beddd7b2096522d624e71151e](https://github.com/haskell/network/commit/5b0987197fe2ed7beddd7b2096522d624e71151e) + * Improved FreeBSD portability for Control Messages and tests + [#452](https://github.com/haskell/network/pull/452) + * Support `sendMsg` and `recvMsg` + [#433](https://github.com/haskell/network/pull/433) + [#445](https://github.com/haskell/network/pull/445) + [#451](https://github.com/haskell/network/pull/451) + * Added `sendMsg` and `recvMsg` APIs + * Redefined `SocketOption` as pattern synonym + * Implement total Show functions for SockAddr + [#441](https://github.com/haskell/network/pull/441) + * Improve portability changing `u_int32_t` to `uint32_t`. + [#442](https://github.com/haskell/network/pull/442) + * Removed obsolete CPP statements. + [d1f4ee60ce6a4a85abb79532f64d4a4e71e2b1ce](https://github.com/haskell/network/commit/d1f4ee60ce6a4a85abb79532f64d4a4e71e2b1ce) + * Loads of improved test coverage. + [cbd67cc50a37770432eb978ac8b8eb6da3664817](https://github.com/haskell/network/commit/cbd67cc50a37770432eb978ac8b8eb6da3664817) + [fcc2d86d53a6bec793f6a979a9e8fdf7fe3f4c22](https://github.com/haskell/network/commit/fcc2d86d53a6bec793f6a979a9e8fdf7fe3f4c22) + [6db96969b3e8974abbfd50a7f073baa57376fd5e](https://github.com/haskell/network/commit/6db96969b3e8974abbfd50a7f073baa57376fd5e) + +------------------------------------------------------------------- +Tue Jun 16 11:14:23 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Sun Dec 29 10:27:14 UTC 2019 - psimons@suse.com + +- Update network to version 3.1.1.1. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/network-3.1.1.1/src/CHANGELOG.md + ------------------------------------------------------------------- Fri Nov 8 16:14:17 UTC 2019 - Peter Simons diff --git a/ghc-network.spec b/ghc-network.spec index a778dcf..db64f8b 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-network # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,29 +19,43 @@ %global pkg_name network %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.8.0.1 +Version: 3.1.2.0 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 +BuildRequires: ghc-directory-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-QuickCheck-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-temporary-devel %endif %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: +=== 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. @@ -56,7 +70,8 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/network-2.8.0.1.tar.gz b/network-2.8.0.1.tar.gz deleted file mode 100644 index eaef66b..0000000 --- a/network-2.8.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61f55dbfed0f0af721a8ea36079e9309fcc5a1be20783b44ae500d9e4399a846 -size 125767 diff --git a/network-3.1.2.0.tar.gz b/network-3.1.2.0.tar.gz new file mode 100644 index 0000000..9ee7024 --- /dev/null +++ b/network-3.1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e02abd759a09d689eb0b802ff3c4c734e5ba23fe6b96873b613603479452eb1f +size 137615 diff --git a/network.cabal b/network.cabal new file mode 100644 index 0000000..ff25ca8 --- /dev/null +++ b/network.cabal @@ -0,0 +1,173 @@ +cabal-version: 1.18 +name: network +version: 3.1.2.0 +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 + + build-depends: + base >= 4.9 && < 5, + bytestring == 0.10.*, + 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 + Network.Socket.Unix + + 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