From 322ebf8e034d78d7a283e6961f2f93622b805cb5 Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Tue, 18 Jun 2024 23:02:09 +0000
Subject: [PATCH 1/6] Bump copyright year

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index da64575..19b116e 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,6 @@ are hexadecimal representations of the first and last IP address in the network.
 Copyright and License
 =====================
 
-This software is Copyright (c) 2014 - 2023 by MaxMind, Inc.
+This software is Copyright (c) 2014 - 2024 by MaxMind, Inc.
 
 This is free software, licensed under the Apache License, Version 2.0.

From 12977234b1c67787b539ecd8f64d3ef14a1688eb Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Tue, 18 Jun 2024 23:03:08 +0000
Subject: [PATCH 2/6] Remove stray line

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 19b116e..1b9b95d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ downloaded from the GitHub releases page.
 Usage
 =====
 
-
 Required:
 
 * -block-file=[FILENAME] - The name of the block CSV file to use as input.

From 7ec95648bc6c84a2a7d3cbd37f37f413a5a45c96 Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Wed, 19 Jun 2024 18:29:02 +0000
Subject: [PATCH 3/6] Add modver action

---
 .github/workflows/modver.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/modver.yml

diff --git a/.github/workflows/modver.yml b/.github/workflows/modver.yml
new file mode 100644
index 0000000..1313dd2
--- /dev/null
+++ b/.github/workflows/modver.yml
@@ -0,0 +1,21 @@
+name: modver
+
+on:
+  pull_request:
+
+permissions:
+  contents: read # This gets granted by default, so keep granting it.
+  packages: read # This gets granted by default, so keep granting it.
+  pull-requests: write # Needed to comment on the PR.
+
+jobs:
+  modver:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: bobg/modver@v2.8.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          pull_request_url: https://github.com/${{ github.repository }}/pull/${{ github.event.number }}

From a6f6f5b69d279c190a36fd7da569c2954cdaa0d0 Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Wed, 19 Jun 2024 18:35:35 +0000
Subject: [PATCH 4/6] Test on Go 1.22, drop 1.20

---
 .github/workflows/go.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index d379c9b..7fd54b5 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.21.x, 1.22.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     name: "Build ${{ matrix.go-version }} test on ${{ matrix.platform }}"

From 3bdcc6d3e8c0e4b8135721d617a74fcce0531025 Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Wed, 19 Jun 2024 19:44:59 +0000
Subject: [PATCH 5/6] Do not run CodeQL action on push

It doesn't have enough permissions by default. We also don't need it
when we're doing so on pull_request.
---
 .github/workflows/codeql-analysis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 16c6a73..afe96a8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,9 +1,6 @@
 name: "Code scanning - action"
 
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
   pull_request:
   schedule:
     - cron: '0 12 * * 3'

From 772b47a712860fd746324558bd7df101bb85ff83 Mon Sep 17 00:00:00 2001
From: William Storey <wstorey@maxmind.com>
Date: Wed, 19 Jun 2024 21:11:52 +0000
Subject: [PATCH 6/6] Add permission for scheduled CodeQL run

---
 .github/workflows/codeql-analysis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index afe96a8..d450294 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -5,6 +5,9 @@ on:
   schedule:
     - cron: '0 12 * * 3'
 
+permissions:
+  security-events: write # Used by this action.
+
 jobs:
   CodeQL-Build: