Build fixes for Debian Jessie.

4 files changed, 26 insertions, 6 deletions

diff --git a/Compat.hs b/Compat.hs
index 43f62c0..3b77851 100644
--- a/Compat.hs
+++ b/Compat.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 module Compat where
 
 import Data.Bits
@@ -7,6 +8,8 @@ import Data.ASN1.Encoding
 import Data.ASN1.BinaryEncoding
 import Crypto.PubKey.RSA as RSA
 
+#if defined(VERSION_cryptonite)
+
 instance ASN1Object PublicKey where
     toASN1 pubKey = \xs -> Start Sequence
                          : IntVal (public_n pubKey)
@@ -38,6 +41,7 @@ instance ASN1Object PublicKey where
     fromASN1 _ =
         Left "fromASN1: RSA.PublicKey: unexpected format"
 
+#endif
 
 toPositive :: Integer -> Integer
 toPositive int
diff --git a/clean-dep.sh b/clean-dep.sh
new file mode 100644
index 0000000..2a1bfe2
--- /dev/null
+++ b/clean-dep.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Clean up generated debian/control file for jessie build.
+
+mv debian/control debian/control.bad
+
+grep -v -- '-cryptonite-\|-hourglass-\|-memory-'  debian/control.bad | sed '/-x509-/{ s/1.6/1.4/; }' > debian/control
+
+# dpkg-checkbuilddeps: Unmet build dependencies: libghc-cryptonite-dev libghc-cryptonite-prof libghc-hourglass-dev libghc-hourglass-prof libghc-memory-dev libghc-memory-prof libghc-x509-dev (>= 1.6) libghc-x509-prof (>= 1.6) libghc-cryptonite-doc libghc-hourglass-doc libghc-memory-doc libghc-x509-doc (>= 1.6)
diff --git a/kiki.cabal b/kiki.cabal
index e301d7f..9e9e314 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -15,6 +15,10 @@ Flag cryptonite
   Description: Use newer cryptonite-based x509 version 1.6 and higher
   Default: True
 
+Flag hourglass
+  Description: Use newer hourglass-based x509 version 1.5 and higher
+  Default: True
+
 Executable kiki
     Main-is: kiki.hs
     -- base >=4.6 due to use of readEither in KikiD.Message
@@ -24,15 +28,18 @@ Executable kiki
                      asn1-types -any, asn1-encoding -any,
                      dataenc -any, text -any, pretty -any, pretty-show -any,
                      bytestring -any, binary -any,
-                     unix, time, 
+                     unix, time,
                      containers -any, process -any, filepath -any,
-                     network -any, old-locale -any, zlib -any,
-                     hourglass -any
+                     network -any, old-locale -any, zlib -any
     if !flag(cryptonite)
       Build-Depends:   crypto-pubkey >=0.2.3, cryptohash -any,
-                       crypto-pubkey-types -any, x509 <1.6
+                       crypto-pubkey-types -any
+      if flag(hourglass)
+        Build-Depends:   hourglass -any, x509 >=1.5 && <1.6
+      else
+        Build-Depends:   x509 <1.6
     else
-      Build-Depends:   cryptonite, x509 >=1.6, memory
+      Build-Depends:   cryptonite, x509 >=1.6, memory, hourglass
     ghc-options:     -O2 -fwarn-unused-binds -fwarn-unused-imports
     c-sources: dotlock.c
 
diff --git a/kiki.hs b/kiki.hs
index 1be5b92..9a2000a 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -30,7 +30,7 @@ import System.Exit
 import System.IO (hPutStrLn,stderr)
 import qualified Codec.Binary.Base64 as Base64
 #if !defined(VERSION_cryptonite)
--- import qualified Crypto.Hash.RIPEMD160 as RIPEMD160
+import qualified Crypto.Hash.RIPEMD160 as RIPEMD160
 import qualified Crypto.Hash.SHA256    as SHA256
 #else
 import Crypto.Hash.Algorithms (RIPEMD160(..))