Compare commits

..

No commits in common. "rawhide" and "f37" have entirely different histories.
rawhide ... f37

7 changed files with 391 additions and 129 deletions

1
.gitignore vendored
View File

@ -2,4 +2,3 @@
/hackage-security-0.5.3.0.tar.gz
/hackage-security-0.6.0.1.tar.gz
/hackage-security-0.6.2.1.tar.gz
/hackage-security-0.6.2.3.tar.gz

View File

@ -1,72 +0,0 @@
* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 0.6.2.3-1
- https://hackage.haskell.org/package/hackage-security-0.6.2.3/changelog
- refresh to cabal-rpm-2.1.0 with SPDX migration
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 0.6.2.1-1
- https://hackage.haskell.org/package/hackage-security-0.6.2.1/changelog
* Thu Mar 10 2022 Jens Petersen <petersen@redhat.com> - 0.6.0.1-7
- rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Aug 06 2021 Jens Petersen <petersen@redhat.com> - 0.6.0.1-5
- rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 23 2020 Jens Petersen <petersen@redhat.com> - 0.6.0.1-1
- update to 0.6.0.1
* Wed Feb 19 2020 Jens Petersen <petersen@redhat.com> - 0.5.3.0-9
- refresh to cabal-rpm-2.0.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 0.5.3.0-7
- add doc and prof subpackages (cabal-rpm-1.0.0)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.5.3.0-5
- refresh to cabal-rpm-0.13
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 0.5.3.0-3
- revise .cabal
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jul 09 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.5.3.0-1
- update to 0.5.3.0
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 0.5.2.2-7
- rebuild
* Fri Oct 6 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.5.2.2-6
- Bump release to be newer than existing bundled version.
* Thu Oct 5 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.5.2.2-2
- Split documentation into separate subpackage.
* Thu Oct 5 2017 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.5.2.2-1
- spec file generated by cabal-rpm-0.11.2

View File

@ -1,4 +1,4 @@
# generated by cabal-rpm-2.1.0
# generated by cabal-rpm-2.0.12
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name hackage-security
@ -8,44 +8,22 @@
%bcond_with tests
Name: ghc-%{pkg_name}
Version: 0.6.2.3
Release: %autorelease
Version: 0.6.2.1
Release: 2%{?dist}
Summary: Hackage security library
License: BSD-3-Clause
License: BSD
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
Patch0: hackage-security-no-Cabal-syntax.patch
Patch0: hackage-security-0.6.2.1-no-Cabal-syntax.patch
# Begin cabal-rpm deps:
BuildRequires: dos2unix
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-Cabal-devel
#BuildRequires: ghc-Cabal-syntax-devel
BuildRequires: ghc-base-devel
BuildRequires: ghc-base16-bytestring-devel
BuildRequires: ghc-base64-bytestring-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-cryptohash-sha256-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-ed25519-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-lukko-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-network-uri-devel
BuildRequires: ghc-parsec-devel
BuildRequires: ghc-pretty-devel
BuildRequires: ghc-tar-devel
BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-zlib-devel
%if %{with ghc_prof}
BuildRequires: ghc-Cabal-prof
#BuildRequires: ghc-Cabal-syntax-prof
BuildRequires: ghc-base-prof
BuildRequires: ghc-base16-bytestring-prof
BuildRequires: ghc-base64-bytestring-prof
@ -66,7 +44,6 @@ BuildRequires: ghc-template-haskell-prof
BuildRequires: ghc-time-prof
BuildRequires: ghc-transformers-prof
BuildRequires: ghc-zlib-prof
%endif
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-aeson-devel
@ -131,6 +108,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%prep
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
cp -bp %{SOURCE1} %{pkg_name}.cabal
# End cabal-rpm setup
%patch0 -p1 -b .orig
@ -147,6 +125,12 @@ This package provides the Haskell %{pkg_name} profiling library.
# End cabal-rpm install
%check
%if %{with tests}
%cabal_test
%endif
%files -f %{name}.files
# Begin cabal-rpm files:
%license LICENSE
@ -169,4 +153,71 @@ This package provides the Haskell %{pkg_name} profiling library.
%changelog
%autochangelog
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 0.6.2.1-1
- https://hackage.haskell.org/package/hackage-security-0.6.2.1/changelog
* Thu Mar 10 2022 Jens Petersen <petersen@redhat.com> - 0.6.0.1-7
- rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Aug 06 2021 Jens Petersen <petersen@redhat.com> - 0.6.0.1-5
- rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 23 2020 Jens Petersen <petersen@redhat.com> - 0.6.0.1-1
- update to 0.6.0.1
* Wed Feb 19 2020 Jens Petersen <petersen@redhat.com> - 0.5.3.0-9
- refresh to cabal-rpm-2.0.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 0.5.3.0-7
- add doc and prof subpackages (cabal-rpm-1.0.0)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.5.3.0-5
- refresh to cabal-rpm-0.13
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 0.5.3.0-3
- revise .cabal
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jul 09 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.5.3.0-1
- update to 0.5.3.0
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 0.5.2.2-7
- rebuild
* Fri Oct 6 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.5.2.2-6
- Bump release to be newer than existing bundled version.
* Thu Oct 5 2017 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.5.2.2-2
- Split documentation into separate subpackage.
* Thu Oct 5 2017 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.5.2.2-1
- spec file generated by cabal-rpm-0.11.2

