fix(deps): update module github.com/quic-go/quic-go to v0.43.1

Signed-off-by: Sam Therapy <sam@samtherapy.net>

.forgejo/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Gitea Release
+name: Forgejo Release
 
 on:
   push:
@@ -13,9 +13,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
+          submodules: recursive
 
       - name: Set up Go
         uses: actions/setup-go@v4
@@ -30,7 +28,7 @@ jobs:
         with:
           distribution: goreleaser
           version: latest
-          args: release --clean
+          args: release --clean --skip docker,snapcraft
         env:
           GORELEASER_FORCE_TOKEN: gitea
           GITEA_TOKEN: ${{ secrets.PUBLISH_TOKEN }}

.forgejo/workflows/test.yaml

@@ -10,16 +10,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.goVer }}
 
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-
       - name: Test
         run: make test-ci

.github/workflows/ghrelease.yaml

@@ -4,32 +4,53 @@ on:
   push:
     tags:
       - "*"
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   release:
     runs-on: ubuntu-latest
+    env:
+      SNAPCRAFT_STORE_CREDENTIALS : ${{ secrets.SNAPCRAFT_TOKEN }}
     steps:
+      # Workaround a dumb docker problem where everything has to be lowercase
+      - id: lowercase
+        run: |
+          echo IMAGE_NAME=$(echo $IMAGE_NAME | tr '[:upper:]' '[:lower:]') >> "${GITHUB_ENV}"
+
+      - name: Login to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: recursive
 
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
+      - name: Install Snapcraft
+        uses: samuelmeuli/action-snapcraft@v2
 
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.20.1'
+          go-version: stable
 
       - name: Install scdoc
         run: sudo apt-get install -y scdoc
 
+      - name: Workaround a dumb Snap bug
+        run: mkdir -p $HOME/.cache/snapcraft/download && mkdir -p $HOME/.cache/snapcraft/stage-packages
+
       - name: Release with GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
           distribution: goreleaser
           version: latest
-          args: release --clean --skip=homebrew,nix,scoop
+          args: release --clean --skip=aur,homebrew,nix,scoop
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yaml

@@ -10,16 +10,15 @@ jobs:
         goVer: ["oldstable", "stable"]
     runs-on: ${{ matrix.platform }}-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.goVer }}
 
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-
       - name: Test
         run: make test-ci

.gitignore

