From c29b6d72045f92c10abf0660c2c4551f99eedea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= <opohorel@redhat.com>
Date: Thu, 28 Nov 2024 14:36:57 +0100
Subject: [PATCH] Update to 3.6.0

Resolves: RHEL-63968, RHEL-61045, RHEL-47219, RHEL-43318, RHEL-35936, RHEL-2791
---
 .gitignore   |  1 +
 git-lfs.spec | 23 ++++++++++++++---------
 sources      |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e138e94..07622cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /git-lfs-v3.3.0.tar.gz
 /git-lfs-v3.2.0.tar.gz
 /git-lfs-v3.4.1.tar.gz
+/git-lfs-v3.6.0.tar.gz
diff --git a/git-lfs.spec b/git-lfs.spec
index 439b424..2c8a8c7 100644
--- a/git-lfs.spec
+++ b/git-lfs.spec
@@ -1,15 +1,15 @@
 %bcond_without check
 
 # https://github.com/git-lfs/git-lfs
-%global goipath         github.com/git-lfs/git-lfs
-Version:                3.4.1
+%global goipath         github.com/git-lfs/git-lfs/v3
+Version:                3.6.0
 
 %gometa
 
 %global gobuilddir %{_builddir}/%{name}-%{version}/_build
 
 Name:           git-lfs
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Git extension for versioning large files
 
 License:        MIT
@@ -29,31 +29,32 @@ Provides:       bundled(golang(github.com/git-lfs/go-netrc)) = f0c862d
 Provides:       bundled(golang(github.com/git-lfs/pktline)) = 06e9096
 Provides:       bundled(golang(github.com/git-lfs/wildmatch/v2)) = 2.0.1
 Provides:       bundled(golang(github.com/hashicorp/go-uuid)) = 1.0.2
-Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.0.1
+Provides:       bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0
 Provides:       bundled(golang(github.com/jcmturner/aescts/v2)) = 2.0.0
 Provides:       bundled(golang(github.com/jcmturner/dnsutils/v2)) = 2.0.0
 Provides:       bundled(golang(github.com/jcmturner/gofork)) = 1.0.0
 Provides:       bundled(golang(github.com/jcmturner/goidentity/v6)) = 6.0.1
 Provides:       bundled(golang(github.com/jcmturner/gokrb5/v8)) = 8.4.2
 Provides:       bundled(golang(github.com/jcmturner/rpc/v2)) = 2.0.3
+Provides:       bundled(golang(github.com/jmhodges/clock)) = 1.2.0
 Provides:       bundled(golang(github.com/leonelquinteros/gotext)) = 1.5.0
 Provides:       bundled(golang(github.com/mattn/go-isatty)) = 0.0.4
 Provides:       bundled(golang(github.com/olekukonko/ts)) = 78ecb04
 Provides:       bundled(golang(github.com/pkg/errors)) = c605e28
 Provides:       bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
 Provides:       bundled(golang(github.com/rubyist/tracerx)) = 7879593
-Provides:       bundled(golang(github.com/spf13/cobra)) = 1.6.0
+Provides:       bundled(golang(github.com/spf13/cobra)) = 1.7.0
 Provides:       bundled(golang(github.com/spf13/pflag)) = 1.0.5
 Provides:       bundled(golang(github.com/ssgelm/cookiejarparser)) = 1.0.1
 Provides:       bundled(golang(github.com/stretchr/testify)) = 1.6.1
 Provides:       bundled(golang(github.com/xeipuuv/gojsonpointer)) = 4e3ac27
 Provides:       bundled(golang(github.com/xeipuuv/gojsonreference)) = bd5ef7b
 Provides:       bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3f
-Provides:       bundled(golang(golang.org/x/crypto)) = 7b82a4e
-Provides:       bundled(golang(golang.org/x/net)) = 0.7.0
+Provides:       bundled(golang(golang.org/x/crypto)) = 0.21.0
+Provides:       bundled(golang(golang.org/x/net)) = 0.23.0
 Provides:       bundled(golang(golang.org/x/sync)) = 0.1.0
-Provides:       bundled(golang(golang.org/x/sys)) = 0.5.0
-Provides:       bundled(golang(golang.org/x/text)) = 0.7.0
+Provides:       bundled(golang(golang.org/x/sys)) = 0.18.0
+Provides:       bundled(golang(golang.org/x/text)) = 0.14.0
 Provides:       bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 
 
@@ -155,6 +156,10 @@ PATH=%{buildroot}%{_bindir}:%{gobuilddir}/bin:$PATH \
 
 
 %changelog
+* Thu Nov 28 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.6.0-1
+- Update to 3.6.0
+- Resolves: RHEL-63968, RHEL-61045, RHEL-47219, RHEL-43318, RHEL-35936, RHEL-2791
+
 * Wed Aug 07 2024 Ondřej Pohořelský <opohorel@redhat.com> - 3.4.1-3
 - Make Git-LFS FIPS compliant
 - Resolves: RHEL-53086
diff --git a/sources b/sources
index f7a88f1..8f33d0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-lfs-v3.4.1.tar.gz) = 1c19b1ba683062c7c71d80b648afd218fbb87320ed88d1cba06195fa3ea1bb38f44c14b99a541ffbf6e4d52c8ebca05c1accd693d1079de76cacd0f23f5aee3a
+SHA512 (git-lfs-v3.6.0.tar.gz) = 777d36592e4ed5a078373007621894bde4377f3d7876c54f05f6488203bff547b57a0ba3d3a94cfcf3c82e6ffdebe2dde51481b529030f58aeb76ee4b18912c8