Hello community, here is the log from the commit of package ghc-HTTP for openSUSE:Factory checked in at 2018-05-30 12:09:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HTTP (Old) and /work/SRC/openSUSE:Factory/.ghc-HTTP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-HTTP" Wed May 30 12:09:24 2018 rev:20 rq:607818 version:4000.3.11 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HTTP/ghc-HTTP.changes 2017-09-15 21:12:50.330784373 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-HTTP.new/ghc-HTTP.changes 2018-05-30 12:22:29.059567348 +0200 @@ -1,0 +2,6 @@ +Mon May 14 17:02:11 UTC 2018 - [email protected] + +- Update HTTP to version 4000.3.11. + Upstream does not provide a changelog. + +------------------------------------------------------------------- Old: ---- HTTP-4000.3.7.tar.gz New: ---- HTTP-4000.3.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HTTP.spec ++++++ --- /var/tmp/diff_new_pack.20ICTU/_old 2018-05-30 12:22:30.823516199 +0200 +++ /var/tmp/diff_new_pack.20ICTU/_new 2018-05-30 12:22:30.827516083 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-HTTP # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name HTTP %bcond_with tests Name: ghc-%{pkg_name} -Version: 4000.3.7 +Version: 4000.3.11 Release: 0 Summary: A library for client-side HTTP License: BSD-3-Clause @@ -119,7 +119,7 @@ %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %doc CHANGES ++++++ HTTP-4000.3.7.tar.gz -> HTTP-4000.3.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.3.7/HTTP.cabal new/HTTP-4000.3.11/HTTP.cabal --- old/HTTP-4000.3.7/HTTP.cabal 2017-05-18 07:11:17.000000000 +0200 +++ new/HTTP-4000.3.11/HTTP.cabal 2018-03-15 23:43:37.000000000 +0100 @@ -1,5 +1,5 @@ Name: HTTP -Version: 4000.3.7 +Version: 4000.3.11 Cabal-Version: >= 1.8 Build-type: Simple License: BSD3 @@ -69,10 +69,6 @@ description: Build with warnings-as-errors manual: True -Flag network23 - description: Use version 2.3.x or below of the network package - default: False - Flag conduit10 description: Use version 1.0.x or below of the conduit package (for the test suite) default: False @@ -111,9 +107,9 @@ -- note the test harness constraints should be kept in sync with these -- where dependencies are shared - Build-depends: base >= 4.3.0.0 && < 4.11, parsec >= 2.0 && < 3.2 + Build-depends: base >= 4.3.0.0 && < 4.12, parsec >= 2.0 && < 3.2 Build-depends: array >= 0.3.0.2 && < 0.6, bytestring >= 0.9.1.5 && < 0.11 - Build-depends: time >= 1.1.2.3 && < 1.9 + Build-depends: time >= 1.1.2.3 && < 1.10 Extensions: FlexibleInstances @@ -132,7 +128,7 @@ ghc-options: -Werror if os(windows) - Build-depends: Win32 >= 2.2.0.0 && < 2.6 + Build-depends: Win32 >= 2.2.0.0 && < 2.7 Test-Suite test type: exitcode-stdio-1.0 @@ -153,7 +149,7 @@ bytestring >= 0.9.1.5 && < 0.11, deepseq >= 1.3.0.0 && < 1.5, pureMD5 >= 0.2.4 && < 2.2, - base >= 4.3.0.0 && < 4.11, + base >= 4.3.0.0 && < 4.12, split >= 0.1.3 && < 0.3, test-framework >= 0.2.0 && < 0.9, test-framework-hunit >= 0.3.0 && <0.4 @@ -176,7 +172,7 @@ conduit >= 1.0.8 && < 1.1 else build-depends: - conduit >= 1.1 && < 1.3, - conduit-extra >= 1.1 && < 1.2 + conduit >= 1.1 && < 1.4, + conduit-extra >= 1.1 && < 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.3.7/Network/HTTP/Proxy.hs new/HTTP-4000.3.11/Network/HTTP/Proxy.hs --- old/HTTP-4000.3.7/Network/HTTP/Proxy.hs 2017-05-18 07:11:17.000000000 +0200 +++ new/HTTP-4000.3.11/Network/HTTP/Proxy.hs 2018-03-15 23:43:37.000000000 +0100 @@ -103,7 +103,11 @@ (bracket (uncurry regOpenKey registryProxyLoc) regCloseKey $ \hkey -> do enable <- fmap toBool $ regQueryValueDWORD hkey "ProxyEnable" if enable +#if MIN_VERSION_Win32(2,6,0) + then fmap Just $ regQueryValue hkey "ProxyServer" +#else then fmap Just $ regQueryValue hkey (Just "ProxyServer") +#endif else return Nothing) (\_ -> return Nothing) @@ -160,6 +164,7 @@ -- | @parseProxy str@ translates a proxy server string into a @Proxy@ value; -- returns @Nothing@ if not well-formed. parseProxy :: String -> Maybe Proxy +parseProxy "" = Nothing parseProxy str = join . fmap uri2proxy $ parseHttpURI str
