[tor-commits] [tordnsel/master] reign in over the extensions

commit 1c90be2dc4d3b275f434bb4e9ea63f169ae46f3e Author: David Kaloper david@numm.org Date: Wed Sep 4 05:30:41 2013 +0200

reign in over the extensions --- src/TorDNSEL/Config/Internals.hs | 2 - src/TorDNSEL/Control/Concurrent/Link/Internals.hs | 1 - src/TorDNSEL/DNS/Internals.hs | 1 - src/TorDNSEL/DNS/Server/Internals.hs | 1 - src/TorDNSEL/Directory/Internals.hs | 2 - src/TorDNSEL/Directory/Tests.hs | 2 - src/TorDNSEL/Document.hs | 1 - src/TorDNSEL/ExitTest/Initiator/Internals.hs | 9 +-- src/TorDNSEL/ExitTest/Server/Internals.hs | 1 - src/TorDNSEL/Log/Internals.hsc | 3 +- src/TorDNSEL/Main.hsc | 2 +- src/TorDNSEL/NetworkState/Internals.hs | 1 - src/TorDNSEL/NetworkState/Storage/Internals.hs | 1 - src/TorDNSEL/Random.hs | 2 +- src/TorDNSEL/Socks/Internals.hs | 1 - src/TorDNSEL/Statistics/Internals.hs | 3 +- src/TorDNSEL/TorControl/Internals.hs | 12 +-- src/TorDNSEL/Util.hsc | 5 +- tordnsel.cabal | 99 +++++++++++++---------- 19 files changed, 64 insertions(+), 85 deletions(-)

diff --git a/src/TorDNSEL/Config/Internals.hs b/src/TorDNSEL/Config/Internals.hs index 5458813..c8aa790 100644 --- a/src/TorDNSEL/Config/Internals.hs +++ b/src/TorDNSEL/Config/Internals.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns, TypeSynonymInstances, - FlexibleInstances, FlexibleContexts #-} {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}

----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs index 8107481..cf83cba 100644 --- a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs +++ b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-ignore-asserts #-}

----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/DNS/Internals.hs b/src/TorDNSEL/DNS/Internals.hs index 735d7a8..b80b170 100644 --- a/src/TorDNSEL/DNS/Internals.hs +++ b/src/TorDNSEL/DNS/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-}

----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/DNS/Server/Internals.hs b/src/TorDNSEL/DNS/Server/Internals.hs index 622de9b..8ab3637 100644 --- a/src/TorDNSEL/DNS/Server/Internals.hs +++ b/src/TorDNSEL/DNS/Server/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}

----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Directory/Internals.hs b/src/TorDNSEL/Directory/Internals.hs index 7dc1eb2..154b30c 100644 --- a/src/TorDNSEL/Directory/Internals.hs +++ b/src/TorDNSEL/Directory/Internals.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PatternGuards, TypeSynonymInstances, FlexibleContexts #-} - ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Directory.Internals diff --git a/src/TorDNSEL/Directory/Tests.hs b/src/TorDNSEL/Directory/Tests.hs index 9a895b6..f9b8c45 100644 --- a/src/TorDNSEL/Directory/Tests.hs +++ b/src/TorDNSEL/Directory/Tests.hs @@ -1,5 +1,3 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} - ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Directory.Tests diff --git a/src/TorDNSEL/Document.hs b/src/TorDNSEL/Document.hs index 52ea9c9..50c986c 100644 --- a/src/TorDNSEL/Document.hs +++ b/src/TorDNSEL/Document.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, FlexibleContexts #-}

----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/ExitTest/Initiator/Internals.hs b/src/TorDNSEL/ExitTest/Initiator/Internals.hs index a63e25f..d4538df 100644 --- a/src/TorDNSEL/ExitTest/Initiator/Internals.hs +++ b/src/TorDNSEL/ExitTest/Initiator/Internals.hs @@ -1,11 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, Rank2Types #-} -{-# OPTIONS_GHC -fno-warn-type-defaults -fglasgow-exts #-} --- XXX: We use -fglasgow-exts here as it is not possible to specify LANGUAGE --- pragmas for different GHC versions using CPP. --- Otherwise, we would add on GHC 6.10: --- ScopedTypeVariables --- and on GHC 6.8: --- PatternSignatures +{-# OPTIONS_GHC -fno-warn-type-defaults #-}

----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/ExitTest/Server/Internals.hs b/src/TorDNSEL/ExitTest/Server/Internals.hs index b6aa705..97d1f8e 100644 --- a/src/TorDNSEL/ExitTest/Server/Internals.hs +++ b/src/TorDNSEL/ExitTest/Server/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-}

