Merge pull request #38 from mirage/improve.upgrade

Split binaries to another package and upgrade to `mirage-crypto-rng.0.11.0`

bin/dune

@@ -1,15 +1,15 @@
 (executable
  (name verify)
  (public_name dkim.verify)
- (package dkim)
+ (package dkim-bin)
  (modules verify)
  (libraries logs.cli fmt.cli logs.fmt fmt.tty dns-client.unix cmdliner fpath
    digestif.c ipaddr.unix dkim))
 
 (executable
  (name sign)
  (public_name dkim.sign)
- (package dkim)
+ (package dkim-bin)
  (modules sign)
  (libraries logs.cli fmt.cli logs.fmt fmt.tty dns-client.unix cmdliner fpath
    digestif.c dkim))

dkim-bin.opam

@@ -0,0 +1,30 @@
+opam-version: "2.0"
+name:         "dkim-bin"
+maintainer:   "Romain Calascibetta <[email protected]>"
+authors:      "Romain Calascibetta <[email protected]>"
+homepage:     "https://github.com/mirage/ocaml-dkim"
+bug-reports:  "https://github.com/mirage/ocaml-dkim/issues"
+dev-repo:     "git+https://github.com/mirage/ocaml-dkim.git"
+doc:          "https://mirage.github.io/ocaml-dkim/"
+license:      "MIT"
+synopsis:     "Implementation of DKIM in OCaml"
+description: """A library and a binary to verify and sign an email
+with the DKIM mechanism described by the RFC 6376"""
+
+build: [
+  [ "dune" "subst" ] {dev}
+  [ "dune" "build" "-p" name "-j" jobs ]
+  [ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
+]
+
+depends: [
+  "ocaml"             {>= "4.08.0"}
+  "dune"              {>= "2.0.0"}
+  "dkim"              {= version}
+  "base-unix"
+  "cmdliner"          {>= "1.1.0"}
+  "logs"
+  "fmt"               {>= "0.8.7"}
+  "fpath"
+  "dns-client"
+]

dkim-mirage.opam

@@ -20,7 +20,7 @@ depends: [
   "ocaml"             {>= "4.08.0"}
   "dune"              {>= "2.0.0"}
   "dkim"              {= version}
-  "dns-client"        {>= "6.0.0"}
+  "dns-client-mirage" {>= "7.0.0"}
   "mirage-time"
   "mirage-random"
   "mirage-clock"
@@ -30,5 +30,5 @@ depends: [
   "digestif"          {with-test}
   "fmt"               {with-test}
   "logs"              {with-test}
-  "mirage-crypto-rng" {with-test}
+  "mirage-crypto-rng" {with-test & >= "0.11.0"}
 ]

dkim.opam

@@ -36,6 +36,6 @@ depends: [
   "mirage-crypto"     {>= "0.9.2"}
   "mirage-crypto-pk"  {>= "0.9.2"}
   "x509"              {>= "0.6.3"}
-  "mirage-crypto-rng" {with-test}
+  "mirage-crypto-rng" {with-test & >= "0.11.0"}
   "alcotest"          {with-test}
 ]

mirage/dune

@@ -2,4 +2,4 @@
  (name dkim_mirage)
  (public_name dkim-mirage)
  (libraries dkim mirage-random mirage-time mirage-clock tcpip
-   dns-client.mirage lwt))
+   dns-client-mirage lwt))

test/test.ml

@@ -1,4 +1,4 @@
-let () = Mirage_crypto_rng_unix.initialize ()
+let () = Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna)
 let ( <.> ) f g x = f (g x)
 
 let reporter ppf =