pool/mtools
SHA256
2
0
Fork 3
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Accepting request 909421 from Base:System

Browse Source 
mtools 4.0.34 (forwarded request 908066 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/909421
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mtools?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2021-08-02 10:04:34 +00:00 committed by Git OBS Bridge
commit bab6449af6
9 changed files with 49 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mtools-4.0.31.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:538999277f8f2fa901f3898855d1b0ccb184666457fefddb70001cac612dd586
size 446527

16
mtools-4.0.31.tar.bz2.sig
View File

@ -1,16 +0,0 @@
-----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-----

3
mtools-4.0.34.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ada543eb1b0ffe5440d4ee42634309ea1e286d7ebb80c99ba50db5cb2c360cab
size 453751

16
mtools-4.0.34.tar.bz2.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEUaI9nXxN9Bqkj6iT6Zz1U3eQuDkFAmD6py4ACgkQ6Zz1U3eQ
uDla4A/+L2lxz/0YwlXKvYRn7Ya6TnwPM8hBx0TRnvdQhtdtuz9dlgIfxvhzSw1b
AQD2j4cGwti3Tdz0OniQ4M+sQ7A8bmrixcDfTPQ3Fk7betV4AzP0/VdVGMGiop3J
vHgGYBhgBmN+11fltMB0HzNnRPn4gF8nvyhPzXdn6EidDISvZ3W9W9rhBfJinVY/
soKyIeTMQ5aJcfOS7AQboR9jzB5wibjbbn7XOAgo6cVb3DMPz0FI2ugbPVI+ebiG
PttA0LMYrKkUd2XjKxf1VZ/aKyB4wFFpbtzyLc95UGBBRvlvAVeQSkemwnOMcTFG
DxaMnLdxbIBJaQhvIJ4amUusL8W5nZpGY2kEqyz4zrn1Dz9LJU6NQYTkQM5xIfeH
xRjISng+P/Ym3O8UtxYRRTfKMMbh3J63ksGhv63KZxhgTLvn6lQAnx/tWpLxiyrg
q06w4YSOA6mHEchDM/eJUZ80vZC8Yb+vGNt+mV3wkk09cnPFGjqnErUgQlHdGi1N
yaPhDAZ82KMkzTLp0CbHoBtQk/wmw+fv+tthE2lX3kNC/fszWd6KgJJP7F/e+hAr
85/OKQgKpDHq99KLyEjxE6h7O6i8KoG1eG/JEmu9X0dZNGT7mb7uBWj1gAQ/hpjp
n3C6bibe3w/oeQ1xWlseRB8SzaE3z56mH4r/rgXuGunW0GQZYC0=
=8lP5
-----END PGP SIGNATURE-----

2
mtools-aliasing.diff
View File

@ -2,7 +2,7 @@ Index: file.c
===================================================================
--- file.c.orig
+++ file.c
@@ -591,7 +591,7 @@ static Stream_t *_internalFileOpen(Strea
@@ -655,7 +655,7 @@ static Stream_t *_internalFileOpen(Strea
Pattern.loopDetectRel = 0;
Pattern.loopDetectAbs = first;
if(!hash_lookup(filehash, (T_HashTableEl) &Pattern,

48
mtools-autoconf.diff
View File

@ -1,48 +0,0 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -110,10 +110,10 @@ dnl
dnl
AC_MSG_CHECKING(whether llseek declared in unistd.h)
AC_CACHE_VAL(mtools_cv_have_llseek_prototype,
- AC_TRY_COMPILE(
+ [AC_TRY_COMPILE(
[#include <unistd.h>], [extern int llseek(int);],
[mtools_cv_have_llseek_prototype=no],
- [mtools_cv_have_llseek_prototype=yes]))
+ [mtools_cv_have_llseek_prototype=yes])])
AC_MSG_RESULT($mtools_cv_have_llseek_prototype)
if test "$mtools_cv_have_llseek_prototype" = yes; then
AC_DEFINE([HAVE_LLSEEK_PROTOTYPE],1,[Define when you have an LLSEEK prototype])
@@ -121,13 +121,13 @@ fi
AC_MSG_CHECKING(whether lseek64 declared in unistd.h)
AC_CACHE_VAL(mtools_cv_have_lseek64_prototype,
- AC_TRY_COMPILE(
+ [AC_TRY_COMPILE(
[
#include "sysincludes.h"
#include <unistd.h>
], [extern int lseek64(int);],
[mtools_cv_have_lseek64_prototype=no],
- [mtools_cv_have_lseek64_prototype=yes]))
+ [mtools_cv_have_lseek64_prototype=yes])])
AC_MSG_RESULT($mtools_cv_have_lseek64_prototype)
if test "$mtools_cv_have_lseek64_prototype" = yes; then
AC_DEFINE([HAVE_LSEEK64_PROTOTYPE],1,[Define when you have an LSEEK64 prototype])
@@ -163,12 +163,12 @@ dnl Check for 64-bit off_t
dnl
AC_DEFUN(SFS_CHECK_OFF_T_64,
[AC_CACHE_CHECK(for 64-bit off_t, sfs_cv_off_t_64,
-AC_TRY_COMPILE([
+[AC_TRY_COMPILE([
#include <unistd.h>
#include <sys/types.h>
],[
switch (0) case 0: case (sizeof (off_t) <= 4):;
-], sfs_cv_off_t_64=no, sfs_cv_off_t_64=yes))
+], sfs_cv_off_t_64=no, sfs_cv_off_t_64=yes)])
if test $sfs_cv_off_t_64 = yes; then
AC_DEFINE([HAVE_OFF_T_64],1,[Define when the system has a 64 bit off_t type])
fi])

63
mtools-fat-bits.diff
View File

@ -1,63 +0,0 @@
Index: fat.c
===================================================================
--- fat.c.orig
+++ fat.c
@@ -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,
uint32_t tot_sectors, int nodups)
{
This->writeAllFats = 1;
@@ -743,7 +744,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)
@@ -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,
uint32_t tot_sectors, int nodups)
{
This->fat_error = 0;
@@ -769,7 +771,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
@@ -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);
Index: fsP.h
===================================================================
--- fsP.h.orig
+++ fsP.h
@@ -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,
uint32_t tot_sectors, int nodups);
void fat_write(Fs_t *This);
int zero_fat(Fs_t *Fs, uint8_t media_descriptor);

