From 8e005ee8aba7c12810825f6b8c1aacd9b5ac150d Mon Sep 17 00:00:00 2001
From: Daniel McIlvaney <damcilva@microsoft.com>
Date: Mon, 28 Sep 2020 14:23:48 -0700
Subject: [PATCH 1/2] Nopatch groff CVE-2000-0803

Signed-off-by: Daniel McIlvaney <damcilva@microsoft.com>
---
 SPECS/groff/CVE-2000-0803.nopatch |  1 +
 SPECS/groff/groff.spec            | 60 +++++++++++++++++--------------
 2 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 SPECS/groff/CVE-2000-0803.nopatch

diff --git a/SPECS/groff/CVE-2000-0803.nopatch b/SPECS/groff/CVE-2000-0803.nopatch
new file mode 100644
index 00000000000..7f4a0896c7b
--- /dev/null
+++ b/SPECS/groff/CVE-2000-0803.nopatch
@@ -0,0 +1 @@
+# No patch has been made available for CVE-2000-0803
\ No newline at end of file
diff --git a/SPECS/groff/groff.spec b/SPECS/groff/groff.spec
index 895f04cf74f..bc16b84ae95 100644
--- a/SPECS/groff/groff.spec
+++ b/SPECS/groff/groff.spec
@@ -1,23 +1,27 @@
-Summary:	Programs for processing and formatting text
-Name:		groff
-Version:	1.22.3
-Release:        4%{?dist}
-License:	GPLv3+
-URL:		http://www.gnu.org/software/groff
-Group:		Applications/Text
+Summary:        Programs for processing and formatting text
+Name:           groff
+Version:        1.22.3
+Release:        5%{?dist}
+License:        GPLv3+
+URL:            http://www.gnu.org/software/groff
+Group:          Applications/Text
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-Source0:	http://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz
-%define sha1 groff=61a6808ea1ef715df9fa8e9b424e1f6b9fa8c091
-Provides:	perl(oop_fh.pl)
-Provides:	perl(main_subs.pl)
-Provides:   perl(man.pl)
-Provides:   perl(subs.pl)
-Requires: perl
-Requires: perl-DBI
-Requires: perl-DBIx-Simple
-Requires: perl-DBD-SQLite
-Requires: perl-File-HomeDir
+Source0:        http://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz
+# No patch has been made available for CVE-2000-0803
+Patch0:         CVE-2000-0803.nopatch
+
+Provides:       perl(oop_fh.pl)
+Provides:       perl(main_subs.pl)
+Provides:       perl(man.pl)
+Provides:       perl(subs.pl)
+
+Requires:       perl
+Requires:       perl-DBI
+Requires:       perl-DBIx-Simple
+Requires:       perl-DBD-SQLite
+Requires:       perl-File-HomeDir
+
 %description
 The Groff package contains programs for processing
 and formatting text.
@@ -25,8 +29,8 @@ and formatting text.
 %setup -q
 %build
 PAGE=letter ./configure \
-	--prefix=%{_prefix} \
-	--with-grofferdir=%{_datadir}/%{name}/%{version}/groffer
+    --prefix=%{_prefix} \
+    --with-grofferdir=%{_datadir}/%{name}/%{version}/groffer
 make
 %install
 install -vdm 755 %{_defaultdocdir}/%{name}-1.22/pdf
@@ -42,15 +46,17 @@ rm -rf %{buildroot}%{_infodir}
 %{_defaultdocdir}/%{name}-%{version}/*
 %{_datarootdir}/%{name}/*
 %{_mandir}/*/*
-%changelog
-* Sat May 09 00:21:28 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.22.3-4
-- Added %%license line automatically
 
+%changelog
+*   Mon Sep 28 2020 Daniel McIlvaney <damcilva@microsoft.com> - 1.22.3-5
+-   Nopatch CVE-2000-0803.nopatch
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.22.3-4
+-   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.22.3-3
 -   Initial CBL-Mariner import from Photon (license: Apache2).
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.22.3-2
--	GA - Bump release of all rpms
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.22.3-2
+-   GA - Bump release of all rpms
 *   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 1.22.3-1
 -   Updated to version 1.22.3
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.22.2-1
--	Initial build. First version
+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.22.2-1
+-   Initial build. First version

From 03a63c35cc1d8c151c0cb7ccb85b6e5ec0f85719 Mon Sep 17 00:00:00 2001
From: Daniel McIlvaney <damcilva@microsoft.com>
Date: Tue, 29 Sep 2020 13:14:34 -0700
Subject: [PATCH 2/2] Address feedback

---
 SPECS/groff/groff.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SPECS/groff/groff.spec b/SPECS/groff/groff.spec
index bc16b84ae95..ec9f85da589 100644
--- a/SPECS/groff/groff.spec
+++ b/SPECS/groff/groff.spec
@@ -48,9 +48,9 @@ rm -rf %{buildroot}%{_infodir}
 %{_mandir}/*/*
 
 %changelog
-*   Mon Sep 28 2020 Daniel McIlvaney <damcilva@microsoft.com> - 1.22.3-5
+*   Mon Sep 28 2020 Daniel McIlvaney <damcilva@microsoft.com> 1.22.3-5
 -   Nopatch CVE-2000-0803.nopatch
-*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.22.3-4
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.22.3-4
 -   Added %%license line automatically
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.22.3-3
 -   Initial CBL-Mariner import from Photon (license: Apache2).