diff --git a/ghc-warp.changes b/ghc-warp.changes index 6ff0560..d040067 100644 --- a/ghc-warp.changes +++ b/ghc-warp.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Mar 16 02:30:02 UTC 2023 - Peter Simons + +- Update warp to version 3.3.25. + ## 3.3.25 + + * Catching up the signature change of openFd in the unix package v2.8. + [#926](https://github.com/yesodweb/wai/pull/926) + +------------------------------------------------------------------- +Wed Feb 8 05:29:16 UTC 2023 - Peter Simons + +- Update warp to version 3.3.24. + ## 3.3.24 + + * Switching the version of the "recv" package from 0.0.x to 0.1.x. + ------------------------------------------------------------------- Thu Jan 26 01:27:05 UTC 2023 - Peter Simons diff --git a/ghc-warp.spec b/ghc-warp.spec index 0ac6e96..aaeca03 100644 --- a/ghc-warp.spec +++ b/ghc-warp.spec @@ -17,49 +17,81 @@ %global pkg_name warp +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.3.23 +Version: 3.3.25 Release: 0 Summary: A fast, light-weight web server for WAI applications License: MIT 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-array-devel +BuildRequires: ghc-array-prof BuildRequires: ghc-auto-update-devel +BuildRequires: ghc-auto-update-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-bsb-http-chunked-devel +BuildRequires: ghc-bsb-http-chunked-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-hashable-devel +BuildRequires: ghc-hashable-prof BuildRequires: ghc-http-date-devel +BuildRequires: ghc-http-date-prof BuildRequires: ghc-http-types-devel +BuildRequires: ghc-http-types-prof BuildRequires: ghc-http2-devel +BuildRequires: ghc-http2-prof BuildRequires: ghc-iproute-devel +BuildRequires: ghc-iproute-prof BuildRequires: ghc-network-devel +BuildRequires: ghc-network-prof BuildRequires: ghc-recv-devel +BuildRequires: ghc-recv-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-simple-sendfile-devel +BuildRequires: ghc-simple-sendfile-prof BuildRequires: ghc-stm-devel +BuildRequires: ghc-stm-prof BuildRequires: ghc-streaming-commons-devel +BuildRequires: ghc-streaming-commons-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-time-manager-devel +BuildRequires: ghc-time-manager-prof BuildRequires: ghc-unix-compat-devel +BuildRequires: ghc-unix-compat-prof BuildRequires: ghc-unix-devel +BuildRequires: ghc-unix-prof BuildRequires: ghc-unliftio-devel +BuildRequires: ghc-unliftio-prof BuildRequires: ghc-vault-devel +BuildRequires: ghc-vault-prof BuildRequires: ghc-wai-devel +BuildRequires: ghc-wai-prof BuildRequires: ghc-word8-devel +BuildRequires: ghc-word8-prof BuildRequires: ghc-x509-devel +BuildRequires: ghc-x509-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-directory-devel +BuildRequires: ghc-directory-prof BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-prof BuildRequires: ghc-http-client-devel +BuildRequires: ghc-http-client-prof BuildRequires: ghc-process-devel +BuildRequires: ghc-process-prof %endif %description @@ -77,9 +109,24 @@ Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -102,4 +149,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc ChangeLog.md README.md +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog diff --git a/warp-3.3.23.tar.gz b/warp-3.3.23.tar.gz deleted file mode 100644 index db02b2d..0000000 --- a/warp-3.3.23.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bad666f7c8557f5b1d3c5f367cff7115d2627bbd69859e319d2fff823f3b3978 -size 65513 diff --git a/warp-3.3.25.tar.gz b/warp-3.3.25.tar.gz new file mode 100644 index 0000000..fa97544 --- /dev/null +++ b/warp-3.3.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea7d18f031898b5d8d0fa2306ed27a08d6b0a3dc223f84961423aab36d1446f1 +size 65591 diff --git a/warp.cabal b/warp.cabal deleted file mode 100644 index 39ab0c1..0000000 --- a/warp.cabal +++ /dev/null @@ -1,280 +0,0 @@ -Name: warp -Version: 3.3.23 -x-revision: 1 -Synopsis: A fast, light-weight web server for WAI applications. -License: MIT -License-file: LICENSE -Author: Michael Snoyman, Kazu Yamamoto, Matt Brown -Maintainer: michael@snoyman.com -Homepage: http://github.com/yesodweb/wai -Category: Web, Yesod -Build-Type: Simple -Cabal-Version: >= 1.10 -Stability: Stable -description: HTTP\/1.0, HTTP\/1.1 and HTTP\/2 are supported. - For HTTP\/2, Warp supports direct and ALPN (in TLS) - but not upgrade. - API docs and the README are available at - . -extra-source-files: attic/hex - ChangeLog.md - README.md - test/head-response - test/inputFile - -Flag network-bytestring - Default: False - -Flag allow-sendfilefd - Description: Allow use of sendfileFd (not available on GNU/kFreeBSD) - Default: True - -Flag warp-debug - Description: print debug output. not suitable for production - Default: False - -Flag x509 - Description: Adds a dependency on the x509 library to enable getting TLS client certificates. - Default: True - -Library - Build-Depends: base >= 4.12 && < 5 - , array - , auto-update >= 0.1.3 && < 0.2 - , bsb-http-chunked < 0.1 - , bytestring >= 0.9.1.4 - , case-insensitive >= 0.2 - , containers - , ghc-prim - , hashable - , http-date - , http-types >= 0.12 - , http2 >= 3.0 && < 5 - , iproute >= 1.3.1 - , recv < 0.1.0 - , simple-sendfile >= 0.2.7 && < 0.3 - , stm >= 2.3 - , streaming-commons >= 0.1.10 - , text - , time-manager - , unix-compat >= 0.2 - , vault >= 0.3 - , wai >= 3.2 && < 3.3 - , word8 - , unliftio - if flag(x509) - Build-Depends: x509 - if impl(ghc < 8) - Build-Depends: semigroups - if flag(network-bytestring) - Build-Depends: network >= 2.2.1.5 && < 2.2.3 - , network-bytestring >= 0.1.3 && < 0.1.4 - else - Build-Depends: network >= 2.3 - Exposed-modules: Network.Wai.Handler.Warp - Network.Wai.Handler.Warp.Internal - Other-modules: Network.Wai.Handler.Warp.Buffer - Network.Wai.Handler.Warp.Conduit - Network.Wai.Handler.Warp.Counter - Network.Wai.Handler.Warp.Date - Network.Wai.Handler.Warp.FdCache - Network.Wai.Handler.Warp.File - Network.Wai.Handler.Warp.FileInfoCache - Network.Wai.Handler.Warp.HashMap - Network.Wai.Handler.Warp.HTTP1 - Network.Wai.Handler.Warp.HTTP2 - Network.Wai.Handler.Warp.HTTP2.File - Network.Wai.Handler.Warp.HTTP2.PushPromise - Network.Wai.Handler.Warp.HTTP2.Request - Network.Wai.Handler.Warp.HTTP2.Response - Network.Wai.Handler.Warp.HTTP2.Types - Network.Wai.Handler.Warp.Header - Network.Wai.Handler.Warp.IO - Network.Wai.Handler.Warp.Imports - Network.Wai.Handler.Warp.PackInt - Network.Wai.Handler.Warp.ReadInt - Network.Wai.Handler.Warp.Request - Network.Wai.Handler.Warp.RequestHeader - Network.Wai.Handler.Warp.Response - Network.Wai.Handler.Warp.ResponseHeader - Network.Wai.Handler.Warp.Run - Network.Wai.Handler.Warp.SendFile - Network.Wai.Handler.Warp.Settings - Network.Wai.Handler.Warp.Types - Network.Wai.Handler.Warp.Windows - Network.Wai.Handler.Warp.WithApplication - Paths_warp - Ghc-Options: -Wall - - if flag(warp-debug) - Cpp-Options: -DWARP_DEBUG - if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd) - Cpp-Options: -DSENDFILEFD - if os(windows) - Cpp-Options: -DWINDOWS - Build-Depends: time - else - Build-Depends: unix - Other-modules: Network.Wai.Handler.Warp.MultiMap - if impl(ghc >= 8) - Default-Extensions: Strict StrictData - Default-Language: Haskell2010 - -Test-Suite doctest - buildable: False - Type: exitcode-stdio-1.0 - HS-Source-Dirs: test - Ghc-Options: -threaded -Wall - Main-Is: doctests.hs - Build-Depends: base >= 4.8 && < 5 - , doctest >= 0.10.1 - if os(windows) - Buildable: False - if impl(ghc >= 8) - Default-Extensions: Strict StrictData - Default-Language: Haskell2010 - -Test-Suite spec - Main-Is: Spec.hs - Other-modules: ConduitSpec - ExceptionSpec - FdCacheSpec - FileSpec - ReadIntSpec - RequestSpec - ResponseHeaderSpec - ResponseSpec - RunSpec - SendFileSpec - WithApplicationSpec - HTTP - Network.Wai.Handler.Warp - Network.Wai.Handler.Warp.Buffer - Network.Wai.Handler.Warp.Conduit - Network.Wai.Handler.Warp.Counter - Network.Wai.Handler.Warp.Date - Network.Wai.Handler.Warp.FdCache - Network.Wai.Handler.Warp.File - Network.Wai.Handler.Warp.FileInfoCache - Network.Wai.Handler.Warp.HTTP1 - Network.Wai.Handler.Warp.HTTP2 - Network.Wai.Handler.Warp.HTTP2.File - Network.Wai.Handler.Warp.HTTP2.PushPromise - Network.Wai.Handler.Warp.HTTP2.Request - Network.Wai.Handler.Warp.HTTP2.Response - Network.Wai.Handler.Warp.HTTP2.Types - Network.Wai.Handler.Warp.HashMap - Network.Wai.Handler.Warp.Header - Network.Wai.Handler.Warp.IO - Network.Wai.Handler.Warp.Imports - Network.Wai.Handler.Warp.MultiMap - Network.Wai.Handler.Warp.PackInt - Network.Wai.Handler.Warp.ReadInt - Network.Wai.Handler.Warp.Request - Network.Wai.Handler.Warp.RequestHeader - Network.Wai.Handler.Warp.Response - Network.Wai.Handler.Warp.ResponseHeader - Network.Wai.Handler.Warp.Run - Network.Wai.Handler.Warp.SendFile - Network.Wai.Handler.Warp.Settings - Network.Wai.Handler.Warp.Types - Network.Wai.Handler.Warp.Windows - Network.Wai.Handler.Warp.WithApplication - Paths_warp - - Hs-Source-Dirs: test, . - Type: exitcode-stdio-1.0 - - Ghc-Options: -Wall -threaded - Build-Tool-Depends: hspec-discover:hspec-discover - Build-Depends: base >= 4.8 && < 5 - , QuickCheck - , array - , auto-update - , bsb-http-chunked < 0.1 - , bytestring >= 0.9.1.4 - , case-insensitive >= 0.2 - , containers - , directory - , ghc-prim - , hashable - , hspec >= 1.3 - , http-client - , http-date - , http-types >= 0.12 - , http2 >= 3.0 && < 5 - , iproute >= 1.3.1 - , network - , process - , recv - , simple-sendfile >= 0.2.4 && < 0.3 - , stm >= 2.3 - , streaming-commons >= 0.1.10 - , text - , time-manager - , unix-compat >= 0.2 - , vault - , wai >= 3.2 && < 3.3 - , word8 - , unliftio - if flag(x509) - Build-Depends: x509 - if impl(ghc < 8) - Build-Depends: semigroups - , transformers - - if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd) - Cpp-Options: -DSENDFILEFD - if os(windows) - Cpp-Options: -DWINDOWS - Build-Depends: time - else - Build-Depends: unix - Other-modules: Network.Wai.Handler.Warp.MultiMap - if impl(ghc >= 8) - Default-Extensions: Strict StrictData - Default-Language: Haskell2010 - -Benchmark parser - Type: exitcode-stdio-1.0 - Main-Is: Parser.hs - other-modules: Network.Wai.Handler.Warp.Date - Network.Wai.Handler.Warp.FdCache - Network.Wai.Handler.Warp.FileInfoCache - Network.Wai.Handler.Warp.HashMap - Network.Wai.Handler.Warp.Imports - Network.Wai.Handler.Warp.MultiMap - Network.Wai.Handler.Warp.Types - HS-Source-Dirs: bench . - Build-Depends: base >= 4.8 && < 5 - , auto-update - , bytestring - , containers - , gauge - , hashable - , http-date - , http-types - , network - , network - , recv - , time-manager - , unix-compat - , unliftio - if flag(x509) - Build-Depends: x509 - if impl(ghc < 8) - Build-Depends: semigroups - - if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd) - Cpp-Options: -DSENDFILEFD - Build-Depends: unix - if os(windows) - Cpp-Options: -DWINDOWS - Build-Depends: time - if impl(ghc >= 8) - Default-Extensions: Strict StrictData - Default-Language: Haskell2010 - -Source-Repository head - Type: git - Location: git://github.com/yesodweb/wai.git