6 changed files with 15 additions and 149 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/mtools-4.0.43.tar.gz
+SOURCES/mtools-4.0.26.tar.gz
--- a/.mtools.metadata
+++ b/.mtools.metadata
@ -1 +1 @@
-41910b97629777c34fbc0261100923fdaccd11e9 SOURCES/mtools-4.0.43.tar.gz
+f8923d781d7a648553c9d4865af9cca9aacdabc5 SOURCES/mtools-4.0.26.tar.gz
--- a/SOURCES/mtools-4.0.43-close.patch
+++ b/SOURCES/mtools-4.0.43-close.patch
@ -1,11 +0,0 @@
-diff -ur mtools-4.0.44/mpartition.c mtools-4.0.44-memleaks/mpartition.c
--- mtools-4.0.44/mpartition.c	2022-10-29 11:48:23.000000000 +0200
-+++ mtools-4.0.44-memleaks/mpartition.c	2024-08-21 13:53:03.699524744 +0200
-@@ -483,6 +483,7 @@
- 				perror("read MBR");
- 				exit(1);
- 			}
-+			close(fd);
- 		}
- 		memset((char *)(partTable+1), 0, 4*sizeof(*partTable));
- 		set_word(((unsigned char*)buf)+510, 0xaa55);
--- a/SOURCES/mtools-4.0.43-errmsgsize.patch
+++ b/SOURCES/mtools-4.0.43-errmsgsize.patch
@ -1,13 +0,0 @@
-diff -up mtools-4.0.43/mcopy.c.orig mtools-4.0.43/mcopy.c
--- mtools-4.0.43/mcopy.c.orig	2024-08-20 18:41:43.957181199 +0200
-+++ mtools-4.0.43/mcopy.c	2024-08-20 18:40:51.921966014 +0200
-@@ -196,7 +196,8 @@ static int _unix_write(MainParam_t *mp,
- 	Stream_t *File=mp->File;
- 	Stream_t *Target, *Source;
- 	struct MT_STAT stbuf;
-	char errmsg[80];
-+	/* matches buffer size in SimpleFileOpenWithLm() */
-+	char errmsg[200];
- 
- 	File->Class->get_data(File, &mtime, 0, 0, 0);
- 
--- a/SOURCES/mtools-4.0.43-iconv_close.patch
+++ b/SOURCES/mtools-4.0.43-iconv_close.patch
@ -1,19 +0,0 @@
-diff -ur mtools-4.0.44/charsetConv.c mtools-4.0.44-memleaks/charsetConv.c
--- mtools-4.0.44/charsetConv.c	2022-09-24 10:43:03.000000000 +0200
-+++ mtools-4.0.44-memleaks/charsetConv.c	2024-08-20 18:05:05.252088712 +0200
-@@ -70,6 +70,7 @@
- 	res = iconv(test,
- 		    &inbuf, &inbufLen,
- 		    &outbufP, &outbufLen);
-+	iconv_close(test);
- 	if(res != 0 || outbufLen != 0 || inbufLen != 0)
- 		goto fail;
- 	if(memcmp(outbuf, "ab", 2))
-@@ -77,7 +78,6 @@
- 	/* fprintf(stderr, "%s ok\n", testCp); */
- 	return 1;
-  fail:
-	iconv_close(test);
-  fail0:
- 	/*fprintf(stderr, "%s fail\n", testCp);*/
- 	return 0;
--- a/SPECS/mtools.spec
+++ b/SPECS/mtools.spec
@ -1,27 +1,17 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
-Version: 4.0.43
-Release: 6%{?dist}
-License: GPL-3.0-or-later
+Version: 4.0.26
+Release: 4%{?dist}
+License: GPLv3+
 Source0: ftp://ftp.gnu.org/gnu/mtools/mtools-%{version}.tar.gz
 Url: https://www.gnu.org/software/mtools/
 Patch0: mtools-3.9.6-config.patch
-Patch1: mtools-4.0.43-errmsgsize.patch
-Patch2: mtools-4.0.43-iconv_close.patch
-Patch3: mtools-4.0.43-close.patch

 BuildRequires: make
-BuildRequires: gcc
-BuildRequires: texinfo
-BuildRequires: autoconf
-BuildRequires: automake
-
-# Remove dependency on glibc-gconv-extra to avoid rebuilding entire glibc
-# when building flatpaks with mtools as dependency. Glibc is already
-# included in the runtime.
-%if ! 0%{?flatpak}
+BuildRequires:  gcc
+BuildRequires: texinfo, autoconf
+
 Requires: glibc-gconv-extra
-%endif

 %description
 Mtools is a collection of utilities for accessing MS-DOS files.
@ -33,10 +23,7 @@ Mtools should be installed if you need to use MS-DOS disks

 %prep
 %setup -q -n %{name}-%{version}
-%patch 0 -p1 -b .conf
-%patch 1 -p1
-%patch 2 -p1
-%patch 3 -p1
+%patch0 -p1 -b .conf

 %build
 autoreconf -fiv
@ -68,91 +55,13 @@ ln -s mtools.5.gz %{buildroot}%{_mandir}/man5/mtools.conf.5.gz
 %{_infodir}/mtools.info*

 %changelog
-* Wed Aug 21 2024 Pavel Cahyna <pcahyna@redhat.com> - 4.0.43-6
- Increase error message buffer size
- Prevent a leak of iconv_t
- Prevent a file descriptor leak
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.0.43-5
- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.43-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.43-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.43-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Mar 22 2023 Vojtech Trefny <vtrefny@redhat.com> 4.0.43-1
- Update to 4.0.43
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.42-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Nov 11 2022 Vojtech Trefny <vtrefny@redhat.com> - 4.0.42-2
- Change license string to the SPDX format required by Fedora
-
-* Mon Oct 24 2022 Vojtech Trefny <vtrefny@redhat.com> 4.0.42-1
- Update to 4.0.42
-
-* Tue Sep 20 2022 Vojtech Trefny <vtrefny@redhat.com> 4.0.41-1
- Update to 4.0.41
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.40-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 06 2022 Vojtech Trefny <vtrefny@redhat.com> 4.0.40-1
- Update to 4.0.40
-
-* Tue Apr 12 2022 Vojtech Trefny <vtrefny@redhat.com> 4.0.39-1
- Update to 4.0.39
-
-* Mon Mar 07 2022 Vojtech Trefny <vtrefny@redhat.com> 4.0.38-1
- Update to 4.0.38
-
-* Tue Feb 15 2022 Vojtech Trefny <vtrefny@redhat.com> 4.0.37-3
- Rebuilt for glibc flatpak dependency update
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.37-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 10 2022 Vojtech Trefny <vtrefny@redhat.com> 4.0.37-1
- Update to 4.0.37
-
-* Mon Nov 22 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.36-1
- Update to 4.0.36
-
-* Wed Nov 10 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.35-2
- Add dependency on glibc-gconv-extra (#2021637)
-
-* Sun Aug 08 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.35-1
- Update to 4.0.35
-
-* Sun Jul 25 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.34-1
- Update to 4.0.34
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.33-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 19 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.33-1
- Update to 4.0.33
-
-* Wed Jul 14 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.32-1
- Update to 4.0.32
-
-* Mon Jun 28 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.31-1
- Update to 4.0.31
-
-* Fri Jun 18 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.30-1
- Update to 4.0.30
-
-* Tue Jun 01 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.29-1
- Update to 4.0.29
+* Tue Jun  7 2022 Pavel Cahyna <pcahyna@redhat.com> - 4.0.26-4
+- Add dependency on glibc-gconv-extra
+  mtools need codepage 850, which was split from glibc into a subpackage.
+  (Fedora bug #2021637, RHEL bug #2073843)

-* Mon Apr 19 2021 Vojtech Trefny <vtrefny@redhat.com> 4.0.27-1
- Update to 4.0.27
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.26-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.26-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild