From 12ef431d87442cac2111a0d3af3d13017e695348 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 30 Aug 2022 16:04:05 +0300
Subject: [PATCH] io/ioutil is deprecated since Go 1.16

---
 netrc.go                | 3 +--
 rounds/transcodeJXL.go  | 5 ++---
 rounds/transcodeWebP.go | 3 +--
 tls/tlsauth.go          | 2 +-
 tls/verify.go           | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/netrc.go b/netrc.go
index 8cc6560..d8877b4 100644
--- a/netrc.go
+++ b/netrc.go
@@ -3,7 +3,6 @@
 package tofuproxy
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -19,7 +18,7 @@ func findInNetrc(host string) (string, string) {
 		}
 		netrcPath = filepath.Join(homeDir, ".netrc")
 	}
-	data, err := ioutil.ReadFile(netrcPath)
+	data, err := os.ReadFile(netrcPath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return "", ""
diff --git a/rounds/transcodeJXL.go b/rounds/transcodeJXL.go
index f88eab3..e057467 100644
--- a/rounds/transcodeJXL.go
+++ b/rounds/transcodeJXL.go
@@ -21,7 +21,6 @@ package rounds
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -39,7 +38,7 @@ func transcodeCmd2Png(
 	if resp.Header.Get("Content-Type") != contentType {
 		return true, nil
 	}
-	tmpFd, err := ioutil.TempFile("", "tofuproxy.*."+ext)
+	tmpFd, err := os.CreateTemp("", "tofuproxy.*."+ext)
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -58,7 +57,7 @@ func transcodeCmd2Png(
 	if err != nil {
 		return false, err
 	}
-	data, err := ioutil.ReadFile(dstFn)
+	data, err := os.ReadFile(dstFn)
 	if err != nil {
 		return false, err
 	}
diff --git a/rounds/transcodeWebP.go b/rounds/transcodeWebP.go
index fa0af4f..53654ef 100644
--- a/rounds/transcodeWebP.go
+++ b/rounds/transcodeWebP.go
@@ -21,7 +21,6 @@ package rounds
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -46,7 +45,7 @@ func RoundTranscodeWebP(
 	if resp.Header.Get("Content-Type") != "image/webp" || isXombrero(req) {
 		return true, nil
 	}
-	tmpFd, err := ioutil.TempFile("", "tofuproxy.*.webp")
+	tmpFd, err := os.CreateTemp("", "tofuproxy.*.webp")
 	if err != nil {
 		log.Fatalln(err)
 	}
diff --git a/tls/tlsauth.go b/tls/tlsauth.go
index c93eb3d..131dff2 100644
--- a/tls/tlsauth.go
+++ b/tls/tlsauth.go
@@ -122,7 +122,7 @@ foreach sigScheme {%s} {
 		})
 		b.WriteString(fmt.Sprintf(".lb insert end \"%d: %s\"\n", i+1, cert.Subject))
 	}
-	// ioutil.WriteFile("/tmp/tls-auth-dialog.tcl", b.Bytes(), 0666)
+	// os.WriteFile("/tmp/tls-auth-dialog.tcl", b.Bytes(), 0666)
 	cmd := exec.Command(CmdWish)
 	cmd.Stdin = &b
 	out, err := cmd.Output()
diff --git a/tls/verify.go b/tls/verify.go
index a63fb4a..ea789e4 100644
--- a/tls/verify.go
+++ b/tls/verify.go
@@ -251,7 +251,7 @@ func verifyCert(
 		))
 		b.WriteString(VerifyDialog)
 		cmd := exec.Command(CmdWish)
-		// ioutil.WriteFile("/tmp/verify-dialog.tcl", b.Bytes(), 0666)
+		// os.WriteFile("/tmp/verify-dialog.tcl", b.Bytes(), 0666)
 		cmd.Stdin = &b
 		err = cmd.Run()
 		exitError, ok := err.(*exec.ExitError)
-- 
2.44.0