[package-plan] 01/01: fix ed25519 patches

Clint Adams clint at moszumanska.debian.org
Thu Jun 22 02:34:24 UTC 2017


This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository package-plan.

commit 56441c74ba759bb998c147df927ca86ad1f0ada5
Author: Clint Adams <clint at debian.org>
Date:   Wed Jun 21 22:33:47 2017 -0400

    fix ed25519 patches
---
 additional-cabals/ed25519-0.0.5.0.cabal           | 149 ++++++++++++++++++++++
 patches/ed25519/0.0.5.0/fix-dist-path             |  13 ++
 patches/ed25519/0.0.5.0/new-metadata-from-hackage |  22 ++++
 patches/ed25519/0.0.5.0/newer-quickcheck          |  11 ++
 patches/ed25519/0.0.5.0/series                    |   3 +
 5 files changed, 198 insertions(+)

diff --git a/additional-cabals/ed25519-0.0.5.0.cabal b/additional-cabals/ed25519-0.0.5.0.cabal
new file mode 100644
index 0000000..5e5f715
--- /dev/null
+++ b/additional-cabals/ed25519-0.0.5.0.cabal
@@ -0,0 +1,149 @@
+name:                ed25519
+version:             0.0.5.0
+category:            Cryptography
+license:             MIT
+synopsis:            Ed25519 cryptographic signatures
+homepage:            http://thoughtpolice.github.com/hs-ed25519
+bug-reports:         http://github.com/thoughtpolice/hs-ed25519/issues
+license-file:        LICENSE.txt
+copyright:           Copyright (c) Austin Seipp 2013-2015
+author:              Austin Seipp
+maintainer:          Austin Seipp <aseipp at pobox.com>
+build-type:          Simple
+cabal-version:       >=1.10
+tested-with:         GHC == 7.0.1, GHC == 7.0.2, GHC == 7.0.3, GHC == 7.0.4,
+                     GHC == 7.2.1, GHC == 7.2.2, GHC == 7.4.1, GHC == 7.4.2,
+                     GHC == 7.6.1, GHC == 7.6.2, GHC == 7.6.3,
+                     GHC == 7.8.2, GHC == 7.8.3, GHC == 7.8.4,
+                     GHC == 7.10.1, GHC == 7.10.2
+
+description:
+  This package provides a simple, fast, self-contained copy of the
+  Ed25519 public-key signature system with a clean interface. It also
+  includes support for detached signatures, and thorough documentation
+  on the design and implementation, including usage guidelines.
+
+extra-source-files:
+  .travis.yml
+  AUTHORS.txt
+  README.md
+  CONTRIBUTING.md
+  CHANGELOG.md
+  src/cbits/ref10/*.c
+  src/cbits/ref10/include/*.h
+
+source-repository head
+  type: git
+  location: https://github.com/thoughtpolice/hs-ed25519.git
+
+-------------------------------------------------------------------------------
+-- Flags
+
+flag test-properties
+  default: True
+  manual: True
+
+flag test-hlint
+  default: True
+  manual: True
+
+flag test-doctests
+  default: True
+  manual: True
+
+flag no-donna
+  default: True
+  manual: True
+
+-------------------------------------------------------------------------------
+-- Build pt 1: main project
+
+library
+  build-depends:
+    ghc-prim    >= 0.1 && < 0.5,
+    base        >= 4   && < 5,
+    bytestring  >= 0.9 && < 0.11
+
+  exposed-modules:
+    Crypto.Sign.Ed25519
+
+  ghc-options:        -Wall -fwarn-tabs
+  default-language:   Haskell2010
+  hs-source-dirs:     src
+
+  -- Choose the underlying C implementation
+  if flag(no-donna)
+    -- ref10 implementation from SUPERCOP, about 2x slower than the AMD64
+    -- SUPERCOP implementations, 15x faster than ronald3072 for signing.
+    c-sources:          src/cbits/ref10/ed25519.c
+    include-dirs:       src/cbits/ref10 src/cbits/ref10/include
+  else
+    -- TODO(aseipp): ed25519-donna import
+    buildable: False
+
+-------------------------------------------------------------------------------
+-- Build pt 2: Tests
+
+test-suite properties
+  type: exitcode-stdio-1.0
+  main-is: properties.hs
+  ghc-options: -w
+  hs-source-dirs: tests
+  default-language:   Haskell2010
+
+  if !flag(test-properties)
+    buildable: False
+  else
+    build-depends:
+      base        >= 4   && < 5,
+      bytestring  >= 0.9 && < 0.11,
+      QuickCheck  >= 2.4 && < 2.9,
+      ed25519
+
+--
+-- Style/doc tests below
+--
+
+test-suite hlint
+  type:             exitcode-stdio-1.0
+  main-is:          hlint.hs
+  hs-source-dirs:   tests
+  default-language: Haskell2010
+
+  if !flag(test-hlint)
+    buildable: False
+  else
+    build-depends:
+      base  >= 4   && < 5,
+      hlint >= 1.7 && < 1.10
+
+test-suite doctests
+  type:             exitcode-stdio-1.0
+  main-is:          doctests.hs
+  hs-source-dirs:   tests
+  default-language: Haskell2010
+
+  if !flag(test-doctests)
+    buildable: False
+  else
+    build-depends:
+      base      >= 4    && < 5,
+      filepath  >= 1.0  && < 1.5,
+      directory >= 1.0  && < 1.3,
+      doctest   >= 0.10 && < 0.11
+
+-------------------------------------------------------------------------------
+-- Build pt 3: benchmarks
+
+benchmark bench
+  type:               exitcode-stdio-1.0
+  build-depends:
+      base        >= 4   && < 5,
+      bytestring  >= 0.9 && < 0.11,
+      criterion   >= 0.8 && < 1.2,
+      deepseq     >= 1.3 && < 1.5,
+      ed25519
+
+  default-language:   Haskell2010
+  hs-source-dirs:     benchmarks
+  main-is:            bench.hs
diff --git a/patches/ed25519/0.0.5.0/fix-dist-path b/patches/ed25519/0.0.5.0/fix-dist-path
new file mode 100644
index 0000000..604157f
--- /dev/null
+++ b/patches/ed25519/0.0.5.0/fix-dist-path
@@ -0,0 +1,13 @@
+Index: haskell-ed25519/tests/doctests.hs
+===================================================================
+--- haskell-ed25519.orig/tests/doctests.hs	2015-10-12 01:24:33.000000000 +0200
++++ haskell-ed25519/tests/doctests.hs	2015-12-20 23:49:38.840553383 +0100
+@@ -14,7 +14,7 @@
+ 
+ allSources :: IO [FilePath]
+ allSources = liftM2 (++) (getFiles ".hs" "src")
+-                         (getFiles ".o" "dist/build/src/cbits")
++                         (getFiles ".o" "dist-ghc/build/src/cbits")
+ 
+ getFiles :: String -> FilePath -> IO [FilePath]
+ getFiles ext root = filter (isSuffixOf ext) <$> go root
diff --git a/patches/ed25519/0.0.5.0/new-metadata-from-hackage b/patches/ed25519/0.0.5.0/new-metadata-from-hackage
new file mode 100644
index 0000000..3f3d8be
--- /dev/null
+++ b/patches/ed25519/0.0.5.0/new-metadata-from-hackage
@@ -0,0 +1,22 @@
+Index: haskell-ed25519/ed25519.cabal
+===================================================================
+--- haskell-ed25519.orig/ed25519.cabal	2015-10-12 01:24:33.000000000 +0200
++++ haskell-ed25519/ed25519.cabal	2016-06-01 10:05:22.271149791 +0200
+@@ -60,7 +60,7 @@
+ 
+ library
+   build-depends:
+-    ghc-prim    >= 0.1 && < 0.5,
++    ghc-prim    >= 0.1 && < 0.6,
+     base        >= 4   && < 5,
+     bytestring  >= 0.9 && < 0.11
+ 
+@@ -130,7 +130,7 @@
+       base      >= 4    && < 5,
+       filepath  >= 1.0  && < 1.5,
+       directory >= 1.0  && < 1.3,
+-      doctest   >= 0.10 && < 0.11
++      doctest   >= 0.10 && < 0.12
+ 
+ -------------------------------------------------------------------------------
+ -- Build pt 3: benchmarks
diff --git a/patches/ed25519/0.0.5.0/newer-quickcheck b/patches/ed25519/0.0.5.0/newer-quickcheck
new file mode 100644
index 0000000..2118585
--- /dev/null
+++ b/patches/ed25519/0.0.5.0/newer-quickcheck
@@ -0,0 +1,11 @@
+--- a/ed25519.cabal
++++ b/ed25519.cabal
+@@ -97,7 +97,7 @@
+     build-depends:
+       base        >= 4   && < 5,
+       bytestring  >= 0.9 && < 0.11,
+-      QuickCheck  >= 2.4 && < 2.9,
++      QuickCheck  >= 2.4 && < 2.10,
+       ed25519
+ 
+ --
diff --git a/patches/ed25519/0.0.5.0/series b/patches/ed25519/0.0.5.0/series
index 8320b23..ac2843d 100644
--- a/patches/ed25519/0.0.5.0/series
+++ b/patches/ed25519/0.0.5.0/series
@@ -1 +1,4 @@
+new-metadata-from-hackage
+fix-dist-path
 newer-directory
+newer-quickcheck

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git



More information about the Pkg-haskell-commits mailing list