28
mtools.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Sat Jul 24 06:49:20 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- mtools 4.0.34:
* Fix mcopy -s issue
- includes changes from 4.0.33:
* Fix support for partitions
* Add support for image files on command line to mcat
- includes changes from 4.0.32:
* Simplify algorithm that choses filesystem parameters for
format, and align it more closely with what Win7 does
* Fix mformatting XDF when XDF not explicitly specified on
mformat command line
* easier way to enter sizes on mformat command line
(mformat -C -T 1440K)
* For small sizes, mformat assumes floppy geometries
(heads 1 or 2, tracks 40 or 80)
* Handle attempts to mformat too small filesystems more
gracefully
* Enable minfo to print out additional mformat command line
parameters, if the present filesystem uses non-default
values for these
* minfo no longer prints bigsect if smallsect is set
* for remap filter, error when trying to write non-zero data
to unmapped sectors
- drop mtools-autoconf.diff, no longer needed
- drop mtools-fat-bits.diff, drop candidate for some time
-------------------------------------------------------------------
Sun Jun 20 16:20:58 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>

10
mtools.spec
View File

@ -17,7 +17,7 @@
Name: mtools
Version: 4.0.31
Version: 4.0.34
Release: 0
Summary: Tools to access MS-DOS filesystems without kernel drivers
License: GPL-3.0-or-later
@ -28,13 +28,8 @@ Source1: https://ftp.gnu.org/gnu/mtools/%{name}-%{version}.tar.bz2.sig
# https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=mtools
Source2: %{name}.keyring
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
BuildRequires: makeinfo
BuildRequires: texinfo
Requires: glibc-locale-base
@ -59,13 +54,10 @@ mounting it. This subpackage contains the documentation for it.
%prep
%setup -q
%patch0
%patch1
%patch3
%patch4
%patch5 -p1
%build
autoreconf -fi
%configure \
--includedir=%{_prefix}/src/linux/include \
--disable-floppyd