From d4823473104895a8fcc1eaf80cf4a05189dbfd81 Mon Sep 17 00:00:00 2001
From: Martin Dosch <martin@mdosch.de>
Date: Sat, 11 Nov 2023 14:30:23 +0100
Subject: [PATCH] Switch back to upstream go-xmpp library.

---
 connect.go        | 2 +-
 go.mod            | 2 +-
 go.sum            | 4 ++--
 httpupload.go     | 2 +-
 main.go           | 2 +-
 ox.go             | 2 +-
 stanzahandling.go | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/connect.go b/connect.go
index 65eec9d..f8b8a51 100644
--- a/connect.go
+++ b/connect.go
@@ -9,7 +9,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/mdosch/go-xmpp"       // BSD-3-Clause
+	"github.com/mattn/go-xmpp"       // BSD-3-Clause
 	"salsa.debian.org/mdosch/xmppsrv" // BSD-2-Clause
 )
 
diff --git a/go.mod b/go.mod
index 284a71a..47cdccc 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/ProtonMail/gopenpgp/v2 v2.7.4
 	github.com/beevik/etree v1.2.0
 	github.com/gabriel-vasile/mimetype v1.4.3
-	github.com/mdosch/go-xmpp v0.0.2-0.20231106191933-6fd0e544bf21
+	github.com/mattn/go-xmpp v0.0.2-0.20231111120817-4c385a334c60
 	github.com/pborman/getopt/v2 v2.1.0
 	salsa.debian.org/mdosch/xmppsrv v0.2.5
 )
diff --git a/go.sum b/go.sum
index 17f272c..0a1b227 100644
--- a/go.sum
+++ b/go.sum
@@ -16,8 +16,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-github.com/mdosch/go-xmpp v0.0.2-0.20231106191933-6fd0e544bf21 h1:Y1XnR0fRNxbsnVQzEAeHwJAfV0xx8zFwklA+NjcpBxc=
-github.com/mdosch/go-xmpp v0.0.2-0.20231106191933-6fd0e544bf21/go.mod h1:WfXW1cCXjSvg8Le5XQc6r+ONLXjHoKyUgTucb4jfaAU=
+github.com/mattn/go-xmpp v0.0.2-0.20231111120817-4c385a334c60 h1:qvN3e3Xygc3XJ7duKNd1Cj3Z4RsWnGW64AJEqMAxFP4=
+github.com/mattn/go-xmpp v0.0.2-0.20231111120817-4c385a334c60/go.mod h1:HBSVZzomYzxh5UNQq6sXImCsgh01O55Pvb6fopW/u74=
 github.com/pborman/getopt/v2 v2.1.0 h1:eNfR+r+dWLdWmV8g5OlpyrTYHkhVNxHBdN2cCrJmOEA=
 github.com/pborman/getopt/v2 v2.1.0/go.mod h1:4NtW75ny4eBw9fO1bhtNdYTlZKYX5/tBLtsOpwKIKd0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
diff --git a/httpupload.go b/httpupload.go
index eb46634..af0761b 100644
--- a/httpupload.go
+++ b/httpupload.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/beevik/etree"            // BSD-2-clause
 	"github.com/gabriel-vasile/mimetype" // MIT License
-	"github.com/mdosch/go-xmpp"          // BSD-3-Clause
+	"github.com/mattn/go-xmpp"          // BSD-3-Clause
 )
 
 func httpUpload(client *xmpp.Client, iqc chan xmpp.IQ, jserver string, filePath string) string {
diff --git a/main.go b/main.go
index 928ec34..08b02fc 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto" // MIT License
-	"github.com/mdosch/go-xmpp"                // BSD-3-Clause
+	"github.com/mattn/go-xmpp"                // BSD-3-Clause
 	"github.com/pborman/getopt/v2"             // BSD-3-Clause
 )
 
diff --git a/ox.go b/ox.go
index 170d161..22df6e8 100644
--- a/ox.go
+++ b/ox.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto" // MIT License
 	"github.com/beevik/etree"                  // BSD-2-clause
-	"github.com/mdosch/go-xmpp"                // BSD-3-Clause
+	"github.com/mattn/go-xmpp"                // BSD-3-Clause
 )
 
 func oxDeleteNodes(jid string, client *xmpp.Client, iqc chan xmpp.IQ) error {
diff --git a/stanzahandling.go b/stanzahandling.go
index 8f60e63..35858b0 100644
--- a/stanzahandling.go
+++ b/stanzahandling.go
@@ -11,7 +11,7 @@ import (
 	"runtime"
 
 	"github.com/beevik/etree"   // BSD-2-clause
-	"github.com/mdosch/go-xmpp" // BSD-3-Clause
+	"github.com/mattn/go-xmpp" // BSD-3-Clause
 )
 
 func sendIQ(client *xmpp.Client, iqc chan xmpp.IQ, target string, iQtype string, content string) (xmpp.IQ, error) {