From 261c0c027df1e5b8233ba5649a4a0c821c10ff43 Mon Sep 17 00:00:00 2001
From: jkoberg <jkoberg@owncloud.com>
Date: Wed, 26 Jun 2024 12:58:01 +0200
Subject: [PATCH] feat(reva): bump reva

Signed-off-by: jkoberg <jkoberg@owncloud.com>
---
 changelog/unreleased/bump-reva.md                        | 5 +++++
 go.mod                                                   | 2 +-
 go.sum                                                   | 4 ++--
 .../v2/pkg/storage/utils/decomposedfs/decomposedfs.go    | 9 +++++----
 .../v2/pkg/storage/utils/decomposedfs/options/options.go | 2 ++
 vendor/modules.txt                                       | 2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 changelog/unreleased/bump-reva.md

diff --git a/changelog/unreleased/bump-reva.md b/changelog/unreleased/bump-reva.md
new file mode 100644
index 00000000000..a6e0d2ea2f7
--- /dev/null
+++ b/changelog/unreleased/bump-reva.md
@@ -0,0 +1,5 @@
+Enhancement: Bump reva
+
+bumps reva version
+
+https://github.com/owncloud/ocis/pull/9473
diff --git a/go.mod b/go.mod
index d89992bc9a4..da886540922 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/coreos/go-oidc/v3 v3.10.0
 	github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
-	github.com/cs3org/reva/v2 v2.20.1-0.20240625085350-9351da5ba08f
+	github.com/cs3org/reva/v2 v2.20.1-0.20240626105341-178ea2306cde
 	github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e
 	github.com/egirna/icap-client v0.1.1
diff --git a/go.sum b/go.sum
index 82833e739e5..7830d4dc3fe 100644
--- a/go.sum
+++ b/go.sum
@@ -1024,8 +1024,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
 github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.20.1-0.20240625085350-9351da5ba08f h1:5oA/uUdun3s5t6l85ZzgaNwTJnLGd0qeU0By8PEKw/s=
-github.com/cs3org/reva/v2 v2.20.1-0.20240625085350-9351da5ba08f/go.mod h1:Rb2XnhpGKnH7k6WBFZlMygbyBxW6ma09Z4Uk+ro0v+A=
+github.com/cs3org/reva/v2 v2.20.1-0.20240626105341-178ea2306cde h1:N9LYCUnWBAxzI8hPymSG2VHN6MBxqCTuwNbaODAuvCk=
+github.com/cs3org/reva/v2 v2.20.1-0.20240626105341-178ea2306cde/go.mod h1:Rb2XnhpGKnH7k6WBFZlMygbyBxW6ma09Z4Uk+ro0v+A=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
diff --git a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/decomposedfs.go b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/decomposedfs.go
index fd8e9696d18..8b53a82d3b5 100644
--- a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/decomposedfs.go
+++ b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/decomposedfs.go
@@ -157,10 +157,11 @@ func NewDefault(m map[string]interface{}, bs tree.Blobstore, es events.Stream) (
 	}
 
 	aspects := aspects.Aspects{
-		Lookup:      lu,
-		Tree:        tp,
-		Permissions: permissions.NewPermissions(node.NewPermissions(lu), permissionsSelector),
-		EventStream: es,
+		Lookup:            lu,
+		Tree:              tp,
+		Permissions:       permissions.NewPermissions(node.NewPermissions(lu), permissionsSelector),
+		EventStream:       es,
+		DisableVersioning: o.DisableVersioning,
 	}
 
 	return New(o, aspects)
diff --git a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options/options.go b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options/options.go
index e68bd73d066..61355c935e4 100644
--- a/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options/options.go
+++ b/vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options/options.go
@@ -90,6 +90,8 @@ type Options struct {
 	MaxConcurrency          int `mapstructure:"max_concurrency"`
 
 	MaxQuota uint64 `mapstructure:"max_quota"`
+
+	DisableVersioning bool `mapstructure:"disable_versioning"`
 }
 
 // AsyncPropagatorOptions holds the configuration for the async propagator
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0bb531b1a8c..1e144e738c2 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -366,7 +366,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
 github.com/cs3org/go-cs3apis/cs3/types/v1beta1
-# github.com/cs3org/reva/v2 v2.20.1-0.20240625085350-9351da5ba08f
+# github.com/cs3org/reva/v2 v2.20.1-0.20240626105341-178ea2306cde
 ## explicit; go 1.21
 github.com/cs3org/reva/v2/cmd/revad/internal/grace
 github.com/cs3org/reva/v2/cmd/revad/runtime