doc/COPYING,haeredes.cabal: switch to AGPL-3.0-or-later, including COPYING

diff --git a/doc/COPYING b/doc/COPYING
new file mode 100644 (file)
index 0000000..b978be6
--- /dev/null
+++ b/doc/COPYING
@@ -0,0 +1,15 @@
+Haeredes: confirm delegation of NS and MX records
+Copyright (C) 2024  Michael Orlitzky
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.

diff --git a/haeredes.cabal b/haeredes.cabal
index 630d023df4ec514e7b8c60542da15e540af2da34..42f4524361eb9c35bc40c4bcc2e81b0eac93107a 100644 (file)
--- a/haeredes.cabal
+++ b/haeredes.cabal
@@ -1,15 +1,16 @@
+cabal-version:  3.0
 name:           haeredes
-version:        0.5.2
-cabal-version:  >= 1.8
+version:        0.5.4
 author:         Michael Orlitzky
 maintainer:    Michael Orlitzky <michael@orlitzky.com>
-license:        AGPL-3
+license:        AGPL-3.0-or-later
 license-file:   doc/LICENSE
-homepage:       http://michael.orlitzky.com/code/haeredes.xhtml
+homepage:       https://michael.orlitzky.com/code/haeredes.xhtml
 bug-reports:    mailto:michael@orlitzky.com
 category:       DNS, Utils
 build-type:     Simple
 extra-source-files:
+  doc/COPYING
   doc/man1/haeredes.1
   test/shell/*.test
 synopsis:
@@ -18,13 +19,13 @@ description:
   Haeredes is primarily useful for ISP network administrators.
   Customers will occasionally decide to switch hosts without alerting
   the current host; this can cause two problems:
-  .
+
     * With NS records, the previous host (at the very least) keeps
       hosting a DNS zone that does nothing. If that host uses their
       authoritative nameserver as a caching lookup server as well, it
       may return incorrect results to queries about the domain in
       question.
-  .
+
     * For MX records, the situation is slightly worse. Most mail servers
       will immediately accept mail for which the server thinks it is the
       ultimate destination. If a mail server is configured as the
@@ -32,29 +33,29 @@ description:
       then mail submitted to that server may possibly be lost. It is
       therefore important to remove domains from the old mail host as
       soon as the MX record is changed.
-  .
+
   Haeredes can alert administrators when NS/MX records are changed. More
   detail and usage examples can be found in the man page.
-  .
+
   /Examples/:
-  .
+
   Make sure example.com has the expected name servers,
   [ab].iana-servers.net:
-  .
+
   @
   $ echo \"example.com\" | haeredes a.iana-servers.net b.iana-servers.net
   @
-  .
+
   Check orlitzky.com against only one of the expected two nameservers:
-  .
+
   @
   $ echo \"orlitzky.com\" | haeredes dns1.viabit.com
   Domain \"orlitzky.com.\" delegates somewhere else: \"dns2.viabit.com.\"
   @
-  .
+
   Check a nonexistent domain (we provide no delegates, since we
   know .doesnt-exist will not be delegated):
-  .
+
   @
   $ echo \"foo.doesnt-exist\" | haeredes
   Domain \"foo.doesnt-exist.\" not delegated.
@@ -62,13 +63,16 @@ description:
 
 executable haeredes
   build-depends:
-    base                        == 4.*,
+    base                        >= 4.15 && < 5.0,
     bytestring                  >= 0.10,
     cmdargs                     >= 0.10,
     dns                         >= 1.4,
     iproute                     >= 1.2,
     parallel-io                 >= 0.3
 
+  default-language:
+    Haskell2010
+
   main-is:
     Main.hs
 
@@ -79,20 +83,20 @@ executable haeredes
     CommandLine
     DNS
     ExitCodes
-    -- WARNING: the Paths_haeredes module is automatically generated by
-    -- Cabal itself. We don't want it included in the release tarballs,
-    -- since we typically want the paths that the user has configured.
-    -- Nevertheless, Cabal will complain if we don't include it here.
     Paths_haeredes
     Timeout
 
+  autogen-modules:
+    Paths_haeredes
+
 
 test-suite doctests
   type: exitcode-stdio-1.0
   hs-source-dirs: test
+  default-language: Haskell2010
   main-is: Doctests.hs
   build-depends:
-    base      == 4.*,
+    base      >= 4.15 && < 5.0,
     -- Additional test dependencies.
     doctest   >= 0.9,
     filemanip >= 0.3.6
@@ -103,14 +107,15 @@ test-suite doctests
 test-suite shelltests
   type: exitcode-stdio-1.0
   hs-source-dirs: test
+  default-language: Haskell2010
   main-is: ShellTests.hs
 
   build-depends:
-    base                        == 4.*,
+    base                        >= 4.15 && < 5.0,
     process                     >= 1.1
 
 
 source-repository head
   type: git
-  location: http://gitweb.michael.orlitzky.com/haeredes.git
+  location: https://gitweb.michael.orlitzky.com/haeredes.git
   branch: master

diff --git a/makefile b/makefile
index 049fe55a57d40dde58d121e2deef4b695e11a4bc..903abc30fce8950dbc0703a882a48e712aa93060 100644 (file)
--- a/makefile
+++ b/makefile
@@ -10,6 +10,10 @@ HCFLAGS += -Weverything \
            -Wno-safe \
            -Wno-unsafe \
            -Wno-all-missed-specialisations \
+           -Wno-prepositive-qualified-module \
+           -Wno-missing-safe-haskell-mode \
+           -Wno-missing-deriving-strategies \
+           -Wno-missing-kind-signatures \
            -rtsopts \
            -threaded
 
@@ -20,9 +24,9 @@ $(BIN): $(PN).cabal $(SRCS)
        runghc Setup.hs build --ghc-options="${HCFLAGS}"
 
 doc: $(PN).cabal $(SRCS)
-       runghc Setup.hs haddock  --all \
-                                --hyperlink-source \
-                                 --haddock-options="--ignore-all-exports"
+       runghc Setup.hs haddock --all \
+                               --hyperlink-source \
+                                --haddock-options="--ignore-all-exports"
 
 
 #

diff --git a/src/DNS.hs b/src/DNS.hs
index aa46f4be8191798f7194495e761d92ee5120ce70..a6ba446af000320a70ffedffbda97ccaa5b17443 100644 (file)
--- a/src/DNS.hs
+++ b/src/DNS.hs
@@ -30,7 +30,7 @@ type LookupResult = (Domain, Either DNSError [Domain])
 --   Examples:
 --
 --   >>> resolve_address "example.com"
---   Right [93.184.216.34]
+--   Right [93.184.215.14]
 --   >>> resolve_address "93.184.216.34"
 --   Right [93.184.216.34]
 --

diff --git a/test/Doctests.hs b/test/Doctests.hs
index af7167d52a469aa2f504e913a9d18c6053e405a2..ebbe586e0d5b34e9fce2587126816942471170b3 100644 (file)
--- a/test/Doctests.hs
+++ b/test/Doctests.hs
@@ -10,8 +10,4 @@ find_sources = find always (extension ==? ".hs") "src/"
 main :: IO ()
 main = do
   sources <- find_sources
-  doctest $ ["-isrc",
-             "-idist/build/autogen",        -- old cabal versions
-             "-idist/build/haeredes/autogen" -- new cabal versions
-            ]
-            ++ sources
+  doctest $ ["-isrc", "-idist/build/haeredes/autogen" ] ++ sources