diff --git a/.gitignore b/.gitignore index 293d1e4..9db224c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /wai-extra-3.0.29.2.tar.gz /wai-extra-3.1.6.tar.gz /wai-extra-3.1.8.tar.gz +/wai-extra-3.1.13.0.tar.gz diff --git a/ghc-wai-extra.spec b/ghc-wai-extra.spec index 5cb5e72..72409c0 100644 --- a/ghc-wai-extra.spec +++ b/ghc-wai-extra.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.1.0 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name wai-extra @@ -7,19 +7,49 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.8 -Release: 2%{?dist} +Version: 3.1.13.0 +Release: 1%{?dist} Summary: Basic WAI handlers and middleware License: MIT Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-ansi-terminal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-call-stack-devel +BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-cookie-devel +BuildRequires: ghc-data-default-class-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-fast-logger-devel +BuildRequires: ghc-http-types-devel +BuildRequires: ghc-iproute-devel +BuildRequires: ghc-network-devel +BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-streaming-commons-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-unix-devel +BuildRequires: ghc-vault-devel +BuildRequires: ghc-wai-devel +BuildRequires: ghc-wai-logger-devel +BuildRequires: ghc-warp-devel +BuildRequires: ghc-word8-devel +%if %{with ghc_prof} BuildRequires: ghc-HUnit-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-ansi-terminal-prof @@ -34,7 +64,6 @@ BuildRequires: ghc-data-default-class-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-fast-logger-prof BuildRequires: ghc-http-types-prof -BuildRequires: ghc-http2-prof BuildRequires: ghc-iproute-prof BuildRequires: ghc-network-prof BuildRequires: ghc-resourcet-prof @@ -46,9 +75,13 @@ BuildRequires: ghc-unix-prof BuildRequires: ghc-vault-prof BuildRequires: ghc-wai-prof BuildRequires: ghc-wai-logger-prof +BuildRequires: ghc-warp-prof BuildRequires: ghc-word8-prof +%endif %if %{with tests} BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-discover-devel +BuildRequires: ghc-temporary-devel BuildRequires: ghc-zlib-devel %endif # End cabal-rpm deps @@ -73,9 +106,15 @@ WAI Middleware for adding arbitrary headers to an HTTP request. * Clean Path Clean a request path to a canonical form. +* Combine Headers +Combine duplicate headers into one. + * GZip Compression Negotiate HTTP payload gzip compression. +* Health check endpoint +Add an empty health check endpoint. + * HTTP Basic Authentication WAI Basic Authentication Middleware which uses Authorization header. @@ -93,16 +132,16 @@ Request logging middleware for development and production environments * Request Rewrite Rewrite request path info based on a custom conversion rules. +* Select + +Dynamically choose between Middlewares. + * Stream Files Convert ResponseFile type responses into ResponseStream type. * Virtual Host Redirect incoming requests to a new host based on custom rules. -This library provides common Web Application Interface features. -API docs and the README are available at -. - %package devel Summary: Haskell %{pkg_name} library development files @@ -142,6 +181,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -185,6 +225,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Jan 22 2023 Jens Petersen - 3.1.13.0-1 +- https://hackage.haskell.org/package/wai-extra-3.1.13.0/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 3.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 07a17fe..c09c6ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wai-extra-3.1.8.tar.gz) = 9ec191ee18124fa871fa9a571eba31c9edde87fb65ef63387df2e13d81a7acb0387b73e95e94475870a2ef9c90407285182e1675c723a9a3373e64df2e4d88b2 +SHA512 (wai-extra-3.1.13.0.tar.gz) = ec94ad7fe318543c83dc20586bab04e9cb5cc9a3a96c4392acb1abd22f7a232a703f05051c9580836ad3758875751f02ef53bdc3c450e7d262ba8575761380b8 diff --git a/wai-extra-3.1.13.0.cabal b/wai-extra-3.1.13.0.cabal new file mode 100644 index 0000000..a1870b0 --- /dev/null +++ b/wai-extra-3.1.13.0.cabal @@ -0,0 +1,242 @@ +Name: wai-extra +Version: 3.1.13.0 +x-revision: 1 +Synopsis: Provides some basic WAI handlers and middleware. +description: + Provides basic WAI handler and middleware functionality: + . + * WAI Testing Framework + . + Hspec testing facilities and helpers for WAI. + . + * Event Source/Event Stream + . + Send server events to the client. Compatible with the JavaScript + EventSource API. + . + * Accept Override + . + Override the Accept header in a request. Special handling for the + _accept query parameter (which is used throughout WAI override the + Accept header). + . + * Add Headers + . + WAI Middleware for adding arbitrary headers to an HTTP request. + . + * Clean Path + . + Clean a request path to a canonical form. + . + * Combine Headers + . + Combine duplicate headers into one. + . + * GZip Compression + . + Negotiate HTTP payload gzip compression. + . + * Health check endpoint + . + Add an empty health check endpoint. + . + * HTTP Basic Authentication + . + WAI Basic Authentication Middleware which uses Authorization header. + . + * JSONP + . + \"JSON with Padding\" middleware. Automatic wrapping of JSON + responses to convert into JSONP. + . + * Method Override / Post + . + Allows overriding of the HTTP request method via the _method query string + parameter. + . + * Request Logging + . + Request logging middleware for development and production environments + . + * Request Rewrite + . + Rewrite request path info based on a custom conversion rules. + . + * Select + . + Dynamically choose between Middlewares. + . + * Stream Files + . + Convert ResponseFile type responses into ResponseStream type. + . + * Virtual Host + . + Redirect incoming requests to a new host based on custom rules. + . + . + API docs and the README are available at . + +License: MIT +License-file: LICENSE +Author: Michael Snoyman +Maintainer: michael@snoyman.com +Homepage: http://github.com/yesodweb/wai +Category: Web +Build-Type: Simple +Cabal-Version: >=1.10 +Stability: Stable +extra-source-files: + test/requests/dalvik-request + test/json + test/json.gz + test/noprecompress + test/test.html + test/sample.hs + ChangeLog.md + README.md + +flag build-example + description: Build example executable. + manual: True + default: False + +Library + Build-Depends: base >= 4.12 && < 5 + , aeson + , ansi-terminal >= 0.4 + , base64-bytestring + , bytestring >= 0.10.4 + , call-stack + , case-insensitive >= 0.2 + , containers + , cookie + , data-default-class + , directory >= 1.2.7.0 + , fast-logger >= 2.4.5 + , http-types >= 0.7 + , HUnit + , iproute >= 1.7.8 + , network >= 2.6.1.0 + , resourcet >= 0.4.6 && < 1.4 + , streaming-commons >= 0.2 + , text >= 0.7 + , time >= 1.1.4 + , transformers >= 0.2.2 + , vault + , wai >= 3.2.2.1 && < 3.3 + , wai-logger >= 2.3.7 + , warp >= 3.3.22 + , word8 + + if os(windows) + cpp-options: -DWINDOWS + else + build-depends: unix + + default-extensions: OverloadedStrings + + Exposed-modules: Network.Wai.EventSource + Network.Wai.EventSource.EventStream + Network.Wai.Handler.CGI + Network.Wai.Handler.SCGI + Network.Wai.Header + Network.Wai.Middleware.AcceptOverride + Network.Wai.Middleware.AddHeaders + Network.Wai.Middleware.Approot + Network.Wai.Middleware.Autohead + Network.Wai.Middleware.CleanPath + Network.Wai.Middleware.CombineHeaders + Network.Wai.Middleware.ForceDomain + Network.Wai.Middleware.ForceSSL + Network.Wai.Middleware.Gzip + Network.Wai.Middleware.HealthCheckEndpoint + Network.Wai.Middleware.HttpAuth + Network.Wai.Middleware.Jsonp + Network.Wai.Middleware.Local + Network.Wai.Middleware.MethodOverride + Network.Wai.Middleware.MethodOverridePost + Network.Wai.Middleware.RealIp + Network.Wai.Middleware.RequestLogger + Network.Wai.Middleware.RequestLogger.JSON + Network.Wai.Middleware.RequestSizeLimit + Network.Wai.Middleware.RequestSizeLimit.Internal + Network.Wai.Middleware.Rewrite + Network.Wai.Middleware.Routed + Network.Wai.Middleware.Select + Network.Wai.Middleware.StreamFile + Network.Wai.Middleware.StripHeaders + Network.Wai.Middleware.Timeout + Network.Wai.Middleware.Vhost + Network.Wai.Parse + Network.Wai.Request + Network.Wai.Test + Network.Wai.Test.Internal + Network.Wai.UrlMap + other-modules: Network.Wai.Middleware.RequestLogger.Internal + Network.Wai.Util + default-language: Haskell2010 + ghc-options: -Wall + +executable example + hs-source-dirs: example + main-is: Main.hs + ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall + if flag(build-example) + build-depends: base + , bytestring + , http-types + , time + , wai + , wai-extra + , warp + else + buildable: False + default-language: Haskell2010 + +test-suite spec + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Spec.hs + other-modules: Network.Wai.Middleware.ApprootSpec + Network.Wai.Middleware.CombineHeadersSpec + Network.Wai.Middleware.ForceSSLSpec + Network.Wai.Middleware.RealIpSpec + Network.Wai.Middleware.RequestSizeLimitSpec + Network.Wai.Middleware.RoutedSpec + Network.Wai.Middleware.SelectSpec + Network.Wai.Middleware.StripHeadersSpec + Network.Wai.Middleware.TimeoutSpec + Network.Wai.ParseSpec + Network.Wai.RequestSpec + Network.Wai.TestSpec + WaiExtraSpec + build-tool-depends: hspec-discover:hspec-discover + build-depends: base >= 4 && < 5 + , aeson + , bytestring + , cookie + , case-insensitive + , directory + , fast-logger + , hspec >= 1.3 + , http-types + , HUnit + , iproute + , resourcet + , temporary + , text + , time + , wai-extra + , wai + , warp + , zlib + ghc-options: -Wall + default-language: Haskell2010 + + if os(windows) + cpp-options: -DWINDOWS + +source-repository head + type: git + location: git://github.com/yesodweb/wai.git