From 76fb2495cdfb30eefe53a3ecd1ecf66c7874f51b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 28 Aug 2022 07:44:43 -0400 Subject: [PATCH] hath.cabal: update to cabal-version: 3.4. Getting a little bit tired of this, but here's one more. --- hath.cabal | 77 +++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/hath.cabal b/hath.cabal index 260c127..47753e5 100644 --- a/hath.cabal +++ b/hath.cabal @@ -1,11 +1,11 @@ +cabal-version: 3.4 name: hath version: 0.5.3 -cabal-version: >= 1.12 author: Michael Orlitzky maintainer: Michael Orlitzky homepage: http://michael.orlitzky.com/code/hath.xhtml category: Utils -license: AGPL-3 +license: AGPL-3.0-only license-file: doc/LICENSE build-type: Simple extra-source-files: @@ -17,59 +17,59 @@ description: Hath is a Haskell program for working with network blocks in CIDR notation. When dealing with blocks of network addresses, there are a few things that one usually wants to do with them: - . + * Create a regular expression matching the CIDR block(s). This is because grep will throw up if you feed it CIDR. - . + * Combine small blocks into larger ones. For example, if you have two consecutive \/24s, they might combine into a larger \/23. - . + * View the result of block combination in a useful way. - . + * List them. - . + Hath has several modes to perform these functions: - . - [@Regexed@] - This computes a (Perl-compatible) regular expression matching - the input CIDR blocks. It's the default mode of operation. - . - [@Reduced@] - This combines small blocks into larger ones where possible, and - eliminates redundant blocks. The output should be equivalent to - the input, though. - . - [@Duped@] - Shows only the blocks that would be removed by reduce; that is, it - shows the ones that would get combined into larger blocks or are - simply redundant. - . - [@Diffed@] - Shows what would change if you used reduce. Uses diff-like - notation. - . - [@Listed@] - List the IP addresses contained within the given CIDRs. - . + + * __Regexed__ + This computes a (Perl-compatible) regular expression matching + the input CIDR blocks. It's the default mode of operation. + + * __Reduced__ + This combines small blocks into larger ones where possible, and + eliminates redundant blocks. The output should be equivalent to + the input, though. + + * __Duped__ + Shows only the blocks that would be removed by reduce; that is, it + shows the ones that would get combined into larger blocks or are + simply redundant. + + * __Diffed__ + Shows what would change if you used reduce. Uses diff-like + notation. + + * __Listed__ + List the IP addresses contained within the given CIDRs. + /Examples/: - . + Compute a (Perl-compatible) regular expression matching the input CIDR blocks. It's the default mode of operation. - . + @ $ echo \"10.0.0.0\/29 10.0.0.8\/29\" | hath ((10)\.(0)\.(0)\.(15|14|13|12|11|10|9|8|7|6|5|4|3|2|1|0)) @ - . + Combine two \/24s into a \/23: - . + @ $ echo \"10.0.0.0\/24 10.0.1.0\/24\" | hath reduced 10.0.0.0/23 @ - . + List the addresses in 192.168.0.240\/29: - . + @ $ echo 192.168.0.240\/29 | hath listed 192.168.0.240 @@ -81,15 +81,12 @@ description: 192.168.0.246 192.168.0.247 @ - . + The command-line syntax and complete set of options are documented in the man page. executable hath - default-language: - Haskell2010 - main-is: Main.hs @@ -119,7 +116,6 @@ executable hath test-suite testsuite type: exitcode-stdio-1.0 hs-source-dirs: src test - default-language: Haskell2010 main-is: TestSuite.hs other-modules: @@ -143,7 +139,6 @@ test-suite testsuite test-suite shelltests type: exitcode-stdio-1.0 hs-source-dirs: test - default-language: Haskell2010 main-is: ShellTests.hs build-depends: -- 2.44.2