@@ -23,7 +23,7 @@ coverage/*
 !coverage/.gitkeep
 
 awl
-doc/awl.1
-doc/awl.1.gz
+docs/awl.1
+docs/awl.1.gz
 
 .dccache

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "doc/wiki"]
-	path = doc/wiki
+[submodule "docs/wiki"]
+	path = docs/wiki
 	url = ../awl.wiki

.goreleaser.yaml

@@ -5,7 +5,7 @@ before:
     - make clean
     - go mod tidy
     # Make manpages
-    - doc/makeman.sh
+    - docs/makeman.sh
     # Vendor dependencies
     - go mod vendor
 
@@ -17,11 +17,14 @@ builds:
       - plan9_amd64
       - freebsd_amd64
 
+universal_binaries:
+  - replace: true
+
 archives:
   - files:
       - LICENSE
       - completions/**
-      - doc/awl.1.gz
+      - docs/awl.1.gz
     name_template: >-
       {{ .ProjectName }}_
       {{- if eq .Os "darwin" }}MacOS_
@@ -42,75 +45,6 @@ archives:
     meta: true
     wrap_in_directory: "{{ .ProjectName }}"
 
-universal_binaries:
-- replace: true
-
-checksum:
-  name_template: "checksums.txt"
-
-snapshot:
-  name_template: "{{ incpatch .Version }}-next"
-
-changelog:
-  sort: asc
-
-  groups:
-    - title: "Dependency Updates"
-      regexp: "^.*fix\\(deps\\)*:+.*$"
-      order: 2
-    - title: "Features"
-      regexp: "^.*feat[(\\w)]*:+.*$"
-      order: 0
-    - title: "Bug fixes"
-      regexp: "^.*fix[(\\w)]*:+.*$"
-      order: 1
-    - title: "Other"
-      order: 999
-
-  filters:
-    exclude:
-      - "^test:"
-      - "^docs?:"
-      - "typo"
-      - "^ci:"
-
-brews:
-  - repository:
-      owner: packaging
-      name: homebrew
-    homepage: https://dns.froth.zone/awl
-    description: A DNS query tool
-    license: BSD-3-Clause
-    # custom_block: |
-    #   head "https://git.froth.zone/sam/awl.git"
-    install: |-
-      bin.install "awl"
-      bash_completion.install "completions/bash.bash" => "awl"
-      zsh_completion.install "completions/zsh.zsh" => "_awl"
-      fish_completion.install "completions/fish.fish" => "awl.fish"
-      man1.install "doc/awl.1.gz"
-
-scoops:
-  - repository:
-      owner: packaging
-      name: scoop
-    folder: bucket
-    homepage: https://dns.froth.zone/awl
-    description: A DNS query client
-    license: BSD-3-Clause
-
-nix:
-  -
-    repository:
-      owner: packaging
-      name: nur
-    homepage: https://dns.froth.zone/awl
-    description: A DNS query client
-    license: bsd3
-    extra_install: |-
-      installManPage ./doc/awl.1.gz
-      installShellCompletion ./completions/*
-
 nfpms:
   - id: packages
     package_name: awl-dns
@@ -131,10 +65,10 @@ nfpms:
     contents:
       - src: completions/bash.bash
         dst: /usr/share/bash-completion/completions/awl
-      - src: doc/awl.1.gz
+      - src: docs/awl.1.gz
         dst: /usr/share/man/man1/awl.1.gz
       - src: LICENSE
-        dst: /usr/share/doc/awl/copyright
+        dst: /usr/share/docs/awl/copyright
       - src: completions/fish.fish
         dst: /usr/share/fish/vendor_completions.d/awl.fish
       # DEB only
@@ -170,7 +104,6 @@ nfpms:
           {{- else if eq .Arch "arm" }}armhfp
           {{- else if eq .Arch "arm64" }}aarch64
           {{- else }}{{ .Arch }}{{ end -}}
-
   - id: termux
     package_name: awl-dns
     vendor: Sam Therapy <sam@samtherapy.net>
@@ -183,18 +116,105 @@ nfpms:
     section: utils
     formats:
       - termux.deb
-    file_name_template:  >-
-          {{- .PackageName }}_
-          {{- .Version }}_
-          {{- if eq .Arch "amd64" }}x86_64
-          {{- else if eq .Arch "386" }}i686
-          {{- else if eq .Arch "arm" }}arm
-          {{- else if eq .Arch "arm64" }}aarch64
-          {{- else }}{{ .Arch }}{{ end -}}
+    file_name_template: >-
+      {{- .PackageName }}_
+      {{- .Version }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i686
+      {{- else if eq .Arch "arm" }}arm
+      {{- else if eq .Arch "arm64" }}aarch64
+      {{- else }}{{ .Arch }}{{ end -}}
+
+snapcrafts:
+  -
+    name: awl-dns
+    grade: stable
+    publish: true
+    summary: A command-line DNS query tool
+    description: |-
+      Awl is a command-line DNS query tool.
+      Awl supports DNS-over-[UDP,TCP,HTTPS,QUIC] and DNSCrypt.
+    confinement: strict
+    license: BSD-3-Clause
+    base: bare
+    apps:
+      awl-dns:
+        command: awl
+        plugs:
+          - network
+        completer: completions/bash.bash
+
+dockers:
+  -
+    image_templates:
+          - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:latest"
+          - "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:{{ .Tag }}"
+
+checksum:
+  name_template: "checksums.txt"
+
+snapshot:
+  name_template: "{{ incpatch .Version }}-next"
+
+brews:
+  - repository:
+      owner: packaging
+      name: homebrew
+    homepage: https://dns.froth.zone/awl
+    description: A DNS query tool
+    license: BSD-3-Clause
+    # custom_block: |
+    #   head "https://git.froth.zone/sam/awl.git"
+    install: |-
+      bin.install "awl"
+      bash_completion.install "completions/bash.bash" => "awl"
+      zsh_completion.install "completions/zsh.zsh" => "_awl"
+      fish_completion.install "completions/fish.fish" => "awl.fish"
+      man1.install "docs/awl.1.gz"
+
+nix:
+  - repository:
+      owner: packaging
+      name: nur
+    homepage: https://dns.froth.zone/awl
+    description: A DNS query client
+    license: bsd3
+    extra_install: |-
+      installManPage ./docs/awl.1.gz
+      installShellCompletion ./completions/*
+
+scoops:
+  - repository:
+      owner: packaging
+      name: scoop
+    folder: bucket
+    homepage: https://dns.froth.zone/awl
+    description: A DNS query client
+    license: BSD-3-Clause
+
+changelog:
+  sort: asc
+  groups:
+    - title: "Dependency Updates"
+      regexp: "^.*fix\\(deps\\)*:+.*$"
+      order: 2
+    - title: "Features"
+      regexp: "^.*feat[(\\w)]*:+.*$"
+      order: 0
+    - title: "Bug fixes"
+      regexp: "^.*fix[(\\w)]*:+.*$"
+      order: 1
+    - title: "Other"
+      order: 999
+  filters:
+    exclude:
+      - "^test:"
+      - "^docs?:"
+      - "typo"
+      - "^ci:"
 
 uploads:
-  -
-    name: packages
+  - name: packages
     method: PUT
     mode: archive
     exts:

Dockerfile

@@ -0,0 +1,3 @@
+FROM scratch
+ENTRYPOINT ["/awl"]
+COPY awl /

GNUmakefile

@@ -22,7 +22,7 @@ install:
 else
 install: all
 	install -$(INSTALLFLAGS)m755 $(PROG) $(DESTDIR)$(PREFIX)/$(BIN)/$(PROG)
-	install -$(INSTALLFLAGS)m644 doc/$(PROG).1 $(DESTDIR)$(MAN)/man1/$(PROG).1
+	install -$(INSTALLFLAGS)m644 docs/$(PROG).1 $(DESTDIR)$(MAN)/man1/$(PROG).1
 # completions need to go in one specific place :)
 	install -$(INSTALLFLAGS)m644 completions/bash.bash $(DESTDIR)$(PREFIX)/$(SHARE)/bash-completion/completions/$(PROG)
 	install -$(INSTALLFLAGS)m644 completions/fish.fish $(DESTDIR)$(PREFIX)/$(SHARE)/fish/vendor_completions.d/$(PROG).fish

Makefile

@@ -9,7 +9,7 @@ EXE := $(PROG)
 .PHONY: install
 install: all
 	install -Dm755 $(PROG) $(DESTDIR)$(PREFIX)/$(BIN)/$(PROG)
-	install -Dm644 doc/$(PROG).1 $(DESTDIR)$(MAN)/man1/$(PROG).1
+	install -Dm644 docs/$(PROG).1 $(DESTDIR)$(MAN)/man1/$(PROG).1
 # completions need to go in one specific place :)
 	install -Dm644 completions/bash.bash $(DESTDIR)$(PREFIX)$(SHARE)/bash-completion/completions/$(PROG)
 	install -Dm644 completions/fish.fish $(DESTDIR)$(PREFIX)$(SHARE)/fish/vendor_completions.d/$(PROG).fish

README.md

@@ -1,15 +1,14 @@
-# <img src="./doc/awl-text.png" width="50%" title="awl logo" alt="awl">
+<!-- markdownlint-disable MD033 -->
+# <img src="./docs/img/awl-text.png" width="50%" title="awl logo" alt="awl">
 
 > awl *(noun)*: A pointed tool for making small holes in wood or leather
 
-
 A command-line DNS lookup tool that supports DNS queries over UDP, TCP, TLS, HTTPS, DNSCrypt, and QUIC.
 
-
 [![Gitea Release](https://img.shields.io/gitea/v/release/sam/awl?gitea_url=https%3A%2F%2Fgit.froth.zone&display_name=release&style=for-the-badge)](https://git.froth.zone/sam/awl)
 [![Last Commit](https://img.shields.io/gitea/last-commit/sam/awl?gitea_url=https%3A%2F%2Fgit.froth.zone&style=for-the-badge)](https://git.froth.zone/sam/awl/commits/branch/master)
-[![Go Report](https://goreportcard.com/badge/dns.froth.zone/awl?style=for-the-badge)](https://goreportcard.com/report/dns.froth.zone/awl)
 [![License](https://img.shields.io/github/license/samtherapy/awl?style=for-the-badge)](https://spdx.org/licenses/BSD-3-Clause.html)
+[![Go Report](https://goreportcard.com/badge/dns.froth.zone/awl?style=for-the-badge)](https://goreportcard.com/report/dns.froth.zone/awl)
 
 
 Awl is designed to be a drop-in replacement for [dig](https://bind9.readthedocs.io/en/v9_18_3/manpages.html#dig-dns-lookup-utility).
@@ -20,8 +19,8 @@ Awl is designed to be a drop-in replacement for [dig](https://bind9.readthedocs.
 # Query a domain over UDP
 awl example.com
 
-# Query a domain over TCP
-awl example.com
+# Query a domain over HTTPS, print only the results
+awl example.com +https --short
 
 # Query a domain over TLS, print as JSON
 awl example.com +tls +json
@@ -37,11 +36,15 @@ On any platform, with [Go](https://go.dev) installed, run the following command
 go install dns.froth.zone/awl@latest
 ```
 
+### Packaging
+
 Alternatively, many package managers are supported:
 
 <details>
 <summary>Linux</summary>
 
+#### Distro-specific
+
 <details>
 <summary>Alpine Linux</summary>
 
@@ -63,6 +66,7 @@ apk add awl-dns
 <summary>Arch</summary>
 
 AUR package available as [awl-dns-git](https://aur.archlinux.org/packages/awl-dns-git/)
+
 ```shell
 yay -S awl-dns-git ||
 paru -S awl-dns-git
@@ -118,6 +122,9 @@ emerge -av net-dns/awl
 
 </details>
 
+#### Distro-agnostic
+
+
 <details>
 <summary><a href="https://brew.sh" nofollow>Homebrew</a></summary>
 
@@ -126,9 +133,19 @@ brew install SamTherapy/tap/awl
 ```
 
 </details>
-</details>
-<br />
+<details>
+<summary>Snap</summary>
 
+Snap package available as [awl-dns](https://snapcraft.io/awl-dns)
+
+```shell
+snap install awl-dns ||
+sudo snap install awl-dns
+```
+
+</details>
+</details>
+<hr />
 <details>
 <summary>macOS</summary>
 
@@ -138,10 +155,10 @@ brew install SamTherapy/tap/awl
 ```shell
 brew install SamTherapy/tap/awl
 ```
-</details>
-</details>
-<br />
 
+</details>
+</details>
+<hr />
 <details>
 <summary>Windows</summary>
 
@@ -152,11 +169,27 @@ brew install SamTherapy/tap/awl
 scoop bucket add froth https://git.froth.zone/packages/scoop.git
 scoop install awl
 ```
+
 </details>
 </details>
 
+## Contributing
+
+Please see the [CONTRIBUTING.md](./docs/CONTRIBUTING.md) file for more information.
+
+TL;DR: If you like the project, spread the word! If you want to contribute, [use the issue tracker](https://git.froth.zone/sam/awl/issues) or [open a pull request](https://git.froth.zone/sam/awl/pulls).
+Want to use email instead? Use our [mailing list](https://lists.sr.ht/~sammefishe/awl-devel)!
+
+### Mirrors
+
+The canonical repository is located on [my personal Forgejo instance](https://git.froth.zone/sam/awl). \
+Official mirrors are located on [GitHub](https://github.com/SamTherapy/awl) and [SourceHut](https://git.sr.ht/~sammefishe/awl/).
+Contributions are accepted on all mirrors, but the Forgejo instance is preferred.
+
 ## License
+
 [BSD-3-Clause](https://spdx.org/licenses/BSD-3-Clause.html)
 
 ### Credits
+
 - Awl image taken from [Wikimedia Commons](https://commons.wikimedia.org/wiki/File:Awl.tif), imaged is licensed CC0.

cmd/misc.go

@@ -83,7 +83,6 @@ func ParseMiscArgs(args []string, opts *util.Options) error {
 
 			opts.Logger.Info(arg, "detected as a domain name")
 			opts.Request.Name, err = idna.ToASCII(arg)
-
 			if err != nil {
 				return fmt.Errorf("unicode to punycode: %w", err)
 			}
@@ -99,7 +98,6 @@ func ParseMiscArgs(args []string, opts *util.Options) error {
 
 			opts.Logger.Info(arg, "is unknown. Assuming domain")
 			opts.Request.Name, err = idna.ToASCII(arg)
-
 			if err != nil {
 				return fmt.Errorf("unicode to punycode: %w", err)
 			}

doc/makeman.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -f doc/awl.1.gz
-scdoc <doc/awl.1.scd >doc/awl.1
-gzip -9 -n doc/awl.1

docs/CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+/dev/null

docs/CONTRIBUTING.md

@@ -0,0 +1,57 @@
+# Contributing to awl
+
+First off, thank you! We appreciate your interest in wanting to contribute to awl.
+
+> If you like the project, spread the word! Help us grow by sharing the project with anyone you thing might be interested. Here are some ways you can help:
+>
+> - Star the project on GitHub
+> - Share the project on social media
+> - Tell your friends about the project
+
+## How to contribute
+
+If you want to contribute to awl, you can do so by:
+
+- [Reporting a bug](#reporting-a-bug)
+- [Requesting a feature](#requesting-a-feature)
+- [Submitting a pull request](#submitting-a-pull-request)
+
+### Reporting a bug
+
+If you find a bug in awl, please [open an issue](https://git.froth.zone/sam/awl/issues) on the project's issue tracker. When reporting a bug, please include as much information as possible, such as:
+
+- The version of awl you are using
+- The operating system you are using
+- The steps to reproduce the bug
+- Any error messages you received
+
+### Requesting a feature
+
+If you have an idea for a feature you would like to see in awl, please [open an issue](https://git.froth.zone/sam/awl/issues) on the project's issue tracker. When requesting a feature, please include as much information as possible, such as:
+
+- A description of the feature
+- Why you think the feature would be useful
+- Any other relevant information
+
+### Submitting a pull request
+
+If you would like to contribute code to awl, you can do so by submitting a pull request. To submit a pull request, follow these steps:
+
+1. Fork the project on Git
+2. Create a new branch for your changes
+3. Make your changes
+4. Push your changes to your fork
+5. [Open a pull request](https://git.froth.zone/sam/awl/pulls) on the project's Git repository
+
+When submitting a pull request, please include as much information as possible, such as:
+
+- A description of the changes you made
+- Why you made the changes
+- Any other relevant information
+
+Alternatively, you can also contribute by sending an email to the project's [mailing list](https://lists.sr.ht/~sammefishe/awl-devel). For more information about using Git over email, refer to [git-send-email.io](https://git-send-email.io/)
+
+#### Code Style
+
+Before submitting a pull request, please run `make lint` to ensure your code adheres to the project's code style.
+Make sure that you have `golangci-lint` installed, that is our linter of choice.

docs/makeman.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+rm -f docs/awl.1.gz
+scdoc <docs/awl.1.scd >docs/awl.1
+gzip -9 -n docs/awl.1

go.mod

@@ -1,17 +1,17 @@
 module dns.froth.zone/awl
 
-go 1.21.8
+go 1.21.9
 
-toolchain go1.22.1
+toolchain go1.22.2
 
 require (
-	dns.froth.zone/dnscrypt v0.0.1
+	dns.froth.zone/dnscrypt v0.0.2
 	github.com/dchest/uniuri v1.2.0
-	github.com/miekg/dns v1.1.58
-	github.com/quic-go/quic-go v0.41.0
+	github.com/miekg/dns v1.1.59
+	github.com/quic-go/quic-go v0.43.1
 	github.com/stefansundin/go-zflag v1.1.1
-	golang.org/x/net v0.22.0
-	golang.org/x/sys v0.18.0
+	golang.org/x/net v0.24.0
+	golang.org/x/sys v0.20.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.1
 )
@@ -25,7 +25,7 @@ require (
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/onsi/ginkgo/v2 v2.16.0 // indirect
 	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
 	golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
 	golang.org/x/mod v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

go.sum

@@ -1,5 +1,5 @@
-dns.froth.zone/dnscrypt v0.0.1 h1:plShBpr4lwQC9LNy6aUtKj4cyB1XSCrjutrUHdGIxtA=
-dns.froth.zone/dnscrypt v0.0.1/go.mod h1:QZ0HAm7mWe8wz1dTqbKmTZhlr06x5qpe6ZCTPJ7uY30=
+dns.froth.zone/dnscrypt v0.0.2 h1:ytqjic/Qway4OuLw8ee0ubxdNzy+F3igUGDrEVwyLls=
+dns.froth.zone/dnscrypt v0.0.2/go.mod h1:QZ0HAm7mWe8wz1dTqbKmTZhlr06x5qpe6ZCTPJ7uY30=
 github.com/AdguardTeam/golibs v0.20.3 h1:5RiDypxBebd4Y2eftwm6JJla18oBqRHwanR7q0rnrxw=
 github.com/AdguardTeam/golibs v0.20.3/go.mod h1:/votX6WK1PdcZ3T2kBOPjPCGmfhlKixhI6ljYrFRPvI=
 github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
@@ -24,8 +24,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
-github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
+github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
+github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
 github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
 github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
@@ -33,8 +33,8 @@ github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8P
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
-github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
+github.com/quic-go/quic-go v0.43.1 h1:fLiMNfQVe9q2JvSsiXo4fXOEguXHGGl9+6gLp4RPeZQ=
+github.com/quic-go/quic-go v0.43.1/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/stefansundin/go-zflag v1.1.1 h1:XabhzWS588bVvV1z1UctSa6i8zHkXc5W9otqtnDSHw8=
@@ -45,20 +45,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw=
 golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
 golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
 golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=

mkfile

@@ -17,7 +17,7 @@ $PROG:
 
 install:V:
   $GO install $GOFLAGS  .
-  # cp doc/$PROG.1 /sys/man/1/$PROG
+  # cp docs/$PROG.1 /sys/man/1/$PROG
 
 test:V:
   $GO test -v -cover ./...

pkg/query/struct.go

@@ -61,7 +61,7 @@ type Answer struct {
 
 // EDNS0 is for all EDNS options.
 //
-// RFC: https://datatracker.ietf.org/doc/draft-peltan-edns-presentation-format/
+// RFC: https://datatracker.ietf.org/docs/draft-peltan-edns-presentation-format/
 //
 //nolint:govet,tagliatelle
 type EDNS0 struct {

pkg/resolvers/general.go

@@ -62,7 +62,6 @@ func (resolver *StandardResolver) LookUp(msg *dns.Msg) (resp util.Response, err
 			msg.Extra = resp.DNS.Extra
 
 			resp.DNS, resp.RTT, err = dnsClient.Exchange(msg, resolver.opts.Request.Server)
-
 			if err != nil {
 				return resp, fmt.Errorf("badcookie: DNS exchange: %w", err)
 			}

renovate.json

@@ -1,4 +1,5 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base", ":npm", ":gomod"]
+  "extends": ["config:base", ":npm", ":gomod"],
+  "automerge": true
 }

snap/snapcraft.yaml

@@ -1,41 +0,0 @@
-# You may ask yourself, why make a snap?
-# why not?
-
-name: awl
-base: core20
-adopt-info: awl
-license: BSD-3-Clause
-summary: A command-line DNS query tool.
-description: |
-  awl is a command line DNS tool, much like dig and drill.
-
-grade: devel
-confinement: strict
-
-architectures:
-  - build-on: amd64
-  - build-on: arm64
-  - build-on: s390x
-  - build-on: ppc64el
-  - build-on: armhf
-
-parts:
-  awl:
-    build-packages:
-      - scdoc
-    plugin: go
-    source-type: git
-    source: https://git.froth.zone/sam/awl
-    override-pull: |
-      snapcraftctl pull
-      snapcraftctl set-version "$(git describe --always | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || echo 'UNKNOWN')"
-    override-build: |
-      HASH=$(git describe --always | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || echo 'UNKNOWN')+snap make
-      PREFIX=$SNAPCRAFT_PART_INSTALL make install
-
-apps:
-  awl:
-    command: bin/awl
-    completer: share/bash-completion/completions/awl
-    plugs:
-      - network

template.mk

@@ -23,19 +23,19 @@ MAN ?= $(PREFIX)/$(SHARE)/man
 PROG ?= awl
 
 # hehe
-all: $(PROG) doc/$(PROG).1
+all: $(PROG) docs/$(PROG).1
 
 $(PROG): $(SOURCES)
 	$(GO) build -o $(EXE) $(GOFLAGS) .
 
-doc/$(PROG).1: doc/$(PROG).1.scd
+docs/$(PROG).1: docs/$(PROG).1.scd
 	$(SCDOC) <$? >$@
 
-doc/wiki/$(PROG).1.md: doc/$(PROG).1
+docs/wiki/$(PROG).1.md: docs/$(PROG).1
 	pandoc --from man --to gfm -o $@ $?
 
 ## update_doc: update documentation (requires pandoc)
-update_doc: doc/wiki/$(PROG).1.md
+update_doc: docs/wiki/$(PROG).1.md
 
 .PHONY: fmt
 fmt:
@@ -87,7 +87,7 @@ cover: coverage/cover.html
 clean:
 	$(GO) clean
 # Ignore errors if you remove something that doesn't exist
-	rm -f doc/$(PROG).1
+	rm -f docs/$(PROG).1
 	rm -f coverage/cover*
 	rm -rf vendor