From be5bcc5fc498997c6baaaf9c81dbab376ae5e23f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:10:19 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- unrtf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrtf.spec b/unrtf.spec index d2f048d..bc22c93 100644 --- a/unrtf.spec +++ b/unrtf.spec @@ -1,7 +1,7 @@ Name: unrtf Summary: RTF (Rich Text Format) to other formats converter Version: 0.21.9 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv3+ URL: https://www.gnu.org/software/unrtf/unrtf.html @@ -52,6 +52,9 @@ make check %{_datadir}/%{name}/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.21.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.21.9-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e9a2b8218ef9b916ee0890387fd160287362742f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:10:18 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- unrtf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrtf.spec b/unrtf.spec index bc22c93..167b2fb 100644 --- a/unrtf.spec +++ b/unrtf.spec @@ -1,7 +1,7 @@ Name: unrtf Summary: RTF (Rich Text Format) to other formats converter Version: 0.21.9 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv3+ URL: https://www.gnu.org/software/unrtf/unrtf.html @@ -52,6 +52,9 @@ make check %{_datadir}/%{name}/ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.21.9-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.21.9-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From adcad34f05a2ce432cad5bb81e206681abe90a67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:19:25 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- unrtf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrtf.spec b/unrtf.spec index 167b2fb..07da493 100644 --- a/unrtf.spec +++ b/unrtf.spec @@ -1,7 +1,7 @@ Name: unrtf Summary: RTF (Rich Text Format) to other formats converter Version: 0.21.9 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv3+ URL: https://www.gnu.org/software/unrtf/unrtf.html @@ -52,6 +52,9 @@ make check %{_datadir}/%{name}/ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.21.9-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.21.9-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a709167add58d742520cd74fda6bdf3e0b414694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:29:36 +0200 Subject: [PATCH 04/10] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- unrtf.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/unrtf.spec b/unrtf.spec index 07da493..4f046fd 100644 --- a/unrtf.spec +++ b/unrtf.spec @@ -1,9 +1,10 @@ Name: unrtf Summary: RTF (Rich Text Format) to other formats converter Version: 0.21.9 -Release: 21%{?dist} +Release: 22%{?dist} -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: https://www.gnu.org/software/unrtf/unrtf.html Source0: ftp://ftp.gnu.org/gnu/unrtf/unrtf-%{version}.tar.gz @@ -52,6 +53,9 @@ make check %{_datadir}/%{name}/ %changelog +* Thu Jul 25 2024 Miroslav Suchý - 0.21.9-22 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.21.9-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 295f8bcef54b9dc7019995d3e8ceececeef67e09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:49:39 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- unrtf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrtf.spec b/unrtf.spec index 4f046fd..777bb44 100644 --- a/unrtf.spec +++ b/unrtf.spec @@ -1,7 +1,7 @@ Name: unrtf Summary: RTF (Rich Text Format) to other formats converter Version: 0.21.9 -Release: 22%{?dist} +Release: 23%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -53,6 +53,9 @@ make check %{_datadir}/%{name}/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.21.9-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 0.21.9-22 - convert license to SPDX From c2e2e812cab09f33427ade34a77c5a3fd10dbb79 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 24 Mar 2025 02:39:50 +0100 Subject: [PATCH 06/10] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++ unrtf.spec | 157 +---------------------------------------------------- 2 files changed, 155 insertions(+), 155 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..711ce97 --- /dev/null +++ b/changelog @@ -0,0 +1,153 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 0.21.9-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 0.21.9-22 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 0.21.9-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.21.9-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.21.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.21.9-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.21.9-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.21.9-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.21.9-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.21.9-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.21.9-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.21.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.21.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.21.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.21.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 08 2018 Ken Dreyer - 0.21.9-8 +- Switch to %%autosetup +- Patch for CVE-2016-10091 + +* Fri Feb 09 2018 Fedora Release Engineering - 0.21.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.21.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.21.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.21.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0.21.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.21.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jan 02 2015 Ken Dreyer - 0.21.9-1 +- Upstream release 0.21.9 (RHBZ #1176987) +- Regenerate the automake/autoconf bits with ./bootstrap in order to eliminate + the dependency on the automake-1.13 path. + +* Wed Dec 17 2014 Ken Dreyer - 0.21.7-1 +- Upstream release 0.21.7 (RHBZ #1175241) + +* Wed Dec 10 2014 Ken Dreyer - 0.21.6-2 +- Drop NEWS file (upstream didn't ship this in 0.21.6) + +* Wed Dec 10 2014 Ken Dreyer - 0.21.6-1 +- Upstream release 0.21.6 (RHBZ #1172664) + +* Mon Aug 18 2014 Fedora Release Engineering - 0.21.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.21.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun May 18 2014 Rahul Sundaram - 0.21.5-2 +- don't alter conf file location (rhbz#1060513) + +* Mon Apr 07 2014 Ken Dreyer - 0.21.5-1 +- Upstream release 0.21.5 (RHBZ #979619) +- Update URL for HTTPS +- Enable tests in %%check + +* Sun Aug 04 2013 Fedora Release Engineering - 0.21.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jun 20 2013 Rahul Sundaram - 0.21.4-1 +- upstream release 0.21.4 + +* Thu Jan 24 2013 Rahul Sundaram - 0.21.2-1 +- upstream release 0.21.2 + +* Sun Jul 22 2012 Fedora Release Engineering - 0.21.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.21.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0.21.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jun 07 2010 Rahul Sundaram - 0.21.1-1 +- Bump up to the latest release +- Drop patches +- Update description +- License has changed from GPLv2+ to GPLv3+ +- Update spec to match latest guidelines + +* Sun Jul 26 2009 Fedora Release Engineering - 0.20.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.20.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 18 2008 Fedora Release Engineering - 0.20.2-4 +- Autorebuild for GCC 4.3 + +* Sun Aug 26 2007 Aurelien Bompard 0.20.2-3 +- fix license tag +- rebuild for BuildID + +* Sat Mar 03 2007 Aurelien Bompard 0.20.2-2 +- add patches from bugs 225188 and 225184 + +* Fri Sep 08 2006 Aurelien Bompard 0.20.2-1 +- version 0.20.2 + +* Tue Feb 21 2006 Aurelien Bompard 0.19.9-1 +- version 0.19.9 + +* Sun May 22 2005 Jeremy Katz - 0.19.3-4 +- rebuild on all arches + +* Wed Apr 6 2005 Michael Schwendt +- rebuilt + +* Thu Nov 11 2004 Michael Schwendt 0.19.3-0.fdr.2 +- Build with rpm opt flags. + +* Thu May 13 2004 Aurelien Bompard 0:0.19.3-0.fdr.1 +- initial Fedora RPM (from Mandrake) diff --git a/unrtf.spec b/unrtf.spec index 777bb44..8453360 100644 --- a/unrtf.spec +++ b/unrtf.spec @@ -1,7 +1,7 @@ Name: unrtf Summary: RTF (Rich Text Format) to other formats converter Version: 0.21.9 -Release: 23%{?dist} +Release: %autorelease # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later @@ -53,157 +53,4 @@ make check %{_datadir}/%{name}/ %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 0.21.9-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 0.21.9-22 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 0.21.9-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.21.9-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.21.9-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.21.9-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.21.9-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.21.9-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.21.9-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.21.9-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.21.9-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.21.9-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.21.9-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.21.9-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.21.9-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 08 2018 Ken Dreyer - 0.21.9-8 -- Switch to %%autosetup -- Patch for CVE-2016-10091 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.21.9-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.21.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.21.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.21.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.21.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.21.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jan 02 2015 Ken Dreyer - 0.21.9-1 -- Upstream release 0.21.9 (RHBZ #1176987) -- Regenerate the automake/autoconf bits with ./bootstrap in order to eliminate - the dependency on the automake-1.13 path. - -* Wed Dec 17 2014 Ken Dreyer - 0.21.7-1 -- Upstream release 0.21.7 (RHBZ #1175241) - -* Wed Dec 10 2014 Ken Dreyer - 0.21.6-2 -- Drop NEWS file (upstream didn't ship this in 0.21.6) - -* Wed Dec 10 2014 Ken Dreyer - 0.21.6-1 -- Upstream release 0.21.6 (RHBZ #1172664) - -* Mon Aug 18 2014 Fedora Release Engineering - 0.21.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.21.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun May 18 2014 Rahul Sundaram - 0.21.5-2 -- don't alter conf file location (rhbz#1060513) - -* Mon Apr 07 2014 Ken Dreyer - 0.21.5-1 -- Upstream release 0.21.5 (RHBZ #979619) -- Update URL for HTTPS -- Enable tests in %%check - -* Sun Aug 04 2013 Fedora Release Engineering - 0.21.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jun 20 2013 Rahul Sundaram - 0.21.4-1 -- upstream release 0.21.4 - -* Thu Jan 24 2013 Rahul Sundaram - 0.21.2-1 -- upstream release 0.21.2 - -* Sun Jul 22 2012 Fedora Release Engineering - 0.21.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.21.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.21.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jun 07 2010 Rahul Sundaram - 0.21.1-1 -- Bump up to the latest release -- Drop patches -- Update description -- License has changed from GPLv2+ to GPLv3+ -- Update spec to match latest guidelines - -* Sun Jul 26 2009 Fedora Release Engineering - 0.20.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.20.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 18 2008 Fedora Release Engineering - 0.20.2-4 -- Autorebuild for GCC 4.3 - -* Sun Aug 26 2007 Aurelien Bompard 0.20.2-3 -- fix license tag -- rebuild for BuildID - -* Sat Mar 03 2007 Aurelien Bompard 0.20.2-2 -- add patches from bugs 225188 and 225184 - -* Fri Sep 08 2006 Aurelien Bompard 0.20.2-1 -- version 0.20.2 - -* Tue Feb 21 2006 Aurelien Bompard 0.19.9-1 -- version 0.19.9 - -* Sun May 22 2005 Jeremy Katz - 0.19.3-4 -- rebuild on all arches - -* Wed Apr 6 2005 Michael Schwendt -- rebuilt - -* Thu Nov 11 2004 Michael Schwendt 0.19.3-0.fdr.2 -- Build with rpm opt flags. - -* Thu May 13 2004 Aurelien Bompard 0:0.19.3-0.fdr.1 -- initial Fedora RPM (from Mandrake) - +%autochangelog From ef70a7e73cbc9383d41faca7c12fee1821b87084 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 24 Mar 2025 02:54:34 +0100 Subject: [PATCH 07/10] Upstream release 0.21.10 Signed-off-by: Peter Lemenkov --- .gitignore | 7 +- 0001-Adjust-malloc-types.patch | 26 +++ ...ances-of-sprintf-with-snprintf-and-a.patch | 203 ------------------ 46EA854F5FC5F5A0A9D2BFE89175BF0B3EC83090.gpg | Bin 0 -> 1166 bytes sources | 3 +- unrtf.spec | 40 ++-- 6 files changed, 49 insertions(+), 230 deletions(-) create mode 100644 0001-Adjust-malloc-types.patch delete mode 100644 0001-Replace-all-instances-of-sprintf-with-snprintf-and-a.patch create mode 100644 46EA854F5FC5F5A0A9D2BFE89175BF0B3EC83090.gpg diff --git a/.gitignore b/.gitignore index ec5db1d..9c5bb0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ -/unrtf-0.21.4.tar.gz -/unrtf-0.21.5.tar.gz -/unrtf-0.21.6.tar.gz -/unrtf-0.21.7.tar.gz -/unrtf-0.21.9.tar.gz +/unrtf-*.*.*.tar.gz +/unrtf-*.*.*.tar.gz.sig diff --git a/0001-Adjust-malloc-types.patch b/0001-Adjust-malloc-types.patch new file mode 100644 index 0000000..15b67cf --- /dev/null +++ b/0001-Adjust-malloc-types.patch @@ -0,0 +1,26 @@ +From: Peter Lemenkov +Date: Mon, 24 Mar 2025 09:17:05 +0100 +Subject: [PATCH] Adjust malloc types + +Signed-off-by: Peter Lemenkov + +diff --git a/src/malloc.c b/src/malloc.c +index 1bca97a..c506e69 100644 +--- a/src/malloc.c ++++ b/src/malloc.c +@@ -165,7 +165,7 @@ my_strdup(char *src) + #include + #undef malloc + +-void *malloc(); ++void *malloc(size_t); + + /* Allocate an N-byte block of memory from the heap. + If N is zero, allocate a 1-byte block. */ +@@ -179,4 +179,4 @@ rpl_malloc(size_t n) + } + return malloc(n); + } +-#endif +\ No newline at end of file ++#endif diff --git a/0001-Replace-all-instances-of-sprintf-with-snprintf-and-a.patch b/0001-Replace-all-instances-of-sprintf-with-snprintf-and-a.patch deleted file mode 100644 index 10d4bb2..0000000 --- a/0001-Replace-all-instances-of-sprintf-with-snprintf-and-a.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 0f8c89a42fd87ca8c17660c50f114a5f68a1e21e Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes -Date: Fri, 8 Jun 2018 13:48:40 -0600 -Subject: [PATCH] Replace all instances of sprintf with snprintf and adjust - size of integer field in some cases - -Rebased on 0.21.9 by Ken Dreyer - -Resolves: CVE-2016-10091 ---- - src/attr.c | 4 ++-- - src/convert.c | 44 ++++++++++++++++++++++---------------------- - src/output.c | 4 ++-- - 3 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/src/attr.c b/src/attr.c -index 02b5c81..e2951ea 100644 ---- a/src/attr.c -+++ b/src/attr.c -@@ -746,7 +746,7 @@ char * - assemble_string(char *string, int nr) - { - -- char *s, tmp[12];/* Number of characters that can be in int type (including '\0') - AF */ -+ char *s, tmp[20]; - int i = 0, j = 0; - - if (string == NULL) -@@ -762,7 +762,7 @@ assemble_string(char *string, int nr) - } - - if (string[i] != '\0') { -- sprintf(tmp, "%d", nr); -+ snprintf(tmp, 20, "%d", nr); - strcpy(&s[j], tmp); - j = j + strlen(tmp); - } -diff --git a/src/convert.c b/src/convert.c -index c76d7d6..6979365 100644 ---- a/src/convert.c -+++ b/src/convert.c -@@ -472,7 +472,7 @@ static const int fcharsetparmtocp(int parm) - } - - // Translate code page to encoding name hopefully suitable as iconv input --static char *cptoencoding(parm) -+static char *cptoencoding(int parm) - { - // Note that CP0 is supposed to mean current system default, which does - // not make any sense as a stored value, we don't handle it. -@@ -964,10 +964,10 @@ cmd_cf (Word *w, int align, char has_param, int num) - } - else - { -- sprintf(str,"#%02x%02x%02x", -- color_table[num].r, -- color_table[num].g, -- color_table[num].b); -+ snprintf(str, 40, "#%02x%02x%02x", -+ color_table[num].r, -+ color_table[num].g, -+ color_table[num].b); - attr_push(ATTR_FOREGROUND,str); - } - return FALSE; -@@ -993,10 +993,10 @@ cmd_cb (Word *w, int align, char has_param, int num) - } - else - { -- sprintf(str,"#%02x%02x%02x", -- color_table[num].r, -- color_table[num].g, -- color_table[num].b); -+ snprintf(str, 40, "#%02x%02x%02x", -+ color_table[num].r, -+ color_table[num].g, -+ color_table[num].b); - attr_push(ATTR_BACKGROUND,str); - } - return FALSE; -@@ -1018,7 +1018,7 @@ cmd_fs (Word *w, int align, char has_param, int points) { - /* Note, fs20 means 10pt */ - points /= 2; - -- sprintf(str,"%d",points); -+ snprintf(str, 20, "%d", points); - attr_push(ATTR_FONTSIZE,str); - - return FALSE; -@@ -1166,7 +1166,7 @@ cmd_f (Word *w, int align, char has_param, int num) - { - // TOBEDONE: WHAT'S THIS ??? - name = my_malloc(12); -- sprintf(name, "%d", num); -+ snprintf(name, 12, "%d", num); - } - - /* we are going to output entities, so should not output font */ -@@ -1218,7 +1218,7 @@ cmd_highlight (Word *w, int align, char has_param, int num) - } - else - { -- sprintf(str,"#%02x%02x%02x", -+ snprintf(str, 40, "#%02x%02x%02x", - color_table[num].r, - color_table[num].g, - color_table[num].b); -@@ -1373,9 +1373,9 @@ cmd_ftech (Word *w, int align, char has_param, int param) { - - static int - cmd_expand (Word *w, int align, char has_param, int param) { -- char str[10]; -+ char str[20]; - if (has_param) { -- sprintf(str, "%d", param/4); -+ snprintf(str, 20, "%d", param / 4); - if (!param) - attr_pop(ATTR_EXPAND); - else -@@ -1394,7 +1394,7 @@ cmd_expand (Word *w, int align, char has_param, int param) { - - static int - cmd_emboss (Word *w, int align, char has_param, int param) { -- char str[10]; -+ char str[20]; - if (has_param && !param) - #ifdef SUPPORT_UNNESTED - attr_find_pop(ATTR_EMBOSS); -@@ -1403,7 +1403,7 @@ cmd_emboss (Word *w, int align, char has_param, int param) { - #endif - else - { -- sprintf(str, "%d", param); -+ snprintf(str, 20, "%d", param); - attr_push(ATTR_EMBOSS, str); - } - return FALSE; -@@ -1419,12 +1419,12 @@ cmd_emboss (Word *w, int align, char has_param, int param) { - - static int - cmd_engrave (Word *w, int align, char has_param, int param) { -- char str[10]; -+ char str[20]; - if (has_param && !param) - attr_pop(ATTR_ENGRAVE); - else - { -- sprintf(str, "%d", param); -+ snprintf(str, 20, "%d", param); - attr_push(ATTR_ENGRAVE, str); - } - return FALSE; -@@ -1976,7 +1976,7 @@ static int cmd_u (Word *w, int align, char has_param, int param) { - - short done=0; - long unicode_number = (long) param; /* On 16bit architectures int is too small to store unicode characters. - AF */ -- char tmp[12]; /* Number of characters that can be in int type (including '\0'). If int size is greater than 4 bytes change this value. - AF */ -+ char tmp[20]; /* Number of characters that can be in int type (including '\0'). If int size is greater than 4 bytes change this value. - AF */ - const char *alias; - #define DEBUG 0 - #if DEBUG -@@ -2006,7 +2006,7 @@ static int cmd_u (Word *w, int align, char has_param, int param) { - /* RTF spec: Unicode values beyond 32767 are represented by negative numbers */ - unicode_number += 65536; - } -- sprintf(tmp, "%ld", unicode_number); -+ snprintf(tmp, 20, "%ld", unicode_number); - - if (safe_printf(1, op->unisymbol_print, tmp)) fprintf(stderr, TOO_MANY_ARGS, "unisymbol_print"); - done++; -@@ -3369,8 +3369,8 @@ word_print_core (Word *w, int groupdepth) - case PICT_PM: ext="pmm"; break; /* OS/2 metafile=??? */ - case PICT_EMF: ext="emf"; break; /* Enhanced MetaFile */ - } -- sprintf(picture_path, "pict%03d.%s", -- picture_file_number++,ext); -+ snprintf(picture_path, 255, "pict%03d.%s", -+ picture_file_number++, ext); - pictfile=fopen(picture_path,"wb"); - } - -diff --git a/src/output.c b/src/output.c -index 86d8b5c..4cdbfa6 100644 ---- a/src/output.c -+++ b/src/output.c -@@ -320,7 +320,7 @@ op_begin_std_fontsize (OutputPersonality *op, int size) - if (!found_std_expr) { - if (op->fontsize_begin) { - char expr[16]; -- sprintf (expr, "%d", size); -+ snprintf(expr, 16, "%d", size); - if (safe_printf (1, op->fontsize_begin, expr)) fprintf(stderr, TOO_MANY_ARGS, "fontsize_begin"); - } else { - /* If we cannot write out a change for the exact -@@ -440,7 +440,7 @@ op_end_std_fontsize (OutputPersonality *op, int size) - if (!found_std_expr) { - if (op->fontsize_end) { - char expr[16]; -- sprintf (expr, "%d", size); -+ snprintf(expr, 16, "%d", size); - if (safe_printf(1, op->fontsize_end, expr)) fprintf(stderr, TOO_MANY_ARGS, "fontsize_end"); - } else { - /* If we cannot write out a change for the exact diff --git a/46EA854F5FC5F5A0A9D2BFE89175BF0B3EC83090.gpg b/46EA854F5FC5F5A0A9D2BFE89175BF0B3EC83090.gpg new file mode 100644 index 0000000000000000000000000000000000000000..27f57f4eac59bc0f2a32c7c6d55fdd44eaca5de7 GIT binary patch literal 1166 zcmV;91abSB0ipy&gC#l<1OUTOfV7GX=2{gbXxJnbCKeX;dM2mhFESIV1)y+(%>JOm zLp7G=0TPQ8k9x`+`{yPPQrl*-wT0E6gBS(iG#~^MA?6_1W^Tfwt-XURF+CL4_1;SffZQdi-uR zJ$QI=##+9qlLNWK;{?f$rrBPOCuN3qNx5_|?hvUE2A|5irD_V_l%Ei;S{Q&Woz&R? z{;TQgM?BEAEPG+l+F--8(`QazH!CiqHo>hl3e^4W?$P_V%oYRwFQB;Sz_xCzPCY(e zT8ThUIAZae|2iVbAUlUVvw=BO2El-e& zjFT=ZIIW%P)eQK+v?@elc4Z($VRmJCASi5SW+@;%WMOt?WI%UmZe(L@X>DR(h+qU05dr`p1p-BbB{~8d0|pBT2nPcK1Qh}Z0|XWV0|5da0Rk6*0162Zk#)Zd zKFBbTO>6+27(&3qHFOSk-5ISoCEkK504sK}0H0QZra@z0z^xffldAWeL{}z%(En@8X-HwBK1OmRZUZqvC4ZzvqyjcqMX3Go;Bb#oTarCddOX0<`MN5vpPe#6DA@ zIMvgYmPUxP>IpB+<}*O8!2yAe-zatDBB1+rt)9lOA_Vh+-vEMXz{3AAl3WRf{o;j^D({L zHDIIq9jgC^lrC<;J7K9DKQQ1p&Dp@XK`-2~7LrWk3jp#RZsN=8l{oHewQCT*TdMN1 zyllI5!*)eh)smFnU3Fh0lqks7FE7C+csyIFKX3#;B&^IG5dS0}SO)QN%BV{4b z;pNY~(3gdPX>|Xve{Q#Fe*}RTVFk_1^w|r1H_Lu?xCr#>cwYwg*)SocJ_3Kl*K;ca z4k(`N5dr^4|Cz;MPH2wDD0WtFXSHydwYSiRmQmA{%AP2?>1aB4h*eF5HAmTaWIUfn zA*2m=2epVv1Q-zl00{*GMS~?h0vikf3JDOAb-xQf$S{yt^Z=hgfU~H*n!0}?>!l1q g4j%SG?=&<3pM5-qtC=H(eMD|Kco4eyp5cs{_5J7=Y5)KL literal 0 HcmV?d00001 diff --git a/sources b/sources index 3639fb4..f88a04b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -e2724018429d7710f2c72771705f6b37 unrtf-0.21.9.tar.gz +SHA512 (unrtf-0.21.10.tar.gz) = 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9 +SHA512 (unrtf-0.21.10.tar.gz.sig) = c5a9826e8c885c31323ad4b29f1bf985b8c9b9a48c98de27635d1fe5917761581ee6405425871470177e6d758e1128ea61281f95f51778bf1d9263ed092a0c75 diff --git a/unrtf.spec b/unrtf.spec index 8453360..ed4bcfc 100644 --- a/unrtf.spec +++ b/unrtf.spec @@ -1,23 +1,23 @@ Name: unrtf Summary: RTF (Rich Text Format) to other formats converter -Version: 0.21.9 +Version: 0.21.10 Release: %autorelease - -# Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later -URL: https://www.gnu.org/software/unrtf/unrtf.html -Source0: ftp://ftp.gnu.org/gnu/unrtf/unrtf-%{version}.tar.gz - -# http://hg.savannah.gnu.org/hgweb/unrtf/rev/3b16893a6406 -Patch0001: 0001-Replace-all-instances-of-sprintf-with-snprintf-and-a.patch - -BuildRequires: make -BuildRequires: gcc +URL: https://www.gnu.org/software/unrtf +Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig +# gpg --no-default-keyring --keyring ./keyring.gpg --keyserver keyserver.ubuntu.com --recv-key 46EA854F5FC5F5A0A9D2BFE89175BF0B3EC83090 +# gpg --no-default-keyring --keyring ./keyring.gpg --output 46EA854F5FC5F5A0A9D2BFE89175BF0B3EC83090.gpg --export +Source2: 46EA854F5FC5F5A0A9D2BFE89175BF0B3EC83090.gpg +Patch: 0001-Adjust-malloc-types.patch BuildRequires: automake +BuildRequires: gcc +BuildRequires: gnupg2 +BuildRequires: make %description -UnRTF is a command-line program written in C which converts documents in -Rich Text Format (.rtf) to HTML, LaTeX, troff macros, and RTF itself. +UnRTF is a command-line program written in C which converts documents in +Rich Text Format (.rtf) to HTML, LaTeX, troff macros, and RTF itself. Converting to HTML, it supports a number of features of Rich Text Format: * Changes in the text's font, size, weight (bold), and slant (italic) * Underlines and strikethroughs @@ -26,19 +26,16 @@ Converting to HTML, it supports a number of features of Rich Text Format: * Superscripts and subscripts * Expanded and condensed text * Changes in the foreground and background colors - * Conversion of special characters to HTML entities + * Conversion of special characters to HTML entities %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 %build -# The ./configure command (specifically the symlinks in the ./config/ -# directory) assume that automake is present in an "automake-1.13" directory. -# That is the case on EL7, but it's not the case in Fedora. That is why we -# regenerate the automake/autoconf bits by running the ./bootstrap script here. -./bootstrap +autoreconf -ivf %configure -make %{?_smp_mflags} +%make_build %install %make_install @@ -47,7 +44,8 @@ make %{?_smp_mflags} make check %files -%doc README ChangeLog COPYING AUTHORS NEWS +%doc README ChangeLog AUTHORS NEWS +%license COPYING %{_bindir}/%{name} %{_mandir}/man1/* %{_datadir}/%{name}/ From a575e3380f63ccbfa27908a549c0a67d88016c59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:49:07 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 87abdcd69f169b07d946e5f0e093f4e57cb21668 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:38:30 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3b29c7e7686a2a24ff814b4e9a90920688ad05d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:13:08 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild