From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 13 Jun 2016 21:00:00 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/catacomb
X-Git-Tag: 2.2.3~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb/commitdiff_plain/98421fc1a6832ad5de4b3f6171852437aa3e0fb2?hp=c6c463ee1a9faac8b1439f62f85033074c18f96f

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/catacomb

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/catacomb: (53 commits)
  rand/rand.c (rdrand_quick): Improve the loop.
  configure.ac, rand/noise.c: Get high-res time from `clock_gettime'.
  rand/noise.c: Make the high-res timer function be a bit more abstract.
  configure.ac, Makefile.am: Collect libs only needed by Catcomb itself.
  Makefile.am: Include $(PIXIE_LIBS) in the main library.
  rand/noise.c (noise_devrandom): Use OpenBSD system call `getentropy'.
  rand/noise.c (noise_devrandom): Use new Linux system call `getrandom'.
  rand/noise.c (noise_devrandom): Handle Linux's broken `/dev/urandom'.
  rand/noise.c (noise_devrandom): Refactor internals.
  src/noise.c: Make `bitcount' table be static and constant.
  rand/rand.c: Add support for x86 `RDRAND' instruction in `rand_quick'.
  base/dispatch.[ch]: Detect availability of the x86 `RDRAND' instruction.
  rand/rand.[ch]: Add external `rand_quick' function.
  rand/: Secure `rand' generator against fork problems.
  Release 2.2.2.
  math/mp-arith.c (mp_testbit): Want nonstrict comparison for bounds check.
  symm/salsa20-arm-neon.S: Mark the final-permutation stores as word-aligned.
  symm/: Add ARM NEON implementations of ChaCha and Salsa20.
  symm/{salsa20,chacha}-x86ish-sse2.S: Use numeric labels for internal loops.
  symm/salsa20-x86ish-sse2.S: Fix stray `##' comment to be `//'.
  ...

Conflicts:
	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 9784b9e7..d84c92d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,13 @@ catacomb (2.2.2) experimental; urgency=low
 
  -- Mark Wooding <mdw@distorted.org.uk>  Sat, 04 Jun 2016 01:12:01 +0100
 
+catacomb (2.2.1.1) experimental; urgency=low
+
+  * Arrange that catacomb-dev Depends on correct version of mlib-dev.  It
+    really won't work well without it.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Fri, 19 Feb 2016 09:04:50 +0000
+
 catacomb (2.2.1) experimental; urgency=low
 
   * Some internal improvements.
diff --git a/debian/control b/debian/control
index 9bbe8027..38c9b048 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Description: A cryptographic library
 
 Package: catacomb-dev
 Architecture: any
-Depends: catacomb2 (= ${Source-Version})
+Depends: catacomb2 (= ${Source-Version}), mlib-dev (>= 2.2.2.1)
 Recommends: catacomb-bin
 Section: devel
 Description: A cryptographic library