View File

@ -0,0 +1,12 @@
--- hackage-security-0.6.2.1/hackage-security.cabal~ 2022-06-07 13:36:36.195520934 +0800
+++ hackage-security-0.6.2.1/hackage-security.cabal 2022-06-10 17:28:44.922275403 +0800
@@ -159,8 +159,7 @@
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
- || >= 3.0 && < 3.7,
- Cabal-syntax < 3.7
+ || >= 3.0 && < 3.7
hs-source-dirs: src
default-language: Haskell2010

View File

@ -0,0 +1,296 @@
cabal-version: 1.12
name: hackage-security
version: 0.6.2.1
x-revision: 2
synopsis: Hackage security library
description: The hackage security library provides both server and
client utilities for securing the Hackage package server
(<http://hackage.haskell.org/>). It is based on The Update
Framework (<http://theupdateframework.com/>), a set of
recommendations developed by security researchers at
various universities in the US as well as developers on the
Tor project (<https://www.torproject.org/>).
.
The current implementation supports only index signing,
thereby enabling untrusted mirrors. It does not yet provide
facilities for author package signing.
.
The library has two main entry points:
"Hackage.Security.Client" is the main entry point for
clients (the typical example being @cabal@), and
"Hackage.Security.Server" is the main entry point for
servers (the typical example being @hackage-server@).
license: BSD3
license-file: LICENSE
author: Edsko de Vries
maintainer: cabal-devel@haskell.org
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
build-type: Simple
tested-with:
GHC==9.2.1, GHC==9.0.2,
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
extra-source-files:
ChangeLog.md
source-repository head
type: git
location: https://github.com/haskell/hackage-security.git
flag base48
description: Are we using @base@ 4.8 or later?
manual: False
flag use-network-uri
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
default: False
flag mtl21
description: Use @mtl@ < 2.2 and @mtl-compat@
manual: False
default: False
flag lukko
description: Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@
manual: True
default: True
library
-- Most functionality is exported through the top-level entry points .Client
-- and .Server; the other exported modules are intended for qualified imports.
exposed-modules: Hackage.Security.Client
Hackage.Security.Client.Formats
Hackage.Security.Client.Repository
Hackage.Security.Client.Repository.Cache
Hackage.Security.Client.Repository.Local
Hackage.Security.Client.Repository.Remote
Hackage.Security.Client.Repository.HttpLib
Hackage.Security.Client.Verify
Hackage.Security.JSON
Hackage.Security.Key.Env
Hackage.Security.Server
Hackage.Security.Trusted
Hackage.Security.TUF.FileMap
Hackage.Security.Util.Checked
Hackage.Security.Util.Path
Hackage.Security.Util.Pretty
Hackage.Security.Util.Some
Text.JSON.Canonical
other-modules: Hackage.Security.Key
Hackage.Security.Trusted.TCB
Hackage.Security.TUF
Hackage.Security.TUF.Common
Hackage.Security.TUF.FileInfo
Hackage.Security.TUF.Header
Hackage.Security.TUF.Layout.Cache
Hackage.Security.TUF.Layout.Index
Hackage.Security.TUF.Layout.Repo
Hackage.Security.TUF.Mirrors
Hackage.Security.TUF.Paths
Hackage.Security.TUF.Patterns
Hackage.Security.TUF.Root
Hackage.Security.TUF.Signed
Hackage.Security.TUF.Snapshot
Hackage.Security.TUF.Targets
Hackage.Security.TUF.Timestamp
Hackage.Security.Util.Base64
Hackage.Security.Util.Exit
Hackage.Security.Util.IO
Hackage.Security.Util.JSON
Hackage.Security.Util.Lens
Hackage.Security.Util.Stack
Hackage.Security.Util.TypedEmbedded
MyPrelude
-- We support ghc 7.4 (bundled with Cabal 1.14) and up
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,
parsec >= 3.1 && < 3.2,
pretty >= 1.0 && < 1.2,
cryptohash-sha256 >= 0.11 && < 0.12,
-- 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.19,
time >= 1.2 && < 1.13,
transformers >= 0.3 && < 0.6,
zlib >= 0.5 && < 0.7,
-- whatever versions are bundled with ghc:
ghc-prim
if flag(old-directory)
build-depends: directory >= 1.1.0.2 && < 1.2,
old-time >= 1 && < 1.2
else
build-depends: directory >= 1.2 && < 1.4
if flag(mtl21)
build-depends: mtl >= 2.1 && < 2.2,
mtl-compat >= 0.2 && < 0.3
else
build-depends: mtl >= 2.2 && < 2.3
if flag(lukko)
build-depends: lukko >= 0.1 && < 0.2
else
build-depends: base >= 4.10
if flag(Cabal-syntax)
build-depends: Cabal-syntax >= 3.7 && < 3.10
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
DeriveDataTypeable
DeriveFunctor
FlexibleContexts
FlexibleInstances
GADTs
GeneralizedNewtypeDeriving
KindSignatures
MultiParamTypeClasses
NamedFieldPuns
NoImplicitPrelude
NoMonomorphismRestriction
RankNTypes
RecordWildCards
ScopedTypeVariables
StandaloneDeriving
TupleSections
TypeFamilies
TypeOperators
ViewPatterns
other-extensions: BangPatterns
CPP
OverlappingInstances
PackageImports
UndecidableInstances
-- use the new stage1/cross-compile-friendly DeriveLift extension for GHC 8.0+
if impl(ghc >= 8.0)
other-extensions: DeriveLift
else
other-extensions: TemplateHaskell
ghc-options: -Wall
if flag(base48)
build-depends: base >= 4.8
else
build-depends: base < 4.8, old-locale == 1.0.*
-- The URI type got split out off the network package after version 2.5, and
-- moved to a separate network-uri package. Since we don't need the rest of
-- network here, it would suffice to rely only on network-uri:
--
-- > if flag(use-network-uri)
-- > build-depends: network-uri >= 2.6 && < 2.7
-- > else
-- > build-depends: network >= 2.5 && < 2.6
--
-- However, if we did the same in hackage-security-HTTP, Cabal would consider
-- those two flag choices (hackage-security:use-network-uri and
-- hackage-security-HTTP:use-network-uri) to be completely independent; but
-- they aren't: if it links hackage-security against network-uri and
-- hackage-security-HTTP against network, we will get type errors when
-- hackage-security-HTTP tries to pass a URI to hackage-security.
--
-- It might seem we can solve this problem by re-exporting the URI type in
-- hackage-security and avoid the dependency in hackage-security-HTTP
-- altogether. However, this merely shifts the problem: hackage-security-HTTP
-- relies on the HTTP library which--surprise!--makes the same choice between
-- depending on network or network-uri. Cabal will not notice that we cannot
-- build hackage-security and hackage-security-HTTP against network-uri but
-- HTTP against network.
--
-- We solve the problem by explicitly relying on network-2.6 when choosing
-- network-uri. This dependency is redundant, strictly speaking. However, it
-- serves as a proxy for forcing flag choices: since all packages in a
-- solution must be linked against the same version of network, having one
-- version of network in one branch of the conditional and another version of
-- network in the other branch forces the choice to be consistent throughout.
-- (Note that the HTTP library does the same thing, though in this case the
-- dependency in network is not redundant.)
if flag(use-network-uri)
build-depends: network-uri >= 2.6 && < 2.7,
network >= 2.6 && < 2.9
|| >= 3.0 && < 3.2
else
build-depends: network >= 2.5 && < 2.6
if impl(ghc >= 7.8)
other-extensions: RoleAnnotations
if impl(ghc >= 7.10)
other-extensions: AllowAmbiguousTypes
StaticPointers
test-suite TestSuite
type: exitcode-stdio-1.0
main-is: TestSuite.hs
other-modules: TestSuite.HttpMem
TestSuite.InMemCache
TestSuite.InMemRepo
TestSuite.InMemRepository
TestSuite.JSON
TestSuite.PrivateKeys
TestSuite.Util.StrictMVar
-- inherited constraints from lib:hackage-security component
build-depends: hackage-security,
base,
Cabal,
containers,
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 && < 1.5,
tasty-hunit == 0.10.*,
tasty-quickcheck == 0.10.*,
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
hs-source-dirs: tests
default-language: Haskell2010
default-extensions: FlexibleContexts
GADTs
KindSignatures
RankNTypes
RecordWildCards
ScopedTypeVariables
ghc-options: -Wall

View File

@ -1,24 +0,0 @@
--- hackage-security-0.6.2.3/hackage-security.cabal~ 2001-09-09 09:46:40.000000000 +0800
+++ hackage-security-0.6.2.3/hackage-security.cabal 2023-01-24 20:49:44.801982800 +0800
@@ -158,8 +158,7 @@
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
- || >= 3.0 && < 3.7,
- Cabal-syntax < 3.7
+ || >= 3.0 && < 3.7
hs-source-dirs: src
default-language: Haskell2010
@@ -276,8 +275,7 @@
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
- || >= 3.0 && < 3.7,
- Cabal-syntax < 3.7
+ || >= 3.0 && < 3.7
-- dependencies exclusive to test-suite
build-depends: tasty >= 1.2 && < 1.5,
Diff finished. Tue Jan 24 20:49:56 2023

View File

@ -1 +1 @@
SHA512 (hackage-security-0.6.2.3.tar.gz) = d2bd80a940a2bacdbe6c6f5086ae846eb27548f0013952e0fe95dfbdea7bc4f17631f86f295d62b02a491f3903d8a5ab316bad2d8227fd240f459cbe966b1b84
SHA512 (hackage-security-0.6.2.1.tar.gz) = 9d2b10f4ec5a6f095d4790f7b85e38c5477dc1fd7c03088b706c1d83cf8c491c85572db787e8611227ed902639580ddd0523678b3b9136458335d76cd24436bd