Hello community, here is the log from the commit of package mtools for openSUSE:Factory checked in at 2018-11-06 15:24:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtools (Old) and /work/SRC/openSUSE:Factory/.mtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtools" Tue Nov 6 15:24:59 2018 rev:45 rq:645664 version:4.0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/mtools/mtools.changes 2018-07-25 16:04:32.592899671 +0200 +++ /work/SRC/openSUSE:Factory/.mtools.new/mtools.changes 2018-11-06 15:25:36.572501652 +0100 @@ -1,0 +2,22 @@ +Wed Oct 31 06:17:04 UTC 2018 - Petr Gajdos <pgaj...@suse.com> + +- patches unversioned; makes update and reviews easier + * mtools-4.0.18-fat-bits.diff -> mtools-fat-bits.diff + * mtools-4.0.18-conf.diff -> mtools-conf.diff + * mtools-4.0.18-aliasing.diff -> mtools-aliasing.diff + * mtools-4.0.18-prototypes.diff -> mtools-prototypes.diff + * mtools-4.0.18-autoconf.diff -> mtools-autoconf.diff + +------------------------------------------------------------------- +Sat Oct 27 23:03:50 UTC 2018 - s...@suspend.net + +- Update to 4.0.19: + * Fix for short file names starting with character 0xE5 + * mpartition: Partition types closer to what Microsoft uses + * mformat: figure out LBA geometry as last resort if geometry is unspecified + * mformat: use same default cluster size as Microsoft for FAT32 + * additional sanity checks + * document how clutser size is picked in mformat.c man page + * document how partition types are picked in mpartition.c man page + +------------------------------------------------------------------- Old: ---- mtools-4.0.18-aliasing.diff mtools-4.0.18-autoconf.diff mtools-4.0.18-conf.diff mtools-4.0.18-fat-bits.diff mtools-4.0.18-prototypes.diff mtools-4.0.18.tar.bz2 mtools-4.0.18.tar.bz2.sig New: ---- mtools-4.0.19.tar.bz2 mtools-4.0.19.tar.bz2.sig mtools-aliasing.diff mtools-autoconf.diff mtools-conf.diff mtools-fat-bits.diff mtools-prototypes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtools.spec ++++++ --- /var/tmp/diff_new_pack.a5I4vO/_old 2018-11-06 15:25:37.860499695 +0100 +++ /var/tmp/diff_new_pack.a5I4vO/_new 2018-11-06 15:25:37.864499689 +0100 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: mtools -Version: 4.0.18 +Version: 4.0.19 Release: 0 Summary: Access Files on an MS-DOS File System License: GPL-3.0-or-later @@ -26,11 +26,11 @@ Source0: http://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2 Source1: http://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2.sig Source2: %{name}.keyring -Patch0: %{name}-%{version}-conf.diff -Patch1: %{name}-%{version}-autoconf.diff -Patch3: %{name}-%{version}-aliasing.diff -Patch4: %{name}-%{version}-fat-bits.diff -Patch5: %{name}-%{version}-prototypes.diff +Patch0: %{name}-conf.diff +Patch1: %{name}-autoconf.diff +Patch3: %{name}-aliasing.diff +Patch4: %{name}-fat-bits.diff +Patch5: %{name}-prototypes.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool ++++++ mtools-4.0.18.tar.bz2 -> mtools-4.0.19.tar.bz2 ++++++ ++++ 14427 lines of diff (skipped) ++++++ mtools-4.0.18-aliasing.diff -> mtools-aliasing.diff ++++++ ++++++ mtools-4.0.18-autoconf.diff -> mtools-autoconf.diff ++++++ ++++++ mtools-conf.diff ++++++ --- mtools.conf +++ mtools.conf @@ -14,25 +14,20 @@ # You should have received a copy of the GNU General Public License # along with Mtools. If not, see <http://www.gnu.org/licenses/>. -# Example mtools.conf files. Uncomment the lines which correspond to -# your architecture and comment out the "SAMPLE FILE" line below -SAMPLE FILE +drive a: file="/dev/fd0" exclusive mformat_only cylinders=80 heads=2 sectors=18 +drive b: file="/dev/fd1" exclusive mformat_only cylinders=80 heads=2 sectors=18 -# # Linux floppy drives -# drive a: file="/dev/fd0" exclusive -# drive b: file="/dev/fd1" exclusive +# First SCSI hard disk partition +drive c: file="/dev/sda1" -# # First SCSI hard disk partition -# drive c: file="/dev/sda1" +# First IDE hard disk partition +#drive c: file="/dev/hda1" -# # First IDE hard disk partition -# drive c: file="/dev/hda1" +#dosemu floppy image +drive m: file="/var/lib/dosemu/diskimage" -# # dosemu floppy image -# drive m: file="/var/lib/dosemu/diskimage" - -# # dosemu hdimage -# drive n: file="/var/lib/dosemu/diskimage" offset=3840 +#dosemu hdimage +drive n: file="/var/lib/dosemu/hdimage.first" MTOOLS_SKIP_CHECK=1 MTOOLS_LOWER_CASE=1 MTOOLS_NO_VFAT=1 partition=1 offset=128 # # Atari ramdisk image # drive o: file="/tmp/atari_rd" offset=136 @@ -60,21 +55,4 @@ # ZIP drive on SCSI ID 6 #drive z: file="/dev/scsi_disk_060" offset=16384 fat_bits=16 -# SCO Unix 3.2v4 -# # Floppy disk drives -# -# drive a: file="/dev/install" exclusive -# drive b: file="/dev/install1" exclusive -# -# # SCSI hard disk partitions -# -# drive c: file="/dev/dsk/0sC" -# drive d: file="/dev/dsk/0sD" -# drive e: file="/dev/dsk/0sE" -# drive f: file="/dev/dsk/0sF" -# drive g: file="/dev/dsk/0sG" -# drive h: file="/dev/dsk/0sH" - -# # uncomment the following line to display all file names in lower -# # case by default -# mtools_lower_case=1 +mtools_lower_case=1 ++++++ mtools-fat-bits.diff ++++++ Index: fat.c =================================================================== --- fat.c.orig +++ fat.c @@ -705,6 +705,7 @@ static int fat_32_read(Fs_t *This, union static int old_fat_read(Fs_t *This, union bootsector *boot, + int config_fat_bits, size_t tot_sectors, int nodups) { This->writeAllFats = 1; @@ -719,7 +720,7 @@ static int old_fat_read(Fs_t *This, unio if(check_media_type(This,boot, tot_sectors)) return -1; - if(This->num_clus >= FAT12) { + if(This->num_clus >= FAT12 || config_fat_bits == 16) { set_fat16(This); /* third FAT byte must be 0xff */ if(!mtools_skip_check && readByte(This, 3) != 0xff) @@ -735,6 +736,7 @@ static int old_fat_read(Fs_t *This, unio * structures. */ int fat_read(Fs_t *This, union bootsector *boot, + int fat_bits, size_t tot_sectors, int nodups) { This->fat_error = 0; @@ -745,7 +747,7 @@ int fat_read(Fs_t *This, union bootsecto This->lastFatSectorData = 0; if(This->fat_len) - return old_fat_read(This, boot, tot_sectors, nodups); + return old_fat_read(This, boot, fat_bits, tot_sectors, nodups); else return fat_32_read(This, boot, tot_sectors); } Index: init.c =================================================================== --- init.c.orig +++ init.c @@ -387,7 +387,7 @@ Stream_t *fs_init(char drive, int mode, } /* read the FAT sectors */ - if(fat_read(This, &boot, tot_sectors, dev.use_2m&0x7f)){ + if(fat_read(This, &boot, dev.fat_bits, tot_sectors, dev.use_2m&0x7f)){ This->num_fat = 1; FREE(&This->Next); Free(This->Next); Index: fsP.h =================================================================== --- fsP.h.orig +++ fsP.h @@ -92,6 +92,7 @@ void fatAllocate(Fs_t *This, unsigned in void fatEncode(Fs_t *This, unsigned int pos, unsigned int value); int fat_read(Fs_t *This, union bootsector *boot, + int fat_bits, size_t tot_sectors, int nodups); void fat_write(Fs_t *This); int zero_fat(Fs_t *Fs, int media_descriptor); ++++++ mtools-prototypes.diff ++++++ Index: mformat.c =================================================================== --- mformat.c.orig +++ mformat.c @@ -19,6 +19,7 @@ */ #define DONT_NEED_WAIT +#define DONT_NEED_IN #include "sysincludes.h" #include "msdos.h" @@ -48,7 +49,7 @@ #define _LINUX_STRING_H_ #define kdev_t int -#include "linux/fs.h" +#include "sys/mount.h" #undef _LINUX_STRING_H_ #endif Index: mpartition.c =================================================================== --- mpartition.c.orig +++ mpartition.c @@ -17,6 +17,7 @@ * mformat.c */ #define DONT_NEED_WAIT +#define DONT_NEED_IN #include "sysincludes.h" #include "msdos.h" @@ -35,7 +36,7 @@ #define _LINUX_STRING_H_ #define kdev_t int -#include "linux/fs.h" +#include "sys/mount.h" #undef _LINUX_STRING_H_ #endif Index: sysincludes.h =================================================================== --- sysincludes.h.orig +++ sysincludes.h @@ -331,12 +331,16 @@ typedef unsigned int uid_t; #endif #ifdef HAVE_NETINET_IN_H +#ifndef DONT_NEED_IN #include <netinet/in.h> #endif +#endif #ifdef HAVE_ARPA_INET_H +#ifndef DONT_NEED_IN #include <arpa/inet.h> #endif +#endif #ifdef HAVE_NETDB_H #include <netdb.h>
