From f48b86947ac02c6a3cb6830683a986da1c760f794c936f25eec3b12a8a74ac7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 2 Dec 2020 15:03:32 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=72 --- ghc-network.changes | 9 +++ ghc-network.spec | 4 +- network-3.1.2.0.tar.gz | 3 - network-3.1.2.1.tar.gz | 3 + network.cabal | 173 ----------------------------------------- 5 files changed, 13 insertions(+), 179 deletions(-) delete mode 100644 network-3.1.2.0.tar.gz create mode 100644 network-3.1.2.1.tar.gz delete mode 100644 network.cabal diff --git a/ghc-network.changes b/ghc-network.changes index 0c48629..5f3f3f7 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Nov 27 09:27:38 UTC 2020 - psimons@suse.com + +- Update network to version 3.1.2.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.2.1/src/CHANGELOG.md + ------------------------------------------------------------------- Mon Aug 31 09:34:30 UTC 2020 - psimons@suse.com diff --git a/ghc-network.spec b/ghc-network.spec index db64f8b..cf0e353 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -19,13 +19,12 @@ %global pkg_name network %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.2.0 +Version: 3.1.2.1 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 @@ -71,7 +70,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.0.tar.gz b/network-3.1.2.0.tar.gz deleted file mode 100644 index 9ee7024..0000000 --- a/network-3.1.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e02abd759a09d689eb0b802ff3c4c734e5ba23fe6b96873b613603479452eb1f -size 137615 diff --git a/network-3.1.2.1.tar.gz b/network-3.1.2.1.tar.gz new file mode 100644 index 0000000..b34b2f8 --- /dev/null +++ b/network-3.1.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a +size 136889 diff --git a/network.cabal b/network.cabal deleted file mode 100644 index ff25ca8..0000000 --- a/network.cabal +++ /dev/null @@ -1,173 +0,0 @@ -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 From c2c06d35b84ec3ad97afedc0d4dff791e1c373fe1c43f76e211592b92a3222a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:39 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=73 --- ghc-network.changes | 11 +++ ghc-network.spec | 8 ++ network.cabal | 173 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+) create mode 100644 network.cabal diff --git a/ghc-network.changes b/ghc-network.changes index 5f3f3f7..0e54106 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Fri Dec 4 10:51:26 UTC 2020 - psimons@suse.com + +- Update network to version 3.1.2.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Fri Nov 27 09:27:38 UTC 2020 - psimons@suse.com diff --git a/ghc-network.spec b/ghc-network.spec index cf0e353..8086735 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -25,11 +25,18 @@ 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 +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -70,6 +77,7 @@ 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.cabal b/network.cabal new file mode 100644 index 0000000..cd42d66 --- /dev/null +++ b/network.cabal @@ -0,0 +1,173 @@ +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 From cfd5065e906388a7b089a1a203d8d7d88e464699e0b449efaf9fcb098dcf2633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:49 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network revision:16, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=74 --- ghc-network.changes | 2 +- ghc-network.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-network.changes b/ghc-network.changes index 0e54106..1544304 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Fri Dec 4 10:51:26 UTC 2020 - psimons@suse.com diff --git a/ghc-network.spec b/ghc-network.spec index 8086735..6868722 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -31,12 +31,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-rpm-macros -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel From 059b9c5db7d22cfc9ea617464a7031b244efc46407b0e171a0fab99518225b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:02 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network revision:17, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=75 --- ghc-network.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-network.changes b/ghc-network.changes index 1544304..188a1ac 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build