From 47f70283f276e03391e32dd88cd179bbeae852c7 Mon Sep 17 00:00:00 2001
From: Pascal Bleser <p.bleser@opencloud.eu>
Date: Thu, 23 Apr 2026 14:22:39 +0200
Subject: [PATCH] groupware: fixes after rebasing and Docker library API
 changes

---
 pkg/jmap/integration_email_test.go | 2 +-
 pkg/jmap/integration_test.go       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/jmap/integration_email_test.go b/pkg/jmap/integration_email_test.go
index b1d1149169..cc93cb613e 100644
--- a/pkg/jmap/integration_email_test.go
+++ b/pkg/jmap/integration_email_test.go
@@ -509,7 +509,7 @@ func (s *StalwartTest) fillEmailsWithImap(folder string, count int, empty bool,
 
 	tlsConfig := &tls.Config{InsecureSkipVerify: true}
 
-	c, err := imapclient.DialTLS(net.JoinHostPort(s.ip, strconv.Itoa(s.imapPort)), &imapclient.Options{TLSConfig: tlsConfig})
+	c, err := imapclient.DialTLS(net.JoinHostPort(s.ip, strconv.FormatUint(uint64(s.imapPort), 10)), &imapclient.Options{TLSConfig: tlsConfig})
 	if err != nil {
 		return nil, 0, err
 	}
diff --git a/pkg/jmap/integration_test.go b/pkg/jmap/integration_test.go
index 4cb647e042..9c2be773ee 100644
--- a/pkg/jmap/integration_test.go
+++ b/pkg/jmap/integration_test.go
@@ -152,7 +152,7 @@ func skip(t *testing.T) bool {
 type StalwartTest struct {
 	t           *testing.T
 	ip          string
-	imapPort    int
+	imapPort    uint16
 	container   *testcontainers.DockerContainer
 	ctx         context.Context
 	cancelCtx   context.CancelFunc
@@ -339,7 +339,7 @@ func newStalwartTest(t *testing.T, options ...func(map[string]any)) (*StalwartTe
 				Env:   os.Environ(),
 				Files: []*os.File{os.Stdin, os.Stdout, os.Stderr},
 			}
-			cmd := []string{Wireshark, "-pkSl", "-i", "lo", "-f", fmt.Sprintf("port %d", jmapPort.Int()), "-Y", "http||websocket"}
+			cmd := []string{Wireshark, "-pkSl", "-i", "lo", "-f", fmt.Sprintf("port %d", jmapPort.Num()), "-Y", "http||websocket"}
 			process, err := os.StartProcess(Wireshark, cmd, &attr)
 			require.NoError(t, err)
 			err = process.Release()
@@ -376,7 +376,7 @@ func newStalwartTest(t *testing.T, options ...func(map[string]any)) (*StalwartTe
 		apiPort, err := container.MappedPort(ctx, httpPort)
 		require.NoError(t, err)
 
-		url := fmt.Sprintf("http://%s:%d/api/principal", ip, apiPort.Int())
+		url := fmt.Sprintf("http://%s:%d/api/principal", ip, apiPort.Num())
 
 		for _, domain := range domains {
 			fmt.Printf("Creating domain '%v'\n", domain)
@@ -485,7 +485,7 @@ func newStalwartTest(t *testing.T, options ...func(map[string]any)) (*StalwartTe
 	return &StalwartTest{
 		t:           t,
 		ip:          ip,
-		imapPort:    imapPort.Int(),
+		imapPort:    imapPort.Num(),
 		container:   container,
 		ctx:         ctx,
 		cancelCtx:   cancel,