From de031d349aa31eb7326ccc27d5496326ec8e20005ae97908fef832ca81f371dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Nov 2023 14:07:22 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-warp revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-warp?expand=0&rev=33 --- ghc-warp.changes | 34 ++++++ ghc-warp.spec | 10 +- warp-3.3.25.tar.gz | 3 - warp-3.3.30.tar.gz | 3 + warp.cabal | 280 --------------------------------------------- 5 files changed, 40 insertions(+), 290 deletions(-) delete mode 100644 warp-3.3.25.tar.gz create mode 100644 warp-3.3.30.tar.gz delete mode 100644 warp.cabal diff --git a/ghc-warp.changes b/ghc-warp.changes index a66b3be..7b380ca 100644 --- a/ghc-warp.changes +++ b/ghc-warp.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Oct 24 15:42:41 UTC 2023 - Peter Simons + +- Update warp to version 3.3.30. + ## 3.3.30 + + * Length of `ResponseBuilder` responses will now also be passed to the logger. + [#946](https://github.com/yesodweb/wai/pull/946) + * Using `If-(None-)Match` headers simultaneously with `If-(Un)Modified-Since` headers now + follow the RFC 9110 standard. So `If-(Un)Modified-Since` headers will be correctly ignored + if their respective `-Match` counterpart is also present in the request headers. + [#945](https://github.com/yesodweb/wai/pull/945) + * Fixed adding superfluous `Server` header when using HTTP/2.0 if response already has it. + [#943](https://github.com/yesodweb/wai/pull/943) + + ## 3.3.29 + + * Preparing coming "http2" v4.2.0. + + ## 3.3.28 + + * Fix for the "-x509" flag + [#935](https://github.com/yesodweb/wai/pull/935) + + ## 3.3.27 + + * Fixing busy loop due to eMFILE + [#933](https://github.com/yesodweb/wai/pull/933) + + ## 3.3.26 + + * Using crypton instead of cryptonite. + [#931](https://github.com/yesodweb/wai/pull/931) + ------------------------------------------------------------------- Wed Oct 25 02:02:08 UTC 2023 - Peter Simons diff --git a/ghc-warp.spec b/ghc-warp.spec index 72e78a7..4c9786f 100644 --- a/ghc-warp.spec +++ b/ghc-warp.spec @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.3.25 +Version: 3.3.30 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 @@ -42,6 +41,8 @@ BuildRequires: ghc-case-insensitive-devel BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-containers-devel BuildRequires: ghc-containers-prof +BuildRequires: ghc-crypton-x509-devel +BuildRequires: ghc-crypton-x509-prof BuildRequires: ghc-hashable-devel BuildRequires: ghc-hashable-prof BuildRequires: ghc-http-date-devel @@ -67,8 +68,6 @@ 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 @@ -79,8 +78,6 @@ 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 @@ -128,7 +125,6 @@ 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 diff --git a/warp-3.3.25.tar.gz b/warp-3.3.25.tar.gz deleted file mode 100644 index fa97544..0000000 --- a/warp-3.3.25.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea7d18f031898b5d8d0fa2306ed27a08d6b0a3dc223f84961423aab36d1446f1 -size 65591 diff --git a/warp-3.3.30.tar.gz b/warp-3.3.30.tar.gz new file mode 100644 index 0000000..3a7d37b --- /dev/null +++ b/warp-3.3.30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef2e5a25284d712ecb23ce34e222dc6bf95496bb931da9d508801f9bd8b6aec4 +size 67326 diff --git a/warp.cabal b/warp.cabal deleted file mode 100644 index b2d9977..0000000 --- a/warp.cabal +++ /dev/null @@ -1,280 +0,0 @@ -Name: warp -Version: 3.3.25 -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 && < 4.2 - , iproute >= 1.3.1 - , recv >= 0.1.0 && < 0.2.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 >= 0.1.0 && < 0.2.0 - , 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 From a3e3a2e3ec18eda310b5b78b0268113cea9f15268a3d0a04a2fd1e8c78ecad5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Nov 2023 16:59:38 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-warp revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-warp?expand=0&rev=34 --- ghc-warp.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-warp.changes b/ghc-warp.changes index 7b380ca..a38b567 100644 --- a/ghc-warp.changes +++ b/ghc-warp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 16 13:26:59 UTC 2023 - Peter Simons + +- Strip CRLF line endings from the bundled Cabal file. + ------------------------------------------------------------------- Tue Oct 24 15:42:41 UTC 2023 - Peter Simons From 8f70385f00fdb76f9b19b872b86a29fc3e40a6508958045da9fe7c60fb97ce05 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Nov 2023 17:38:36 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-warp revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-warp?expand=0&rev=35 --- ghc-warp.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-warp.changes b/ghc-warp.changes index a38b567..acdb441 100644 --- a/ghc-warp.changes +++ b/ghc-warp.changes @@ -4,7 +4,7 @@ Thu Nov 16 13:26:59 UTC 2023 - Peter Simons - Strip CRLF line endings from the bundled Cabal file. ------------------------------------------------------------------- -Tue Oct 24 15:42:41 UTC 2023 - Peter Simons +Tue Oct 25 15:42:41 UTC 2023 - Peter Simons - Update warp to version 3.3.30. ## 3.3.30 From 6fe5b8f8a3a16a8969077c2a7f3022aae9f47e983bda45fe69d63e8ae3a2242c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Nov 2023 09:17:23 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-warp revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-warp?expand=0&rev=36 --- ghc-warp.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ghc-warp.changes b/ghc-warp.changes index acdb441..01b3c73 100644 --- a/ghc-warp.changes +++ b/ghc-warp.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Nov 16 13:26:59 UTC 2023 - Peter Simons - -- Strip CRLF line endings from the bundled Cabal file. - ------------------------------------------------------------------- Tue Oct 25 15:42:41 UTC 2023 - Peter Simons