From 5e45d52b08a1066ac672e2e3b3f04cdf89c5257a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 6 Sep 2017 13:55:43 +0000 Subject: [PATCH 01/35] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..cca7876 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# ghc-cryptonite + +The ghc-cryptonite package \ No newline at end of file From 653f59f12d01af241b7f4c9ceb4835d10e5680c3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 6 Sep 2017 15:29:40 -0400 Subject: [PATCH 02/35] Initial import (#1488611). --- .gitignore | 1 + README.md | 3 - ghc-cryptonite.spec | 143 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 ghc-cryptonite.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..75beaeb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/cryptonite-0.24.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index cca7876..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ghc-cryptonite - -The ghc-cryptonite package \ No newline at end of file diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec new file mode 100644 index 0000000..1cef2ce --- /dev/null +++ b/ghc-cryptonite.spec @@ -0,0 +1,143 @@ +# generated by cabal-rpm-0.11.2 +# https://fedoraproject.org/wiki/Packaging:Haskell + +%global pkg_name cryptonite +%global pkgver %{pkg_name}-%{version} + +%bcond_with tests + +Name: ghc-%{pkg_name} +Version: 0.24 +Release: 2.git.0.7f579c3%{?dist} +Summary: Cryptography Primitives sink + +# Main - Argon2 C code - Blake2 C code +License: BSD and (CC0 or ASL 2.0) and (CC0 or ASL 2.0 or OpenSSL) +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz + +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-foundation-devel +BuildRequires: ghc-memory-devel +%if %{with tests} +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-kat-devel +BuildRequires: ghc-tasty-quickcheck-devel +%endif +# End cabal-rpm deps + +%description +A repository of cryptographic primitives. + +* Symmetric ciphers: AES, DES, 3DES, Blowfish, Camellia, RC4, Salsa, XSalsa, +ChaCha. + +* Hash: SHA1, SHA2, SHA3, SHAKE, MD2, MD4, MD5, Keccak, Skein, Ripemd, Tiger, +Whirlpool, Blake2 + +* MAC: HMAC, Poly1305 + +* Asymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519, Curve448, +Ed25519, Ed448 + +* Key Derivation Function: PBKDF2, Scrypt, HKDF, Argon2 + +* Cryptographic Random generation: System Entropy, Deterministic Random +Generator + +* Data related: Anti-Forensic Information Splitter (AFIS) + +If anything cryptographic related is missing from here, submit a pull request +to have it added. This package strive to be a cryptographic kitchen sink that +provides cryptography for everyone. + +Evaluate the security related to your requirements before using. + +Read "Crypto.Tutorial" for a quick start guide. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. + + +%package devel-doc +Summary: Haskell %{pkg_name} library development documentation + +BuildArch: noarch + +%description devel-doc +This package provides the Haskell %{pkg_name} library development +documentation. + + +%prep +%setup -q -n %{pkgver} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install +grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files +grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files + + +%check +%cabal_test + + +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache + + +%files -f %{name}.files +%license LICENSE + + +%files devel -f %{name}-devel-nodoc.files +%doc CHANGELOG.md README.md + + +%files devel-doc -f %{name}-devel-doc.files +%doc CHANGELOG.md README.md + + +%changelog +* Tue Sep 05 2017 Elliott Sales de Andrade 0.24-2 +- Split documentation into separate subpackage. +- Correct licensing information. + +* Tue Sep 05 2017 Elliott Sales de Andrade 0.24-1 +- Update to latest version. +- Update to latest spec template. + +* Sat Jul 22 2017 Elliott Sales de Andrade 0.22-1 +- update to 0.22 + +* Fri Jul 21 2017 Elliott Sales de Andrade 0.15-3 +- Bump for Fedora 26. + +* Thu Dec 15 2016 Elliott Sales de Andrade - 0.15-2 +- Update release to be newer than previous builds + +* Thu Dec 15 2016 Fedora Haskell SIG - 0.15-1 +- spec file generated by cabal-rpm-0.10.0 diff --git a/sources b/sources new file mode 100644 index 0000000..bef5e8c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (cryptonite-0.24.tar.gz) = f6a7379f8d2f398dcd8e6c27092158a51363a3d70ed28a22b1a4ba64ece55c700cc9d701acd6bb5492beefe4fd0ca87287362c58e5bd4e98fe06a12d531debf3 From 668b731f58eaa19efc98f5994a6642229f3773f9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 6 Sep 2017 15:30:02 -0400 Subject: [PATCH 03/35] Fix release number. --- ghc-cryptonite.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 1cef2ce..5c8b045 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.24 -Release: 2.git.0.7f579c3%{?dist} +Release: 2%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code From 3f78b7960f986c905bba5541172c67895de179c6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:10:55 +0100 Subject: [PATCH 04/35] refresh to cabal-rpm-0.12.1 --- ghc-cryptonite.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 5c8b045..a96bbeb 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.2 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptonite @@ -64,9 +64,12 @@ Read "Crypto.Tutorial" for a quick start guide. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -101,6 +104,12 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 3cfcd4e155c80fac2c900ca04957fa59e34daf15 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 11:27:35 +0100 Subject: [PATCH 05/35] bump release --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index a96bbeb..19ed268 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -131,6 +131,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Fri Jan 26 2018 Jens Petersen - 0.24-3 +- rebuild + * Tue Sep 05 2017 Elliott Sales de Andrade 0.24-2 - Split documentation into separate subpackage. - Correct licensing information. From 8b7ff8ed85727dc80c70d34c1056fe68e27372a3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 1 Feb 2018 01:33:40 +0900 Subject: [PATCH 06/35] docs package is arch dependent --- ghc-cryptonite.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 19ed268..6174704 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -79,8 +79,6 @@ This package provides the Haskell %{pkg_name} library development files. %package devel-doc Summary: Haskell %{pkg_name} library development documentation -BuildArch: noarch - %description devel-doc This package provides the Haskell %{pkg_name} library development documentation. @@ -131,8 +129,8 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog -* Fri Jan 26 2018 Jens Petersen - 0.24-3 -- rebuild +* Wed Jan 31 2018 Jens Petersen - 0.24-3 +- docs package is arch dependent * Tue Sep 05 2017 Elliott Sales de Andrade 0.24-2 - Split documentation into separate subpackage. From c2a8090cea3886359d0feb6fa3f5bc95a67276e5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:02:18 +0900 Subject: [PATCH 07/35] drop ldconfig scriptlets --- ghc-cryptonite.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 6174704..8639779 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -102,12 +102,6 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 7315dbbdc1543131301a98a13060e2cdd30ce75b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 11:30:30 +0000 Subject: [PATCH 08/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 8639779..f06de01 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.24 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -123,6 +123,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 31 2018 Jens Petersen - 0.24-3 - docs package is arch dependent From c2967c54baa4ad52067a8578093242dc88941f95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 01:41:47 +0000 Subject: [PATCH 09/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index f06de01..21d214a 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.24 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -123,6 +123,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.24-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.24-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From db1b56009ab8389ad414b26b9e4182c5c27e4295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Jul 2018 13:41:46 +0200 Subject: [PATCH 10/35] Rebuilt for #1607054 --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 21d214a..208676e 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.24 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -123,6 +123,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Mon Jul 23 2018 Miro Hrončok - 0.24-6 +- Rebuilt for #1607054 + * Fri Jul 13 2018 Fedora Release Engineering - 0.24-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 7b99bb65cc874f2c62b0d5698c2b8afc53592f93 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Jul 2018 18:29:43 +0900 Subject: [PATCH 11/35] update to 0.25 --- .gitignore | 1 + ghc-cryptonite.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 75beaeb..1f0bcf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cryptonite-0.24.tar.gz +/cryptonite-0.25.tar.gz diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 208676e..8b5ba86 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptonite @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.24 -Release: 6%{?dist} +Version: 0.25 +Release: 1%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -19,10 +19,11 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: +BuildRequires: ghc-basement-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-foundation-devel BuildRequires: ghc-memory-devel +BuildRequires: glibc-devel %if %{with tests} BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-hunit-devel @@ -34,8 +35,8 @@ BuildRequires: ghc-tasty-quickcheck-devel %description A repository of cryptographic primitives. -* Symmetric ciphers: AES, DES, 3DES, Blowfish, Camellia, RC4, Salsa, XSalsa, -ChaCha. +* Symmetric ciphers: AES, DES, 3DES, CAST5, Blowfish, Twofish, Camellia, RC4, +Salsa, XSalsa, ChaCha. * Hash: SHA1, SHA2, SHA3, SHAKE, MD2, MD4, MD5, Keccak, Skein, Ripemd, Tiger, Whirlpool, Blake2 @@ -71,6 +72,9 @@ Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} +# Begin cabal-rpm deps: +Requires: glibc-devel%{?_isa} +# End cabal-rpm deps %description devel This package provides the Haskell %{pkg_name} library development files. @@ -123,6 +127,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Sat Jul 28 2018 Jens Petersen - 0.25-1 +- update to 0.25 + * Mon Jul 23 2018 Miro Hrončok - 0.24-6 - Rebuilt for #1607054 diff --git a/sources b/sources index bef5e8c..994a203 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptonite-0.24.tar.gz) = f6a7379f8d2f398dcd8e6c27092158a51363a3d70ed28a22b1a4ba64ece55c700cc9d701acd6bb5492beefe4fd0ca87287362c58e5bd4e98fe06a12d531debf3 +SHA512 (cryptonite-0.25.tar.gz) = e2c246b85595cca60c4d0f4eda737ab3be2a73ee012ba234c2b1a0111a7b77e04c6ba5597c807e3d2d48dc41e9b4fe0419ce95072e9977903c437b36350f0405 From 8e26dd4819fc65d8f117fdeee0347e03daab1bba Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 13 Sep 2018 18:40:22 +0900 Subject: [PATCH 12/35] fix build when haddock disabled --- ghc-cryptonite.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 8b5ba86..9433bad 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -99,7 +99,9 @@ documentation. %install %ghc_lib_install grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files +%if %{undefined without_haddock} grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files +%endif %check @@ -122,8 +124,10 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %doc CHANGELOG.md README.md +%if %{undefined without_haddock} %files devel-doc -f %{name}-devel-doc.files %doc CHANGELOG.md README.md +%endif %changelog From b39ca641ba44c5b4ea848fc45ec1e33b684d20fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 21:22:20 +0000 Subject: [PATCH 13/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 9433bad..d6a2925 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -131,6 +131,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 28 2018 Jens Petersen - 0.25-1 - update to 0.25 From baf2f238914a012e525c216f2ae7550a7d8d94c8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:44:11 +0800 Subject: [PATCH 14/35] refresh to cabal-rpm-0.13 --- ghc-cryptonite.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index d6a2925..7513113 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptonite @@ -8,17 +8,19 @@ Name: ghc-%{pkg_name} Version: 0.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code License: BSD and (CC0 or ASL 2.0) and (CC0 or ASL 2.0 or OpenSSL) Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-basement-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel @@ -89,15 +91,21 @@ documentation. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files %if %{undefined without_haddock} grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files @@ -117,7 +125,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel-nodoc.files @@ -131,6 +141,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Sun Feb 17 2019 Jens Petersen - 0.25-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.25-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a5fe478868e6ee888b22985fc0c4a9730a610380 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 02:18:36 +0000 Subject: [PATCH 15/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 7513113..e86a12c 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -141,6 +141,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.25-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.25-3 - refresh to cabal-rpm-0.13 From 148398e16433c4aa58c630c32deea3616b91452f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:22:30 +0000 Subject: [PATCH 16/35] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-cryptonite.spec | 62 ++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index e86a12c..6cbc33c 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptonite @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -20,6 +20,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-basement-devel BuildRequires: ghc-bytestring-devel @@ -67,11 +73,8 @@ Read "Crypto.Tutorial" for a quick start guide. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} # Begin cabal-rpm deps: @@ -82,12 +85,24 @@ Requires: glibc-devel%{?_isa} This package provides the Haskell %{pkg_name} library development files. -%package devel-doc -Summary: Haskell %{pkg_name} library development documentation +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation +Obsoletes: %{name}-devel-doc < %{version}-%{release} -%description devel-doc -This package provides the Haskell %{pkg_name} library development -documentation. +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif %prep @@ -106,41 +121,36 @@ documentation. # Begin cabal-rpm install %ghc_lib_install # End cabal-rpm install -grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files -%if %{undefined without_haddock} -grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files -%endif %check %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE # End cabal-rpm files -%files devel -f %{name}-devel-nodoc.files +%files devel -f %{name}-devel.files %doc CHANGELOG.md README.md -%if %{undefined without_haddock} -%files devel-doc -f %{name}-devel-doc.files -%doc CHANGELOG.md README.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files %endif %changelog +* Thu Aug 01 2019 Jens Petersen - 0.25-5 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 0.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 39d712cac3cc0d3ad6160859cca7bdb5e792f50c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:28:28 +0800 Subject: [PATCH 17/35] BR prof for lib and static for executable --- ghc-cryptonite.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 6cbc33c..bf16e9f 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptonite @@ -20,17 +20,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-basement-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-memory-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-basement-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-memory-prof BuildRequires: glibc-devel %if %{with tests} BuildRequires: ghc-tasty-devel @@ -73,6 +68,7 @@ Read "Crypto.Tutorial" for a quick start guide. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From c67cce78d4a3c31af479dc54e499026723816c8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 20:31:18 +0000 Subject: [PATCH 18/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index bf16e9f..341edff 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.25 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -144,6 +144,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.25-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Jens Petersen - 0.25-5 - add doc and prof subpackages (cabal-rpm-1.0.0) From e7c465ff857177bbf9a7ddeac57ff5c9e0bfee74 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 6 Feb 2020 23:02:35 +0800 Subject: [PATCH 19/35] refresh to cabal-rpm-2.0.2 --- ghc-cryptonite.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 341edff..35b796c 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,14 +1,14 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptonite %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.25 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -84,6 +84,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch Obsoletes: %{name}-devel-doc < %{version}-%{release} %description doc @@ -95,6 +96,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -123,6 +125,16 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -135,6 +147,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif @@ -144,6 +157,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Wed Feb 19 2020 Jens Petersen - 0.25-7 +- refresh to cabal-rpm-2.0.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.25-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 954e931fde5b2af4ffec1d499da94f61e2d567f6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 21 Feb 2020 11:58:40 +0800 Subject: [PATCH 20/35] disable testsuite again hangs on my archs and fails on aarch64 --- ghc-cryptonite.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 35b796c..547dfc7 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -4,7 +4,8 @@ %global pkg_name cryptonite %global pkgver %{pkg_name}-%{version} -%bcond_without tests +# https://github.com/haskell-crypto/cryptonite/issues/311 +%bcond_with tests Name: ghc-%{pkg_name} Version: 0.25 From 0cadc8503844e459435a9563d820266855a0c2b4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 21 Feb 2020 12:18:00 +0800 Subject: [PATCH 21/35] docs are arch dependent --- ghc-cryptonite.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 547dfc7..ffe0c78 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -85,7 +85,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation -BuildArch: noarch +# docs are arch dependent Obsoletes: %{name}-devel-doc < %{version}-%{release} %description doc From 1864d56ccf9405df52dac7ce78424c8bd8c8e04d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 3 Jun 2020 19:13:45 +0800 Subject: [PATCH 22/35] update testsuite hang links --- ghc-cryptonite.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index ffe0c78..eda1059 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -4,7 +4,8 @@ %global pkg_name cryptonite %global pkgver %{pkg_name}-%{version} -# https://github.com/haskell-crypto/cryptonite/issues/311 +# https://github.com/feuerbach/tasty/issues/266 +# https://gitlab.haskell.org/ghc/ghc/issues/17744 %bcond_with tests Name: ghc-%{pkg_name} From ed2e952cda32b89e46ce931cd681005f66db51d8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:25:53 +0800 Subject: [PATCH 23/35] refresh to cabal-rpm-2.0.5 --- ghc-cryptonite.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index eda1059..a4b56e5 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name cryptonite %global pkgver %{pkg_name}-%{version} From 378e90a1fdb690505cf85efe7b2428ff89eccef8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 8 Jun 2020 01:53:28 +0800 Subject: [PATCH 24/35] update to 0.26 --- .gitignore | 1 + ghc-cryptonite.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1f0bcf9..6dd540b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /cryptonite-0.24.tar.gz /cryptonite-0.25.tar.gz +/cryptonite-0.26.tar.gz diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index a4b56e5..a564c54 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -9,8 +9,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.25 -Release: 7%{?dist} +Version: 0.26 +Release: 1%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -46,12 +46,12 @@ Salsa, XSalsa, ChaCha. * Hash: SHA1, SHA2, SHA3, SHAKE, MD2, MD4, MD5, Keccak, Skein, Ripemd, Tiger, Whirlpool, Blake2 -* MAC: HMAC, Poly1305 +* MAC: HMAC, KMAC, Poly1305 * Asymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519, Curve448, Ed25519, Ed448 -* Key Derivation Function: PBKDF2, Scrypt, HKDF, Argon2 +* Key Derivation Function: PBKDF2, Scrypt, HKDF, Argon2, BCrypt, BCryptPBKDF * Cryptographic Random generation: System Entropy, Deterministic Random Generator @@ -159,6 +159,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Jun 07 2020 Jens Petersen - 0.26-1 +- update to 0.26 + * Wed Feb 19 2020 Jens Petersen - 0.25-7 - refresh to cabal-rpm-2.0.2 diff --git a/sources b/sources index 994a203..074ab61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptonite-0.25.tar.gz) = e2c246b85595cca60c4d0f4eda737ab3be2a73ee012ba234c2b1a0111a7b77e04c6ba5597c807e3d2d48dc41e9b4fe0419ce95072e9977903c437b36350f0405 +SHA512 (cryptonite-0.26.tar.gz) = 4236d411542fd104e5cace61fbdeda615f7d13e442594d7fa12acc682d917b0494b10b242a88fef19e91e93489797206fee07497bff92e43d3849ebac8ee11b0 From e4ab0f51db3a99f683dd1db9622729acc3021278 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:54:30 +0800 Subject: [PATCH 25/35] refresh to cabal-rpm-2.0.6 --- ghc-cryptonite.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index a564c54..5750aea 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name cryptonite @@ -127,16 +127,6 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From b1d2c12395616ba95a5b610c8a5d30d68de82014 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:59:34 +0000 Subject: [PATCH 26/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 5750aea..5dade64 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -149,6 +149,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 07 2020 Jens Petersen - 0.26-1 - update to 0.26 From e6b2b3f53048301a7a1abfa3637ac360ce3e9e4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:10:27 +0000 Subject: [PATCH 27/35] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 5dade64..3647ce1 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -149,6 +149,10 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.26-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f09a985779bbb283cd932807c6447a710c45bf1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:03:18 +0000 Subject: [PATCH 28/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 3647ce1..8f0d25b 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -149,6 +149,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.26-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 771c6d764abca31ae637f075855e3ac17e4c8ed6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:30:40 +0000 Subject: [PATCH 29/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 8f0d25b..219d13e 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -149,6 +149,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 12aa1b6a72f3efba0ba4327599194bbe3c0b1b0e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 10 Jul 2021 10:49:25 +0800 Subject: [PATCH 30/35] update to 0.27 --- .gitignore | 1 + ghc-cryptonite.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6dd540b..3062541 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cryptonite-0.24.tar.gz /cryptonite-0.25.tar.gz /cryptonite-0.26.tar.gz +/cryptonite-0.27.tar.gz diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 219d13e..ec0c948 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -9,8 +9,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.26 -Release: 5%{?dist} +Version: 0.27 +Release: 1%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -59,7 +59,7 @@ Generator * Data related: Anti-Forensic Information Splitter (AFIS) If anything cryptographic related is missing from here, submit a pull request -to have it added. This package strive to be a cryptographic kitchen sink that +to have it added. This package strives to be a cryptographic kitchen sink that provides cryptography for everyone. Evaluate the security related to your requirements before using. @@ -149,6 +149,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 0.27-1 +- update to 0.27 + * Thu Jul 22 2021 Fedora Release Engineering - 0.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 074ab61..d3afd7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptonite-0.26.tar.gz) = 4236d411542fd104e5cace61fbdeda615f7d13e442594d7fa12acc682d917b0494b10b242a88fef19e91e93489797206fee07497bff92e43d3849ebac8ee11b0 +SHA512 (cryptonite-0.27.tar.gz) = ce7391bb5e8686c1362e6c23b6073b6aefd10fe02a5f42f9f2fe871ca0a4aa8d71072a1a609566fa6184527c61d1be48d67b794da562e4909806548095acf8ac From 5dbe16a50886f8f6e894ee565b0ad084fe4c149a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:10 +0800 Subject: [PATCH 31/35] refresh to cabal-rpm-2.0.9 --- ghc-cryptonite.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index ec0c948..306bb51 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -1,12 +1,10 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name cryptonite %global pkgver %{pkg_name}-%{version} -# https://github.com/feuerbach/tasty/issues/266 -# https://gitlab.haskell.org/ghc/ghc/issues/17744 -%bcond_with tests +%bcond_without tests Name: ghc-%{pkg_name} Version: 0.27 @@ -87,6 +85,7 @@ This package provides the Haskell %{pkg_name} library development files. %package doc Summary: Haskell %{pkg_name} library documentation # docs are arch dependent +Requires: ghc-filesystem Obsoletes: %{name}-devel-doc < %{version}-%{release} %description doc @@ -124,7 +123,9 @@ This package provides the Haskell %{pkg_name} profiling library. %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 8a7fb2f3a895c123b7be9c4ab5f1216e7f274ef8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 10:28:03 +0800 Subject: [PATCH 32/35] update to 0.29 --- .gitignore | 1 + ghc-cryptonite.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3062541..8eb964a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cryptonite-0.25.tar.gz /cryptonite-0.26.tar.gz /cryptonite-0.27.tar.gz +/cryptonite-0.29.tar.gz diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 306bb51..43babea 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -7,7 +7,7 @@ %bcond_without tests Name: ghc-%{pkg_name} -Version: 0.27 +Version: 0.29 Release: 1%{?dist} Summary: Cryptography Primitives sink @@ -150,6 +150,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 0.29-1 +- update to 0.29 + * Thu Aug 5 2021 Jens Petersen - 0.27-1 - update to 0.27 diff --git a/sources b/sources index d3afd7f..0e4f262 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptonite-0.27.tar.gz) = ce7391bb5e8686c1362e6c23b6073b6aefd10fe02a5f42f9f2fe871ca0a4aa8d71072a1a609566fa6184527c61d1be48d67b794da562e4909806548095acf8ac +SHA512 (cryptonite-0.29.tar.gz) = 7f80268e429a9f700709ebdb00da1e2831f2edca064feaa06a9050060fea572abc2fdfee976f60b18a4085cf3a3533e70129104c82e7b050358a97e8575928f2 From a7fde01b47c2eac3c0974c0441d76057459b0863 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 10 Jul 2021 10:59:46 +0800 Subject: [PATCH 33/35] testsuite still hangs for me on Fedora at least --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 43babea..50fe5ee 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -4,7 +4,10 @@ %global pkg_name cryptonite %global pkgver %{pkg_name}-%{version} -%bcond_without tests +# https://github.com/feuerbach/tasty/issues/266 +# https://gitlab.haskell.org/ghc/ghc/issues/17744 +# still hanging on Fedora +%bcond_with tests Name: ghc-%{pkg_name} Version: 0.29 From 7fee3751ea467e263db23bb6486d8b1690e3ec43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:43:18 +0000 Subject: [PATCH 34/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-cryptonite.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-cryptonite.spec b/ghc-cryptonite.spec index 50fe5ee..1fa93ee 100644 --- a/ghc-cryptonite.spec +++ b/ghc-cryptonite.spec @@ -11,7 +11,7 @@ Name: ghc-%{pkg_name} Version: 0.29 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cryptography Primitives sink # Main - Argon2 C code - Blake2 C code @@ -153,6 +153,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.29-1 - update to 0.29 From 87a700ec386a41aeb82e77717cdc6d2711fe8f33 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 21:32:20 +0300 Subject: [PATCH 35/35] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 0e4f262..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (cryptonite-0.29.tar.gz) = 7f80268e429a9f700709ebdb00da1e2831f2edca064feaa06a9050060fea572abc2fdfee976f60b18a4085cf3a3533e70129104c82e7b050358a97e8575928f2