diff --git a/mtools-4.0.10-file-close.diff b/mtools-4.0.10-file-close.diff new file mode 100644 index 0000000..07a7809 --- /dev/null +++ b/mtools-4.0.10-file-close.diff @@ -0,0 +1,10 @@ +--- mformat.c ++++ mformat.c +@@ -1160,6 +1160,7 @@ + } + read(fd, buf, blocksize); + keepBoot = 1; ++ close(fd); + } + if(!keepBoot && !(used_dev.use_2m & 0x7f)) { + memset((char *)boot, '\0', Fs.sector_size); diff --git a/mtools.changes b/mtools.changes index 9aa356a..1a4ddbd 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 15 09:54:02 CEST 2009 - pgajdos@suse.cz + +- added missing call to close [bnc#535718] + ------------------------------------------------------------------- Thu Apr 16 01:35:17 CEST 2009 - ro@suse.de diff --git a/mtools.spec b/mtools.spec index 31cdbd8..ef25a39 100644 --- a/mtools.spec +++ b/mtools.spec @@ -21,7 +21,7 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel Version: 4.0.10 -Release: 3 +Release: 4 AutoReqProv: on Group: System/Filesystems License: GPL v3 or later @@ -35,6 +35,7 @@ Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff Patch6: %{name}-%{version}-overflow.diff +Patch7: %{name}-%{version}-file-close.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,7 +70,7 @@ Authors: David C. Niemi %package doc -License: GPL v3 or later; GNU Free Documentation License, Version 1.3 (GFDL 1.3) +License: GPL v3 or later ; GNU Free Documentation License, Version 1.3 (GFDL 1.3) Group: System/Filesystems Summary: Access Files on an MS-DOS File System Requires: %{name} = %{version} @@ -97,6 +98,7 @@ Authors: %patch4 %patch5 %patch6 +%patch7 %build %{suse_update_config -f} @@ -141,144 +143,3 @@ rm -rf $RPM_BUILD_ROOT %doc *.dvi %changelog -* Thu Apr 16 2009 ro@suse.de -- buildfix: refresh patches -* Mon Mar 16 2009 pgajdos@suse.cz -- updated to 4.0.10 (see NEWS) - * adjusted overflow.patch -- splitted out doc package -* Wed Jan 21 2009 schwab@suse.de -- Fix buffer overflows. -* Tue Jan 13 2009 pgajdos@suse.cz -- updated to 4.0.1 - * unicode support - * use transliteration to represent characters which don't exist in - target set - * Offset for -i-specified image files -* Tue Jun 05 2007 prusnak@suse.cz -- updated to 3.9.11 - * fixed reading of boot sector - * fixed mlabel on read-only disks - * added sizecode printing on minfo - * support for config parameters after -i file -- drop obsolete patches: - * memset.diff (included in update) -* Sun Apr 22 2007 ro@suse.de -- use texlive for building -* Mon Feb 06 2006 mjancar@suse.cz -- bransh mtools-floppy to prevent dependecy on X11 (#146102) -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Fri Nov 18 2005 meissner@suse.de -- fixed swapped memset() arguments. -* Wed Aug 03 2005 mjancar@suse.cz -- update to 3.9.10 -- drop obsolete patches: - * mtools-3.9.9-20030718.diff.gz - * mtools-execNULL.diff -- split mtools-3.9.9.diff into: - * mtools-3.9.10-autoconf.diff - * mtools-3.9.10-conf.diff - * mtools-3.9.10-prototypes.diff -* Tue Apr 05 2005 mmj@suse.de -- execl(..., 0) --> execl(..., NULL); -* Sun Feb 13 2005 ro@suse.de -- added libpng to nfb (for tetex) -* Mon Jan 24 2005 meissner@suse.de -- fixed one execl call, fixed one lvalue cast. -* Sun Jun 13 2004 schwab@suse.de -- Allow overriding fat bits. -* Thu Apr 22 2004 tcrhak@suse.cz -- strict aliasing fix -* Sat Jan 10 2004 adrian@suse.de -- build as user -* Thu Jul 31 2003 uli@suse.de -- fixed to build on 64-bit archs -* Tue Jul 29 2003 tcrhak@suse.cz -- update to version 3.9.9 -* Thu Dec 19 2002 tcrhak@suse.cz -- updated patch to mtools-3.9.8-20021118.diff.bz2 -* Tue Sep 17 2002 ro@suse.de -- removed bogus self-provides -* Mon Dec 03 2001 tcrhak@suse.cz -- updated patch to mtools-3.9.8-20011127.diff.bz2 -* Mon Oct 01 2001 schwab@suse.de -- Fix quoting in shell scripts. -* Wed Jun 13 2001 adostal@suse.cz -- upgrade to 3.9.8 -* Tue Jun 12 2001 schwab@suse.de -- Fix configure script. -* Tue Apr 03 2001 cihlar@suse.cz -- updated patchkit -* Mon Mar 26 2001 cihlar@suse.cz -- updated patchkit -* Fri Feb 09 2001 cihlar@suse.cz -- removed lx_suse from neededforbuild -- do not include kernel headers -* Thu Feb 08 2001 cihlar@suse.cz -- fixed to compile -* Tue Jan 09 2001 cihlar@suse.cz -- updated patchkit -* Tue Dec 05 2000 cihlar@suse.cz -- updated patchkit -* Wed Nov 22 2000 cihlar@suse.cz -- updated patchkit -* Thu Nov 09 2000 cihlar@suse.cz -- improved BuildRoot -- fixed file list -- bzipped sources -* Fri Oct 20 2000 cihlar@suse.cz -- updated patchkit -* Fri Sep 08 2000 schwab@suse.de -- Fix typo in configure script and pass -D_GNU_SOURCE to compiler - (obsoletes last change for alpha) -- Add suse_update_config. -* Mon Aug 28 2000 ro@suse.de -- fixed to compile on alpha -* Wed Aug 16 2000 cihlar@suse.cz -- updated patchkit -* Sat Jun 24 2000 kasal@suse.de -- updated patchkit -* Mon Jun 19 2000 kasal@suse.de -- upgrade to 3.9.7 -* Wed Apr 26 2000 kasal@suse.de -- upgrade to mtools-3.9.6-20000417.diff.gz -* Wed Apr 12 2000 kasal@suse.cz -- upgrade to mtools-3.9.6-20000410.diff.gz -* Mon Mar 27 2000 kasal@suse.cz -- added patch mtools-3.9.6-20000320b.diff.gz (fixes BUG# 2590) -* Wed Mar 01 2000 kasal@suse.de -- moved manpages to %%{_mandir} -- added buildroot and shortened %%filelist -- added mtools.info* files (and texinfo to #neededforbuild) -* Mon Sep 20 1999 uli@suse.de -- fixed #include conflict showing up on PPC -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Fri Jul 09 1999 uli@suse.de -- update -> 3.9.6 -* Tue Mar 23 1999 ro@suse.de -- don't use -O4 ; strip binaries -* Tue Mar 23 1999 ro@suse.de -- update to 3.9.4 -* Fri Dec 11 1998 rj@suse.de -- parameters in mtools.conf for 1,44MB disks hardcoded -* Thu Oct 29 1998 ro@suse.de -- respect change in 2.1.126 SCSI_DISK_MAJOR -* Sun Jul 26 1998 bs@suse.de -- used old config file again. -* Tue Jul 21 1998 bs@suse.de -- update to version 3.9.1 -* Tue Feb 24 1998 ro@suse.de -- removed man-pages mread and mwrite - (contain no information, just texinfos blabla) -* Thu Jun 12 1997 rj@suse.de -- modification in /etc/mtools.conf -* Fri Apr 18 1997 rj@suse.de -- new version 3.6 -* Mon Mar 03 1997 rj@suse.de -- new version 3.3 -* Tue Feb 25 1997 rj@suse.de -- new version 3.2 - - /usr/doc/packages/mtools now included - - xdf Support