From 644f359b3c65b32220391d7686ef878399ae736f Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Thu, 31 Mar 2022 10:34:50 -0500
Subject: [PATCH 1/2] Update to upstream 2.5.6 bug fix release

---
 sources    | 2 +-
 vgrep.spec | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index bdbe8a5..3e1a2b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vgrep-2.5.1.tar.gz) = 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
+SHA512 (vgrep-2.5.6.tar.gz) = f4dca56f4cd87b92ecc95152fde38e85348283ca91015cef4b07a0d1279386daa58e7300a73f9ea9116026c41490cdfea748d9ded3dc5f808ba5abdbbe0a5a0b
diff --git a/vgrep.spec b/vgrep.spec
index 3404b7b..9890b61 100644
--- a/vgrep.spec
+++ b/vgrep.spec
@@ -1,6 +1,6 @@
 # https://github.com/vrothberg/vgrep
 %global goipath         github.com/vrothberg/vgrep
-Version:                2.5.1
+Version:                2.5.6
 
 %gometa
 
@@ -17,17 +17,19 @@ directory trees or showing the context lines before and after the matches.}
 %bcond_without check
 
 Name:           vgrep
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        User-friendly pager for grep
 License:        GPLv3
 URL:            %{gourl}
 Source0:        %{gosource}
 
 BuildRequires:  golang(github.com/jessevdk/go-flags)
+BuildRequires:  golang(github.com/json-iterator/go)
 BuildRequires:  golang(github.com/mattn/go-shellwords)
 BuildRequires:  golang(github.com/nightlyone/lockfile)
 BuildRequires:  golang(github.com/peterh/liner)
 BuildRequires:  golang(github.com/sirupsen/logrus)
+BuildRequires:  golang(golang.org/x/term)
 
 BuildRequires:  go-md2man
 
@@ -63,6 +65,9 @@ install -D -p -m 0644 docs/vgrep.1 %{buildroot}%{_mandir}/man1/vgrep.1
 %gopkgfiles
 
 %changelog
+* Thu Mar 31 2022 Carl George <carl@george.computer> - 2.5.6-1
+- Update to upstream 2.5.6 bug fix release
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 3be1412ee6193e76b06f40c3519ca7c3b3f5693c Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Fri, 8 Jul 2022 19:25:21 -0500
Subject: [PATCH 2/2] Rebuild for CVE-2022-{24675,28327,29526} in golang

---
 vgrep.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vgrep.spec b/vgrep.spec
index 9890b61..3433091 100644
--- a/vgrep.spec
+++ b/vgrep.spec
@@ -17,7 +17,7 @@ directory trees or showing the context lines before and after the matches.}
 %bcond_without check
 
 Name:           vgrep
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User-friendly pager for grep
 License:        GPLv3
 URL:            %{gourl}
@@ -65,6 +65,9 @@ install -D -p -m 0644 docs/vgrep.1 %{buildroot}%{_mandir}/man1/vgrep.1
 %gopkgfiles
 
 %changelog
+* Sat Jul 09 2022 Maxwell G <gotmax@e.email> - 2.5.6-2
+- Rebuild for CVE-2022-{24675,28327,29526} in golang
+
 * Thu Mar 31 2022 Carl George <carl@george.computer> - 2.5.6-1
 - Update to upstream 2.5.6 bug fix release