From 8c61e0d6ab1859f396d90573f3e2a9ff08a4db1e Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Mon, 27 Apr 2020 00:13:35 +0200
Subject: [PATCH] lib/config: Sort versioning options on marshal (fixes #6576)
 (#6577)

---
 lib/config/versioningconfiguration.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/config/versioningconfiguration.go b/lib/config/versioningconfiguration.go
index c63c7ae15..b9922ca32 100644
--- a/lib/config/versioningconfiguration.go
+++ b/lib/config/versioningconfiguration.go
@@ -6,7 +6,10 @@
 
 package config
 
-import "encoding/xml"
+import (
+	"encoding/xml"
+	"sort"
+)
 
 type VersioningConfiguration struct {
 	Type   string            `xml:"type,attr" json:"type"`
@@ -38,6 +41,9 @@ func (c *VersioningConfiguration) MarshalXML(e *xml.Encoder, start xml.StartElem
 	for k, v := range c.Params {
 		tmp.Params = append(tmp.Params, InternalParam{k, v})
 	}
+	sort.Slice(tmp.Params, func(a, b int) bool {
+		return tmp.Params[a].Key < tmp.Params[b].Key
+	})
 
 	return e.EncodeElement(tmp, start)