From f6c77199ea7b341fff1c3906a36812e44e04d4d81b677268d779d1edf2ea0562 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 21 Jun 2021 05:49:47 +0000 Subject: [PATCH] Accepting request 901041 from home:AndreasStieger:branches:Base:System mtools 4.0.31 OBS-URL: https://build.opensuse.org/request/show/901041 OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=68 --- mtools-4.0.27.tar.bz2 | 3 --- mtools-4.0.27.tar.bz2.sig | 16 ---------------- mtools-4.0.31.tar.bz2 | 3 +++ mtools-4.0.31.tar.bz2.sig | 16 ++++++++++++++++ mtools-fat-bits.diff | 24 ++++++++++++------------ mtools-prototypes.diff | 38 +++++++++++++++++++------------------- mtools.changes | 23 +++++++++++++++++++++++ mtools.spec | 2 +- 8 files changed, 74 insertions(+), 51 deletions(-) delete mode 100644 mtools-4.0.27.tar.bz2 delete mode 100644 mtools-4.0.27.tar.bz2.sig create mode 100644 mtools-4.0.31.tar.bz2 create mode 100644 mtools-4.0.31.tar.bz2.sig diff --git a/mtools-4.0.27.tar.bz2 b/mtools-4.0.27.tar.bz2 deleted file mode 100644 index 125f9ca..0000000 --- a/mtools-4.0.27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c88c8d9244e54768e40b92c005e61ec4e084ea7c070df9184caf1a6408838b3 -size 420579 diff --git a/mtools-4.0.27.tar.bz2.sig b/mtools-4.0.27.tar.bz2.sig deleted file mode 100644 index df68aa5..0000000 --- a/mtools-4.0.27.tar.bz2.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEUaI9nXxN9Bqkj6iT6Zz1U3eQuDkFAmB53vQACgkQ6Zz1U3eQ -uDk0ORAAhZjsKRjLrK1o2y6HJpGBWMUfKFi33FkLVnWurh5lXNN/PzxVLpToCLkH -uw7jdiim5VgSlbqV/rb8I4oRYc8RacrfMHczqTcOlaeE0hmZ8eC8nB9K13uIO9rU -ysyu8+QoGgI0URpEou45kUGf8PBJN4krSwLDAc61H7EeWjAS1dvgixkkq/ZKDwxE -TvwJ42X45tR7sO/BaN/1nc/SxW3j4Y3VmRQIqu32eSREa1bZn3z3k8JLQRUkwCzd -GerOU39ZNlnjIcCPxXz6QmpVJoecBTShYfyoMEuWK80LLTbyK+a/nb3iHFiaT6Qo -K14Snayy0PNy8GpoprWfHlSp/4sJVdcPnd1u4gleThlOJ1nSAIsXylF0JJE1mq2z -TuMLZlq8oP6X0WbaK+zoGzTMUcCJ+AycF5SMrIGEtIgmzDFQgl3fxgP6fVsAjbNw -ViR5NI3Sk/O+JSj2F6gdDQX15+JaI+jNWo2U10KyAr0cCGjrEb7KyLsVqkPAzmtL -RLrGlYJOP0WdTC4Dr2Brc42aIjDtl8/8wFMsez7ftCgnHsmg2FPilSYGx5iWVES3 -dcZtMCYVIk75dV8E5qMv5La/EJ05A2n+D6klf70avw3l/hGCdR3U/1f+AB+2KdFs -HRs+Wk1rNnX/C72PdKQLPhilRFi+vdP0sNT3HJkoOyRhAxqjYGM= -=V//P ------END PGP SIGNATURE----- diff --git a/mtools-4.0.31.tar.bz2 b/mtools-4.0.31.tar.bz2 new file mode 100644 index 0000000..86ad8ba --- /dev/null +++ b/mtools-4.0.31.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:538999277f8f2fa901f3898855d1b0ccb184666457fefddb70001cac612dd586 +size 446527 diff --git a/mtools-4.0.31.tar.bz2.sig b/mtools-4.0.31.tar.bz2.sig new file mode 100644 index 0000000..50a8942 --- /dev/null +++ b/mtools-4.0.31.tar.bz2.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEUaI9nXxN9Bqkj6iT6Zz1U3eQuDkFAmDOEHMACgkQ6Zz1U3eQ +uDldtw/9GEyw0r96hkjz+ao33rUHhkMbneJxb2CvscmbplQKYam0P6XgnvsboIbQ +jmqwZitdFMERl4+1HLOEomI79IXOzCsaQ0EvaECbQEmDB9V69U+Vtj0lJBTAm1Hn +QPTnJwAvGB08EP3F4Fchiitmk7Xojck3yZ1aAvEuwAOWbEvhIZZ4ZYjLqQXmU3zE +8LHtQyec/d0/gLxDVygQqIl/Pcs4VxFehTFMKfRl0S9Ns7MzUe62LJjSUalcc/nm +ulS1ewiTk2zus7g86jcf1YkwhOAIAUQBy7CaWBrkzvX5wjl2JuMRmVt4521u30zF +kZ3K5vURk9gD2EiikSHDC1VCj7V0GaMOJWMX8hKmDnICtXD6Mj1hCISGuY3F7tPf +/dQ2uLYhC+lNa8K692NTIozW4d9PYpZAehb6FbVBOsBC+AfcOc0XsZNl6FyIW+9a +ZuFFMtlXLUN7imScjZ2ryv12WJpIy4fN4XbAEJpHkYUEAuyWdvOKMQhfUb1G7Rgs +sGD93kpZGbySyQVZenFaMrU9noP/CP89hxjqGcxkw3CX3UBb+7ihdaEU/N5bzy6B +Tkm4xSJRK6EUZ1Xs3HvzvzSxzf0EMSG0aFjWwjQdevuyZe9lyVOBowz/Ddn1DhIF +ltLRjo36QnR44nN4mdSd5Xbc62pz6QG0ivEAfBnfM1sxHimpa08= +=Nx48 +-----END PGP SIGNATURE----- diff --git a/mtools-fat-bits.diff b/mtools-fat-bits.diff index b7a2150..6d912e2 100644 --- a/mtools-fat-bits.diff +++ b/mtools-fat-bits.diff @@ -2,15 +2,15 @@ Index: fat.c =================================================================== --- fat.c.orig +++ fat.c -@@ -705,6 +705,7 @@ static int fat_32_read(Fs_t *This, union +@@ -729,6 +729,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) + uint32_t tot_sectors, int nodups) { This->writeAllFats = 1; -@@ -719,7 +720,7 @@ static int old_fat_read(Fs_t *This, unio +@@ -743,7 +744,7 @@ static int old_fat_read(Fs_t *This, unio if(check_media_type(This,boot, tot_sectors)) return -1; @@ -19,15 +19,15 @@ Index: fat.c 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 +@@ -759,6 +760,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) + uint32_t tot_sectors, int nodups) { This->fat_error = 0; -@@ -745,7 +747,7 @@ int fat_read(Fs_t *This, union bootsecto +@@ -769,7 +771,7 @@ int fat_read(Fs_t *This, union bootsecto This->lastFatSectorData = 0; if(This->fat_len) @@ -40,24 +40,24 @@ Index: init.c =================================================================== --- init.c.orig +++ init.c -@@ -387,7 +387,7 @@ Stream_t *fs_init(char drive, int mode, +@@ -530,7 +530,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)){ + fprintf(stderr, "Error reading FAT\n"); 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 +@@ -94,6 +94,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); ++ int fat_bits, + uint32_t tot_sectors, int nodups); void fat_write(Fs_t *This); - int zero_fat(Fs_t *Fs, int media_descriptor); + int zero_fat(Fs_t *Fs, uint8_t media_descriptor); diff --git a/mtools-prototypes.diff b/mtools-prototypes.diff index e034526..a77670d 100644 --- a/mtools-prototypes.diff +++ b/mtools-prototypes.diff @@ -1,7 +1,7 @@ -Index: mtools-4.0.23/mformat.c +Index: mtools-4.0.31/mformat.c =================================================================== ---- mtools-4.0.23.orig/mformat.c 2018-12-10 00:18:40.000000000 +0100 -+++ mtools-4.0.23/mformat.c 2018-12-28 18:46:05.933555058 +0100 +--- mtools-4.0.31.orig/mformat.c ++++ mtools-4.0.31/mformat.c @@ -19,6 +19,7 @@ */ @@ -10,19 +10,19 @@ Index: mtools-4.0.23/mformat.c #include "sysincludes.h" #include "msdos.h" -@@ -48,7 +49,7 @@ +@@ -44,7 +45,7 @@ - #define _LINUX_STRING_H_ - #define kdev_t int + #ifdef OS_linux + #include "linux/hdreg.h" -#include "linux/fs.h" +#include "sys/mount.h" - #undef _LINUX_STRING_H_ #endif -Index: mtools-4.0.23/mpartition.c + +Index: mtools-4.0.31/mpartition.c =================================================================== ---- mtools-4.0.23.orig/mpartition.c 2018-12-09 23:56:07.000000000 +0100 -+++ mtools-4.0.23/mpartition.c 2018-12-28 18:46:05.933555058 +0100 +--- mtools-4.0.31.orig/mpartition.c ++++ mtools-4.0.31/mpartition.c @@ -17,6 +17,7 @@ * mformat.c */ @@ -31,20 +31,20 @@ Index: mtools-4.0.23/mpartition.c #include "sysincludes.h" #include "msdos.h" -@@ -35,7 +36,7 @@ +@@ -33,7 +34,7 @@ - #define _LINUX_STRING_H_ - #define kdev_t int + #ifdef OS_linux + #include "linux/hdreg.h" -#include "linux/fs.h" +#include "sys/mount.h" - #undef _LINUX_STRING_H_ - #endif -Index: mtools-4.0.23/sysincludes.h + + static void set_offset(hsc *h, unsigned long offset, +Index: mtools-4.0.31/sysincludes.h =================================================================== ---- mtools-4.0.23.orig/sysincludes.h 2018-12-28 18:46:05.933555058 +0100 -+++ mtools-4.0.23/sysincludes.h 2018-12-28 18:48:58.902333733 +0100 -@@ -359,12 +359,16 @@ extern int errno; +--- mtools-4.0.31.orig/sysincludes.h ++++ mtools-4.0.31/sysincludes.h +@@ -382,12 +382,16 @@ extern int errno; #endif #ifdef HAVE_NETINET_TCP_H diff --git a/mtools.changes b/mtools.changes index ce3cf7b..0052922 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Jun 20 16:20:58 UTC 2021 - Andreas Stieger + +- mtools 4.0.31: + * Fix polarity of format_xdf command-line parameter of mformat + * Improved error handling and error messages + * Remove duplicate writing of backup boot sector + * developer visible changes +- includes changes from 4.0.30: + * Fixed XDF floppy disk access + * Fixed faulty behavior at end of image in mcat + * Raise an error when trying to mcopy multiple source files + over a single destination file (rather than directory) + * fix handling of "hidden" sectors + * Modernize partition support + * developer visible changes +- includes changes from 4.0.29 and 4.0.28: + * Support remapping of data + * Re-open floppy devices read-write if geometry parameters need + to be changed + * relax consistency checks in mpartition (partitions created + by current fdisk would almost never pass these checks) + ------------------------------------------------------------------- Sun Apr 18 15:50:54 UTC 2021 - Andreas Stieger diff --git a/mtools.spec b/mtools.spec index 3952c12..5d9ebbf 100644 --- a/mtools.spec +++ b/mtools.spec @@ -17,7 +17,7 @@ Name: mtools -Version: 4.0.27 +Version: 4.0.31 Release: 0 Summary: Tools to access MS-DOS filesystems without kernel drivers License: GPL-3.0-or-later