From 95e99012ed17feff8858e875bf2c9d454a2cec95a7cb1ca4e1aaef720b8482bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Jun 2018 13:27:52 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-http-client revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-http-client?expand=0&rev=67 --- ghc-http-client.spec | 4 +- http-client-0.5.12.1.tar.gz | 3 - http-client-0.5.13.tar.gz | 3 + http-client.cabal | 138 ------------------------------------ 4 files changed, 4 insertions(+), 144 deletions(-) delete mode 100644 http-client-0.5.12.1.tar.gz create mode 100644 http-client-0.5.13.tar.gz delete mode 100644 http-client.cabal diff --git a/ghc-http-client.spec b/ghc-http-client.spec index d1c5746..811817c 100644 --- a/ghc-http-client.spec +++ b/ghc-http-client.spec @@ -19,14 +19,13 @@ %global pkg_name http-client %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.5.12.1 +Version: 0.5.13 Release: 0 Summary: An HTTP client engine License: MIT Group: Development/Libraries/Haskell 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-blaze-builder-devel @@ -74,7 +73,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/http-client-0.5.12.1.tar.gz b/http-client-0.5.12.1.tar.gz deleted file mode 100644 index 41c14cb..0000000 --- a/http-client-0.5.12.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b5116324d217f0498d258d37135a52f3e69103d3a951b0999618b263c9bd63e -size 87578 diff --git a/http-client-0.5.13.tar.gz b/http-client-0.5.13.tar.gz new file mode 100644 index 0000000..af4fccc --- /dev/null +++ b/http-client-0.5.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e229fb1eb2905e715fa612b12855f88cc4d65dad93efc7cecdadcdb6d5e0008b +size 87781 diff --git a/http-client.cabal b/http-client.cabal deleted file mode 100644 index 2f39927..0000000 --- a/http-client.cabal +++ /dev/null @@ -1,138 +0,0 @@ -name: http-client -version: 0.5.12.1 -x-revision: 1 -synopsis: An HTTP client engine -description: Hackage documentation generation is not reliable. For up to date documentation, please see: . -homepage: https://github.com/snoyberg/http-client -license: MIT -license-file: LICENSE -author: Michael Snoyman -maintainer: michael@snoyman.com -category: Network -build-type: Simple -extra-source-files: README.md ChangeLog.md -cabal-version: >=1.10 - -flag network-uri - description: Get Network.URI from the network-uri package - default: True - -library - hs-source-dirs: ., publicsuffixlist - exposed-modules: Network.HTTP.Client - Network.HTTP.Client.MultipartFormData - Network.HTTP.Client.Internal - other-modules: Network.HTTP.Client.Body - Network.HTTP.Client.Connection - Network.HTTP.Client.Cookies - Network.HTTP.Client.Core - Network.HTTP.Client.Headers - Network.HTTP.Client.Manager - Network.HTTP.Client.Request - Network.HTTP.Client.Response - Network.HTTP.Client.Types - Network.HTTP.Client.Util - Network.HTTP.Proxy - Network.PublicSuffixList.Lookup - Network.PublicSuffixList.Types - Network.PublicSuffixList.Serialize - Network.PublicSuffixList.DataStructure - Data.KeyedPool - -- if impl(ghc < 7.10) confuses cabal solver. - build-depends: base >= 4.8 && < 5 - , bytestring >= 0.10 - , text >= 0.11 - , http-types >= 0.8 - , blaze-builder >= 0.3 - , time >= 1.2 - , network >= 2.4 - , streaming-commons >= 0.1.0.2 && < 0.3 - , containers >= 0.5 - , transformers - , deepseq >= 1.3 && <1.5 - , case-insensitive >= 1.0 - , memory >= 0.7 - , cookie - , exceptions >= 0.4 - , array - , random - , filepath - , mime-types - , ghc-prim - , stm >= 2.3 - if flag(network-uri) - build-depends: network >= 2.6, network-uri >= 2.6 - else - build-depends: network < 2.6 - - if !impl(ghc>=8.0) - build-depends: semigroups >= 0.16.1 - - -- See build failure at https://travis-ci.org/snoyberg/http-client/jobs/359573631 - if impl(ghc < 7.10) - buildable: False - - if os(mingw32) - build-depends: Win32, safe - - default-language: Haskell2010 - -test-suite spec - main-is: Spec.hs - type: exitcode-stdio-1.0 - hs-source-dirs: test - default-language: Haskell2010 - other-modules: Network.HTTP.ClientSpec - build-depends: base - , http-client - , hspec - , monad-control - , bytestring - , text - , http-types - , blaze-builder - , time - , network - , containers - , transformers - , deepseq - , case-insensitive - , zlib - , async - , streaming-commons >= 0.1.1 - - -test-suite spec-nonet - main-is: Spec.hs - type: exitcode-stdio-1.0 - hs-source-dirs: test-nonet - default-language: Haskell2010 - ghc-options: -threaded - if os(windows) - cpp-options: -DWINDOWS - other-modules: Network.HTTP.ClientSpec - Network.HTTP.Client.ResponseSpec - Network.HTTP.Client.BodySpec - Network.HTTP.Client.HeadersSpec - Network.HTTP.Client.RequestSpec - Network.HTTP.Client.RequestBodySpec - Network.HTTP.Client.CookieSpec - build-depends: base - , http-client - , hspec - , monad-control - , bytestring - , text - , http-types - , blaze-builder - , time - , network - , network-uri - , containers - , transformers - , deepseq - , case-insensitive - , zlib - , async - , streaming-commons >= 0.1.1 - , directory From 7a4ea9b7ffbd442b216a37984667e762b88968353b2679f8b128504f7aba2a92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jul 2018 01:01:46 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-http-client revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-http-client?expand=0&rev=68 --- ghc-http-client.changes | 15 +++++++++++++++ ghc-http-client.spec | 2 +- http-client-0.5.13.1.tar.gz | 3 +++ http-client-0.5.13.tar.gz | 3 --- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 http-client-0.5.13.1.tar.gz delete mode 100644 http-client-0.5.13.tar.gz diff --git a/ghc-http-client.changes b/ghc-http-client.changes index 5a5d0bb..b326c81 100644 --- a/ghc-http-client.changes +++ b/ghc-http-client.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jul 9 19:44:59 UTC 2018 - psimons@suse.com + +- Update http-client to version 0.5.13.1. + ## 0.5.13.1 + + * Add a workaround for a cabal bug [haskell-infra/hackage-trustees#165](https://github.com/haskell-infra/hackage-trustees/issues/165) + + ## 0.5.13 + + * Adds `setRequestCheckStatus` and `throwErrorStatusCodes` functions. + See [#304](https://github.com/snoyberg/http-client/issues/304) + * Add `withConnection` function. + See [#352](https://github.com/snoyberg/http-client/pull/352). + ------------------------------------------------------------------- Mon May 14 17:02:11 UTC 2018 - psimons@suse.com diff --git a/ghc-http-client.spec b/ghc-http-client.spec index 811817c..9f42b69 100644 --- a/ghc-http-client.spec +++ b/ghc-http-client.spec @@ -19,7 +19,7 @@ %global pkg_name http-client %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.5.13 +Version: 0.5.13.1 Release: 0 Summary: An HTTP client engine License: MIT diff --git a/http-client-0.5.13.1.tar.gz b/http-client-0.5.13.1.tar.gz new file mode 100644 index 0000000..64d18e2 --- /dev/null +++ b/http-client-0.5.13.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e121b5c676aec29f2a3b92dcbbb8b3f6acfad4ac5985141f35e5b739f75bfc6b +size 88173 diff --git a/http-client-0.5.13.tar.gz b/http-client-0.5.13.tar.gz deleted file mode 100644 index af4fccc..0000000 --- a/http-client-0.5.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e229fb1eb2905e715fa612b12855f88cc4d65dad93efc7cecdadcdb6d5e0008b -size 87781 From 78a1f5eacfd48244ea0f37e2f9bc63ecfb0bf9df58d0bd1119ed1d2569f8975e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Jul 2018 01:01:49 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-http-client revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-http-client?expand=0&rev=69 --- ghc-http-client.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-http-client.changes b/ghc-http-client.changes index b326c81..5eadeb9 100644 --- a/ghc-http-client.changes +++ b/ghc-http-client.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Jul 9 19:44:59 UTC 2018 - psimons@suse.com +Fri Jul 13 14:31:24 UTC 2018 - psimons@suse.com - Update http-client to version 0.5.13.1. ## 0.5.13.1 From dfb9e9feddb8a05538a243532efe9a6033502da5199b77c42911fdad7e497012 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2018 14:40:43 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-http-client revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-http-client?expand=0&rev=70 --- ghc-http-client.changes | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ghc-http-client.changes b/ghc-http-client.changes index 5eadeb9..9f4009d 100644 --- a/ghc-http-client.changes +++ b/ghc-http-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 18 14:26:28 UTC 2018 - psimons@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + ------------------------------------------------------------------- Fri Jul 13 14:31:24 UTC 2018 - psimons@suse.com @@ -79,7 +85,7 @@ Sun Jul 3 12:10:09 UTC 2016 - mimi.vx@gmail.com Fri Jun 17 07:48:56 UTC 2016 - mimi.vx@gmail.com - update to 0.4.29 -* Changed the order of connecting a socket and tweaking a socket, such that +* Changed the order of connecting a socket and tweaking a socket, such that the socket tweaking callback now happen before connecting. * add setRequestIgnoreStatus * Added missing Host: HTTP header for https CONNECT @@ -115,7 +121,7 @@ Thu Dec 24 09:31:02 UTC 2015 - mimi.vx@gmail.com Thu Dec 17 10:40:19 UTC 2015 - mimi.vx@gmail.com - update to 0.4.26.1 -* Make sure we never read from or write to closed socket +* Make sure we never read from or write to closed socket ------------------------------------------------------------------- Sun Dec 13 16:44:45 UTC 2015 - mimi.vx@gmail.com @@ -127,13 +133,13 @@ Sun Dec 13 16:44:45 UTC 2015 - mimi.vx@gmail.com Sun Sep 27 10:04:09 UTC 2015 - mimi.vx@gmail.com - update to 0.4.24 -* Use a new TlsExceptionHostPort exception to indicate the host and port of the +* Use a new TlsExceptionHostPort exception to indicate the host and port of the server we were trying to connect to when a TLS exception occurred. ------------------------------------------------------------------- Sun Sep 20 19:18:53 UTC 2015 - mimi.vx@gmail.com -- update to 0.4.23 +- update to 0.4.23 * Case insensitive cookie domains ------------------------------------------------------------------- @@ -151,7 +157,7 @@ Mon Aug 31 08:04:52 UTC 2015 - mimi.vx@gmail.com ------------------------------------------------------------------- Sun Aug 23 17:34:03 UTC 2015 - mimi.vx@gmail.com -- update to 0.4.20 +- update to 0.4.20 * Expose brReadSome ------------------------------------------------------------------- @@ -185,14 +191,14 @@ Mon Jul 6 12:25:51 UTC 2015 - mimi.vx@gmail.com ------------------------------------------------------------------- Sun Jun 21 16:50:40 UTC 2015 - mimi.vx@gmail.com -- update to 0.4.12 +- update to 0.4.12 * Added IsString RequestBody instance ------------------------------------------------------------------- Mon Jun 8 06:30:24 UTC 2015 - mimi.vx@gmail.com - update to 0.4.11.3 -* Fix getUri to insert "?" to uriQuery when necessary. +* Fix getUri to insert "?" to uriQuery when necessary. ------------------------------------------------------------------- Mon May 4 05:55:20 UTC 2015 - mimi.vx@gmail.com @@ -203,5 +209,4 @@ Mon May 4 05:55:20 UTC 2015 - mimi.vx@gmail.com ------------------------------------------------------------------- Wed Apr 22 09:12:19 UTC 2015 - mimi.vx@gmail.com -- initial commit - +- initial commit