[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tordnsel/master] Tested with GHC==7.6
commit de090504160d40f6d860b1269672895b655212f4
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date: Fri Apr 15 19:27:28 2016 -0700
Tested with GHC==7.6
---
README | 6 +++---
src/TorDNSEL/Util.hsc | 16 +++-------------
tordnsel.cabal | 14 ++++++++------
3 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/README b/README
index 214b582..5159db0 100644
--- a/README
+++ b/README
@@ -22,10 +22,10 @@ Presumably, users of software with built-in support for DNSBLs would configure
Dependencies
- TorDNSEL requires GHC 6.8. If you're running Debian Lenny:
+ TorDNSEL requires GHC 7.6. If you're running Debian Jessie:
- apt-get install ghc6 libghc6-mtl-dev libghc6-network-dev libghc6-time-dev \
- libghc6-hunit-dev libghc6-stm-dev libghc6-binary-dev
+ apt-get install ghc libghc-network-dev libghc-mtl-dev libghc-stm-dev
+ libghc-hunit-dev libghc-conduit-dev libghc-conduit-extra-dev
OpenSSL's libcrypto is required for strong random numbers:
diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc
index 12493fe..8af374c 100644
--- a/src/TorDNSEL/Util.hsc
+++ b/src/TorDNSEL/Util.hsc
@@ -141,7 +141,7 @@ import System.Posix.Types (FileMode)
import Text.Printf (printf)
import Data.Binary (Binary(..))
-import Data.Conduit (Pipe(..), Conduit, Sink)
+import Data.Conduit.Internal (Conduit, Sink)
import qualified Data.Conduit as C
import qualified Data.Conduit.List as CL
import qualified Data.Conduit.Binary as CB
@@ -432,12 +432,6 @@ showUTCTime time = printf "%s %02d:%02d:%s" date hours mins secStr'
--------------------------------------------------------------------------------
-- Conduit utilities
--- ## Conduit 0.4.2 shim
--- ##
-leftover :: Monad m => i -> Conduit i m o
-leftover i = Done (Just i) ()
--- ##
-
-- | 'CB.take' for strict 'ByteString's.
c_take :: Monad m => Int -> Sink ByteString m ByteString
c_take = fmap (mconcat . BL.toChunks) . CB.take
@@ -450,7 +444,7 @@ c_breakDelim :: Monad m
c_breakDelim delim = wait_input $ B.empty
where
wait_input front = C.await >>=
- (Nothing <$ leftover front) `maybe` \bs ->
+ (Nothing <$ C.leftover front) `maybe` \bs ->
let (front', bs') = (<> bs) `second`
B.splitAt (B.length front - d_len + 1) front
@@ -466,7 +460,7 @@ c_breakDelim delim = wait_input $ B.empty
c_line_crlf :: Monad m => Sink ByteString m ByteString
c_line_crlf =
c_breakDelim (B.pack "\r\n") >>=
- return B.empty `maybe` \(line, rest) -> line <$ leftover rest
+ return B.empty `maybe` \(line, rest) -> line <$ C.leftover rest
-- | Stream lines delimited by either LF or CRLF.
c_lines_any :: Monad m => Conduit ByteString m ByteString
@@ -511,10 +505,6 @@ bindListeningUnixDomainStreamSocket sockPath mode = do
listen sock sOMAXCONN
return sock
--- network-2.3 compat
---
-deriving instance Ord SockAddr
-
--------------------------------------------------------------------------------
-- Monads
diff --git a/tordnsel.cabal b/tordnsel.cabal
index 0b5182c..177f7f4 100644
--- a/tordnsel.cabal
+++ b/tordnsel.cabal
@@ -11,12 +11,14 @@ License-File: LICENSE
Homepage: http://p56soo2ibjkx23xo.onion/
Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.tar.gz
Author: tup
-Maintainer: tup.tuple@xxxxxxxxxxxxxx, lunar@xxxxxxxxxx, andrew@xxxxxxxxxxxxxx
+Maintainer: tup.tuple@xxxxxxxxxxxxxx, lunar@xxxxxxxxxx
Build-Type: Simple
-Build-Depends: base>=4.5, network==2.3.*, mtl==2.*, unix>=2.5, stm>=2.3,
- time>=1.4, HUnit>=1.2, binary>=0.5, bytestring>=0.9, array>=0.4,
- directory>=1.1, containers>=0.4, conduit==0.4.2, deepseq>=1.3
-Tested-With: GHC==7.4, GHC==7.6
+Build-Depends: array>=0.4, base>=4.5, binary>=0.7, bytestring>=0.10,
+ containers>=0.5, deepseq>=1.3, directory>=1.2, time>=1.4,
+ unix>=2.5,
+ HUnit==1.2.*, conduit==1.1.*, conduit-extra==1.1.*,
+ mtl==2.1.*, network==2.4.*, stm==2.4.*
+Tested-With: GHC==7.6
Data-Files: config/tordnsel.conf.sample, contrib/cacti-input.pl,
contrib/tordnsel-init.d-script.sample, doc/tordnsel.8
@@ -59,7 +61,7 @@ Other-Modules: TorDNSEL.Config
HS-Source-Dirs: src
Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h
Extra-Libraries: crypto
-GHC-Options: -O2 -funbox-strict-fields -fno-warn-unused-do-bind -Wall -Werror
+GHC-Options: -O2 -funbox-strict-fields -fno-warn-unused-do-bind -Wall
CPP-Options: -DVERSION="0.1.1-dev"
Extensions: FlexibleContexts
FlexibleInstances
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits