Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-hackage-security for
openSUSE:Factory checked in at 2022-02-11 23:08:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-hackage-security (Old)
and /work/SRC/openSUSE:Factory/.ghc-hackage-security.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hackage-security"
Fri Feb 11 23:08:59 2022 rev:24 rq:953465 version:0.6.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-hackage-security/ghc-hackage-security.changes
2021-08-25 20:57:44.825197515 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-hackage-security.new.1956/ghc-hackage-security.changes
2022-02-11 23:10:51.371197023 +0100
@@ -1,0 +2,16 @@
+Sat Jan 22 17:15:12 UTC 2022 - Peter Simons <[email protected]>
+
+- Update hackage-security to version 0.6.2.0.
+ 0.6.2.0
+ -------
+
+ * Safely prepare for when cabal factors out Cabal-syntax
+
+ 0.6.1.0
+ -------
+
+ * Support basic auth in package-indices (#252)
+ * Fix tests due to new aeson handling of unescaped control sequences (#256)
+ * Bump a lot of bounds on packages we depend on
+
+-------------------------------------------------------------------
Old:
----
hackage-security-0.6.0.1.tar.gz
hackage-security.cabal
New:
----
hackage-security-0.6.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-hackage-security.spec ++++++
--- /var/tmp/diff_new_pack.BhushK/_old 2022-02-11 23:10:51.779198202 +0100
+++ /var/tmp/diff_new_pack.BhushK/_new 2022-02-11 23:10:51.783198214 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-hackage-security
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,14 +19,14 @@
%global pkg_name hackage-security
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.6.0.1
+Version: 0.6.2.0
Release: 0
Summary: Hackage security library
License: BSD-3-Clause
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/8.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-Cabal-syntax-devel
BuildRequires: ghc-base16-bytestring-devel
BuildRequires: ghc-base64-bytestring-devel
BuildRequires: ghc-bytestring-devel
@@ -55,6 +55,7 @@
BuildRequires: ghc-tasty-hunit-devel
BuildRequires: ghc-tasty-quickcheck-devel
BuildRequires: ghc-temporary-devel
+BuildRequires: ghc-text-devel
BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-vector-devel
%endif
@@ -89,7 +90,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ hackage-security-0.6.0.1.tar.gz -> hackage-security-0.6.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.0.1/ChangeLog.md
new/hackage-security-0.6.2.0/ChangeLog.md
--- old/hackage-security-0.6.0.1/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
+++ new/hackage-security-0.6.2.0/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,5 +1,17 @@
See also http://pvp.haskell.org/faq
+0.6.2.0
+-------
+
+* Safely prepare for when cabal factors out Cabal-syntax
+
+0.6.1.0
+-------
+
+* Support basic auth in package-indices (#252)
+* Fix tests due to new aeson handling of unescaped control sequences (#256)
+* Bump a lot of bounds on packages we depend on
+
0.6.0.1
-------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.0.1/hackage-security.cabal
new/hackage-security-0.6.2.0/hackage-security.cabal
--- old/hackage-security-0.6.0.1/hackage-security.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.2.0/hackage-security.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: hackage-security
-version: 0.6.0.1
+version: 0.6.2.0
synopsis: Hackage security library
description: The hackage security library provides both server and
@@ -24,7 +24,7 @@
license-file: LICENSE
author: Edsko de Vries
maintainer: [email protected]
-copyright: Copyright 2015-2016 Well-Typed LLP
+copyright: Copyright 2015-2022 Well-Typed LLP
category: Distribution
homepage: https://github.com/haskell/hackage-security
bug-reports: https://github.com/haskell/hackage-security/issues
@@ -48,6 +48,11 @@
description: Are we using @network-uri@?
manual: False
+flag Cabal-syntax
+ description: Are we using Cabal-syntax?
+ manual: False
+ default: False
+
flag old-directory
description: Use @directory@ < 1.2 and @old-time@
manual: False
@@ -110,13 +115,10 @@
Hackage.Security.Util.TypedEmbedded
Prelude
-- We support ghc 7.4 (bundled with Cabal 1.14) and up
- build-depends: base >= 4.5 && < 4.15,
- base16-bytestring >= 0.1.1 && < 0.2,
- base64-bytestring >= 1.0 && < 1.1,
- bytestring >= 0.9 && < 0.11,
- Cabal >= 1.14 && < 1.26
- || >= 2.0 && < 2.6
- || >= 3.0 && < 3.4,
+ build-depends: base >= 4.5 && < 4.17,
+ base16-bytestring >= 0.1.1 && < 1.1,
+ base64-bytestring >= 1.0 && < 1.3,
+ bytestring >= 0.9 && < 0.12,
containers >= 0.4 && < 0.7,
ed25519 >= 0.0 && < 0.1,
filepath >= 1.2 && < 1.5,
@@ -126,8 +128,8 @@
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
-- functionality, 0.5.0 changes type of serialise
tar >= 0.5 && < 0.6,
- template-haskell >= 2.7 && < 2.17,
- time >= 1.2 && < 1.10,
+ template-haskell >= 2.7 && < 2.19,
+ time >= 1.2 && < 1.13,
transformers >= 0.3 && < 0.6,
zlib >= 0.5 && < 0.7,
-- whatever versions are bundled with ghc:
@@ -149,6 +151,14 @@
else
build-depends: base >= 4.10
+ if flag(Cabal-syntax)
+ build-depends: Cabal-syntax >= 3.7 && < 3.9
+ else
+ build-depends: Cabal >= 1.14 && < 1.26
+ || >= 2.0 && < 2.6
+ || >= 3.0 && < 3.7,
+ Cabal-syntax < 3.7
+
hs-source-dirs: src
default-language: Haskell2010
default-extensions: DefaultSignatures
@@ -254,15 +264,19 @@
bytestring,
network-uri,
tar,
+ text,
time,
zlib
+ if flag(Cabal-syntax)
+ build-depends: Cabal-syntax
+
-- dependencies exclusive to test-suite
- build-depends: tasty == 1.2.*,
+ build-depends: tasty >= 1.2 && < 1.5,
tasty-hunit == 0.10.*,
tasty-quickcheck == 0.10.*,
- QuickCheck >= 2.11 && <2.14,
- aeson == 1.4.*,
+ QuickCheck >= 2.11 && <2.15,
+ aeson == 1.4.* || == 1.5.* || == 2.0.*,
vector == 0.12.*,
unordered-containers >=0.2.8.0 && <0.3,
temporary >= 1.2 && < 1.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hackage-security-0.6.0.1/tests/TestSuite/JSON.hs
new/hackage-security-0.6.2.0/tests/TestSuite/JSON.hs
--- old/hackage-security-0.6.0.1/tests/TestSuite/JSON.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/hackage-security-0.6.2.0/tests/TestSuite/JSON.hs 2001-09-09
03:46:40.000000000 +0200
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module TestSuite.JSON (
prop_roundtrip_canonical,
@@ -21,23 +22,30 @@
import Data.Aeson (Value (..), eitherDecode)
import Data.String (fromString)
import qualified Data.Vector as V
+#if MIN_VERSION_aeson(2,0,0)
+import qualified Data.Aeson.KeyMap as KM
+#else
import qualified Data.HashMap.Strict as HM
+#endif
+
+-- text
+import qualified Data.Text as Text
prop_aeson_canonical, prop_roundtrip_canonical, prop_roundtrip_pretty,
prop_canonical_pretty
- :: JSValue -> Bool
+ :: JSValue -> Property
prop_roundtrip_canonical jsval =
- parseCanonicalJSON (renderCanonicalJSON jsval) == Right (canonicalise
jsval)
+ parseCanonicalJSON (renderCanonicalJSON jsval) === Right (canonicalise
jsval)
prop_roundtrip_pretty jsval =
- parseCanonicalJSON (BS.pack (prettyCanonicalJSON jsval)) == Right jsval
+ parseCanonicalJSON (BS.pack (prettyCanonicalJSON jsval)) === Right jsval
prop_canonical_pretty jsval =
- parseCanonicalJSON (renderCanonicalJSON jsval) ==
+ parseCanonicalJSON (renderCanonicalJSON jsval) ===
fmap canonicalise (parseCanonicalJSON (BS.pack (prettyCanonicalJSON
jsval)))
prop_aeson_canonical jsval =
- eitherDecode (renderCanonicalJSON jsval) == Right (toAeson (canonicalise
jsval))
+ eitherDecode (renderCanonicalJSON jsval) === Right (toAeson (canonicalise
jsval))
canonicalise :: JSValue -> JSValue
canonicalise v@JSNull = v
@@ -48,6 +56,9 @@
canonicalise (JSObject vs) = JSObject [ (k, canonicalise v)
| (k,v) <- sortBy (compare `on` fst)
vs ]
+sanitizeString :: String -> String
+sanitizeString s = Text.unpack (Text.replace (Text.pack "\\") (Text.pack
"\\\\") (Text.pack (show s)))
+
instance Arbitrary JSValue where
arbitrary =
sized $ \sz ->
@@ -55,9 +66,9 @@
[ (1, pure JSNull)
, (1, JSBool <$> arbitrary)
, (2, JSNum <$> arbitrary)
- , (2, JSString . getASCIIString <$> arbitrary)
+ , (2, JSString . sanitizeString . getASCIIString <$> arbitrary)
, (3, JSArray <$> resize (sz `div` 2) arbitrary)
- , (3, JSObject . mapFirst getASCIIString . noDupFields <$> resize (sz
`div` 2) arbitrary)
+ , (3, JSObject . mapFirst (sanitizeString . getASCIIString) .
noDupFields <$> resize (sz `div` 2) arbitrary)
]
where
noDupFields = nubBy (\(x,_) (y,_) -> x==y)
@@ -78,7 +89,11 @@
toAeson (JSNum n) = Number (fromIntegral n)
toAeson (JSString s) = String (fromString s)
toAeson (JSArray xs) = Array $ V.fromList [ toAeson x | x <- xs ]
+#if MIN_VERSION_aeson(2,0,0)
+toAeson (JSObject xs) = Object $ KM.fromList [ (fromString k, toAeson v) | (k,
v) <- xs ]
+#else
toAeson (JSObject xs) = Object $ HM.fromList [ (fromString k, toAeson v) | (k,
v) <- xs ]
+#endif
instance Arbitrary Int54 where
arbitrary = fromIntegral <$>
