From 8c1aa772130cab6facb5ff7aea294d707ef7c6bf Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 9 Nov 2025 11:45:27 -0500
Subject: [PATCH] Upgrade to go 1.24

---
 go.mod                 | 2 +-
 pkg/pop3/conn.go       | 2 +-
 pkg/pop3/conn_test.go  | 2 +-
 pkg/smtp/conn_test.go  | 4 ++--
 pkg/smtp/relay_test.go | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 3426b1e..43039e1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
 module src.bluestatic.org/mailpopbox
 
-go 1.14
+go 1.24.0
 
 require go.uber.org/zap v1.15.0
diff --git a/pkg/pop3/conn.go b/pkg/pop3/conn.go
index 29c5eea..2b0d15a 100644
--- a/pkg/pop3/conn.go
+++ b/pkg/pop3/conn.go
@@ -324,7 +324,7 @@ func (conn *connection) doCAPA() {
 		".",
 	}
 	for _, c := range caps {
-		conn.tp.PrintfLine(c)
+		conn.tp.PrintfLine("%s", c)
 	}
 }
 
diff --git a/pkg/pop3/conn_test.go b/pkg/pop3/conn_test.go
index cb6fc2a..c5ad731 100644
--- a/pkg/pop3/conn_test.go
+++ b/pkg/pop3/conn_test.go
@@ -244,7 +244,7 @@ func clientServerTest(t *testing.T, s *testServer, sequence []requestResponse) {
 	responseOK(t, conn)
 
 	for _, pair := range sequence {
-		ok(t, conn.PrintfLine(pair.command))
+		ok(t, conn.PrintfLine("%s", pair.command))
 		pair.expecter(t, conn)
 		if t.Failed() {
 			t.Logf("command %q", pair.command)
diff --git a/pkg/smtp/conn_test.go b/pkg/smtp/conn_test.go
index 1f6b252..910d951 100644
--- a/pkg/smtp/conn_test.go
+++ b/pkg/smtp/conn_test.go
@@ -123,7 +123,7 @@ type requestResponse struct {
 
 func runTableTest(t testing.TB, conn *textproto.Conn, seq []requestResponse) {
 	for i, rr := range seq {
-		ok(t, conn.PrintfLine(rr.request))
+		ok(t, conn.PrintfLine("%s", rr.request))
 		if rr.handler != nil {
 			rr.handler(t, conn)
 		} else {
@@ -152,7 +152,7 @@ func TestScenarioTypical(t *testing.T) {
 	}
 
 	greet := "greeting.TestScenarioTypical"
-	ok(t, conn.PrintfLine("EHLO "+greet))
+	ok(t, conn.PrintfLine("EHLO %s", greet))
 
 	_, message, err := conn.ReadResponse(250)
 	ok(t, err)
diff --git a/pkg/smtp/relay_test.go b/pkg/smtp/relay_test.go
index c6a116b..1dc4921 100644
--- a/pkg/smtp/relay_test.go
+++ b/pkg/smtp/relay_test.go
@@ -8,6 +8,7 @@ package smtp
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"mime"
@@ -92,7 +93,7 @@ func TestDeliveryFailureMessage(t *testing.T) {
 		server: s,
 		log:    zap.NewNop(),
 	}
-	mta.deliverRelayFailure(env, zap.NewNop(), env.RcptTo[0].Address, errorStr1, fmt.Errorf(errorStr2))
+	mta.deliverRelayFailure(env, zap.NewNop(), env.RcptTo[0].Address, errorStr1, errors.New(errorStr2))
 
 	if want, got := 1, len(s.messages); want != got {
 		t.Errorf("Want %d failure notification, got %d", want, got)
-- 
2.43.5