----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Log/Internals.hsc b/src/TorDNSEL/Log/Internals.hsc index 7c5b490..0b26873 100644 --- a/src/TorDNSEL/Log/Internals.hsc +++ b/src/TorDNSEL/Log/Internals.hsc @@ -1,5 +1,4 @@ -{-# LANGUAGE ForeignFunctionInterface, TypeSynonymInstances, - OverlappingInstances, FlexibleInstances #-} +{-# LANGUAGE ForeignFunctionInterface, OverlappingInstances #-}

----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Main.hsc b/src/TorDNSEL/Main.hsc index 4d4092e..e612de0 100644 --- a/src/TorDNSEL/Main.hsc +++ b/src/TorDNSEL/Main.hsc @@ -1,4 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, ForeignFunctionInterface, CPP #-} +{-# LANGUAGE ForeignFunctionInterface, CPP #-} {-# OPTIONS_GHC -fno-warn-type-defaults -fno-warn-missing-fields -fno-warn-orphans #-}

diff --git a/src/TorDNSEL/NetworkState/Internals.hs b/src/TorDNSEL/NetworkState/Internals.hs index 32b4a42..c42cae7 100644 --- a/src/TorDNSEL/NetworkState/Internals.hs +++ b/src/TorDNSEL/NetworkState/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-}

----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/NetworkState/Storage/Internals.hs b/src/TorDNSEL/NetworkState/Storage/Internals.hs index fd9a04b..79481f6 100644 --- a/src/TorDNSEL/NetworkState/Storage/Internals.hs +++ b/src/TorDNSEL/NetworkState/Storage/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, FlexibleContexts #-}

----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Random.hs b/src/TorDNSEL/Random.hs index 69c254d..a9f5a8c 100644 --- a/src/TorDNSEL/Random.hs +++ b/src/TorDNSEL/Random.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE ForeignFunctionInterface, ScopedTypeVariables #-} +{-# LANGUAGE ForeignFunctionInterface #-}

----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Socks/Internals.hs b/src/TorDNSEL/Socks/Internals.hs index d6c91f7..f514c44 100644 --- a/src/TorDNSEL/Socks/Internals.hs +++ b/src/TorDNSEL/Socks/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE GeneralizedNewtypeDeriving, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-unused-binds #-}

----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Statistics/Internals.hs b/src/TorDNSEL/Statistics/Internals.hs index e24c745..cc0f799 100644 --- a/src/TorDNSEL/Statistics/Internals.hs +++ b/src/TorDNSEL/Statistics/Internals.hs @@ -1,5 +1,4 @@ -{-# LANGUAGE BangPatterns #-} -{-# OPTIONS_GHC -fglasgow-exts -fno-warn-type-defaults #-} +{-# OPTIONS_GHC -fno-warn-type-defaults #-}

----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/TorControl/Internals.hs b/src/TorDNSEL/TorControl/Internals.hs index dba1e85..2ea2e16 100644 --- a/src/TorDNSEL/TorControl/Internals.hs +++ b/src/TorDNSEL/TorControl/Internals.hs @@ -1,13 +1,5 @@ -{-# LANGUAGE PatternGuards, MultiParamTypeClasses, ExistentialQuantification, - FlexibleContexts, FlexibleInstances, - DeriveDataTypeable #-} -{-# OPTIONS_GHC -fno-warn-type-defaults -fglasgow-exts #-} --- XXX: We use -fglasgow-exts here as it is not possible to specify LANGUAGE --- pragmas for different GHC versions using CPP. --- Otherwise, we would add on GHC 6.10: --- ScopedTypeVariables --- and on GHC 6.8: --- PatternSignatures +{-# LANGUAGE ExistentialQuantification #-} +{-# OPTIONS_GHC -fno-warn-type-defaults #-}

----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index 89837cd..57ada86 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -1,7 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, ForeignFunctionInterface, - TypeSynonymInstances, OverlappingInstances, - UndecidableInstances, FlexibleInstances, MultiParamTypeClasses, - GeneralizedNewtypeDeriving, FlexibleContexts #-} +{-# LANGUAGE ForeignFunctionInterface, OverlappingInstances, UndecidableInstances #-} {-# OPTIONS_GHC -fno-warn-type-defaults -fno-warn-orphans -Wwarn #-} -- ^^^^^^ -- XXX: findSubstrings is deprecated diff --git a/tordnsel.cabal b/tordnsel.cabal index 23fa628..7e8d015 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -1,71 +1,84 @@ Name: TorDNSEL Version: 0.1.1-dev Synopsis: provides a DNSBL-style interface for detecting Tor exit nodes -Description: TorDNSEL implements a design for a DNSBL-style interface for - detecting connections exiting the Tor network. This design and its rationale - is described at https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt. +Description: + TorDNSEL implements a design for a DNSBL-style interface for detecting + connections exiting the Tor network. This design and its rationale is + described at + https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt. License: PublicDomain License-File: LICENSE Homepage: http://p56soo2ibjkx23xo.onion/ -Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.t... +Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.t... Author: tup Maintainer: tup.tuple@googlemail.com, lunar@debian.org, andrew@torproject.org Build-Type: Simple Build-Depends: base>=2.0, network>=2.0, mtl>=1.0, unix>=1.0, stm>=2.0, - time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, - containers>=0.1, deepseq >= 1.3 + time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, + containers>=0.1, deepseq >= 1.3 Tested-With: GHC==6.6, GHC==6.8, GHC==6.10, GHC==6.12 Data-Files: config/tordnsel.conf.sample, contrib/cacti-input.pl, - contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 + contrib/tordnsel-init.d-script.sample, doc/tordnsel.8

Executable: tordnsel Main-Is: tordnsel.hs -Other-Modules: TorDNSEL.Config, - TorDNSEL.Config.Internals, - TorDNSEL.Control.Concurrent.Link, - TorDNSEL.Control.Concurrent.Link.Internals, - TorDNSEL.Control.Concurrent.Util, - TorDNSEL.Directory, - TorDNSEL.Directory.Internals, - TorDNSEL.DistinctQueue, - TorDNSEL.DNS, - TorDNSEL.DNS.Internals, - TorDNSEL.DNS.Server, - TorDNSEL.DNS.Server.Internals, - TorDNSEL.Document, - TorDNSEL.ExitTest.Initiator, - TorDNSEL.ExitTest.Initiator.Internals, - TorDNSEL.ExitTest.Request, - TorDNSEL.ExitTest.Server, - TorDNSEL.ExitTest.Server.Internals, - TorDNSEL.Log, - TorDNSEL.Log.Internals, - TorDNSEL.Main, - TorDNSEL.NetworkState, - TorDNSEL.NetworkState.Internals, - TorDNSEL.NetworkState.Storage, - TorDNSEL.NetworkState.Storage.Internals, - TorDNSEL.NetworkState.Types, - TorDNSEL.Random, - TorDNSEL.Socks, - TorDNSEL.Socks.Internals, - TorDNSEL.Statistics, - TorDNSEL.Statistics.Internals, - TorDNSEL.TorControl, - TorDNSEL.TorControl.Internals, +Other-Modules: TorDNSEL.Config + TorDNSEL.Config.Internals + TorDNSEL.Control.Concurrent.Link + TorDNSEL.Control.Concurrent.Link.Internals + TorDNSEL.Control.Concurrent.Util + TorDNSEL.Directory + TorDNSEL.Directory.Internals + TorDNSEL.DistinctQueue + TorDNSEL.DNS + TorDNSEL.DNS.Internals + TorDNSEL.DNS.Server + TorDNSEL.DNS.Server.Internals + TorDNSEL.Document + TorDNSEL.ExitTest.Initiator + TorDNSEL.ExitTest.Initiator.Internals + TorDNSEL.ExitTest.Request + TorDNSEL.ExitTest.Server + TorDNSEL.ExitTest.Server.Internals + TorDNSEL.Log + TorDNSEL.Log.Internals + TorDNSEL.Main + TorDNSEL.NetworkState + TorDNSEL.NetworkState.Internals + TorDNSEL.NetworkState.Storage + TorDNSEL.NetworkState.Storage.Internals + TorDNSEL.NetworkState.Types + TorDNSEL.Random + TorDNSEL.Socks + TorDNSEL.Socks.Internals + TorDNSEL.Statistics + TorDNSEL.Statistics.Internals + TorDNSEL.TorControl + TorDNSEL.TorControl.Internals TorDNSEL.Util HS-Source-Dirs: src Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h Extra-Libraries: crypto GHC-Options: -O2 -Wall -Werror CPP-Options: -DVERSION="0.1.1-dev" +Extensions: FlexibleContexts + FlexibleInstances + TypeSynonymInstances + MultiParamTypeClasses + PatternGuards + BangPatterns + ViewPatterns + ScopedTypeVariables + DeriveDataTypeable + GeneralizedNewtypeDeriving + Rank2Types

Executable: runtests Buildable: False Main-Is: runtests.hs -Other-Modules: TorDNSEL.Config.Tests, - TorDNSEL.Directory.Tests, - TorDNSEL.DNS.Tests, +Other-Modules: TorDNSEL.Config.Tests + TorDNSEL.Directory.Tests + TorDNSEL.DNS.Tests TorDNSEL.DNS.Server.Tests HS-Source-Dirs: src Includes: netinet/in.h, openssl/rand.h