Accepting request 982596 from Base:System
- fix build - deleted patches - mtools-prototypes.diff (not needed) - update to 4.0.40: * Better compatibility with legacy platforms OBS-URL: https://build.opensuse.org/request/show/982596 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mtools?expand=0&rev=61
This commit is contained in:
commit
8d3aa30e19
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:397f1e2b7b7a2a270eb7970fa363e445f956926ec51e8170c3869da85b0987bd
|
||||
size 429751
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEUaI9nXxN9Bqkj6iT6Zz1U3eQuDkFAmJTFhsACgkQ6Zz1U3eQ
|
||||
uDmA1A/8DD8GShkEMl+ZF7HosBMTK4sKEaoVtGVPls50iSbA1lDy8QmYJGVTeQQE
|
||||
Fr50h9hLv2q1SuDvkuemWox5eHbmaQNcpRW8aW54HHdF2yOZSlLx+DLEEA1O1clT
|
||||
Wy290zRJxkMVz76JoYTht5M1p94QWQ4KXoyI1NV+0ubF4gQwhxsOKWpuoYNFsKux
|
||||
Lt5XX6RnjDQmPIT7L8Rz7cVgnxC35Llxol1TIXmqT8sAlIEZxpLHlPLQWsBwoqW4
|
||||
llVhjwYbxZAwwTpanmvO+2tVCGtjGDFxZCsOprf7ZbKVEzSKx0XfQXWXEucuAx/q
|
||||
IHqRI+zBT8Fb/VuDVkYluqHxck2QVN2Vpga1OgwSvwMd7U6gHgs5barOnuA6Hk9J
|
||||
q2bb8VhGtJ66M9mqwjG9bYlrLOAei/R9OIGWQNsjYHhNDjPpjoY9onVxmlrM7GeW
|
||||
ZKLpBPhr+r3OF+mcT0qlrMC2huFsWd+bPoT9QaOG2Tr6QWuuilMY14FnbwfoRgxW
|
||||
u1hFOdOh3mKcoWv2Ic0/bgCcrq2dFIp4ZXPVepgt6aEOlRD7YNWfnwSlJd8LA8PK
|
||||
n5CW4Q/wYLBWSi94zfh0ZmrhBifcJWx7p8C5txQj2LoxajoTm9n/W9c/r0uEOvdu
|
||||
fEgHp7q1K/IQ3d1nU7m6neCQmjhiX2NgoZEvIOe74r7Cotsa6+E=
|
||||
=z7Ne
|
||||
-----END PGP SIGNATURE-----
|
3
mtools-4.0.40.tar.bz2
Normal file
3
mtools-4.0.40.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a22fca42354011dd2293a7f51f228b46ebbd802e7740b0975912afecb79d5df4
|
||||
size 447038
|
16
mtools-4.0.40.tar.bz2.sig
Normal file
16
mtools-4.0.40.tar.bz2.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEUaI9nXxN9Bqkj6iT6Zz1U3eQuDkFAmKbxiQACgkQ6Zz1U3eQ
|
||||
uDk+xQ/+OtFWSMP1GCEExZv+ncRC51V49jJS95FxGGXFJ4cd9uF+JiwbwjlJ2Vok
|
||||
H7pfgH89DDnMUBY+9S8CZiKbDPCcg7u9wwTUFLeb9RKC2ufN3wZcK6nLC9AKcuQo
|
||||
YzoaAMNc2ur2oBXq3FfEsg8kuf8tRPQppsr4y9v9qvtfFBnpsSRjxYGjGtu/LFnW
|
||||
I4gwHmdr7AvAEThOlol9Fo+bixh6w8vkJt00t063Mb3iy1eEqRbIU+mO0j5j2046
|
||||
3SeiZ7I+VJ5Ui82rM63h1U9NfMI3t9J25m611wus8RfEIBO/9gw0ikPg6udd/PMi
|
||||
y5sZDWtUhGz7rC3hFzrsN9srSUuThhBi6Acsirsh1n1gmxFn5UYE26xnDyDBy9SX
|
||||
0h17ko9HVUFe6vgrwZ7f2mnEheazTsnMfhsXAZqC/1VFYJdem9BTb00GWBtbi8B8
|
||||
FpeOOmS8gkySMG5I/iT+RwEH3Q1cRL+tsAOK0TfxI4GzKNM7nAz0HbH9oraVxIL8
|
||||
kTv4enssrbQd4g22iPz04keMiSptHeoiuH54JxDjIpycyi/BWe/chi42cAJjQGRr
|
||||
Bx9oaYXJ9eFmUrh3iqZ9UVYoK3dtI4HCH87k9pjlp2ah19iDYVw9LqrwFYKL+iB/
|
||||
cs3DZZaF8K9yT8kJmAOEp3wersxPkF9UthB9Z1TTjK0FyqgYXkc=
|
||||
=PlZU
|
||||
-----END PGP SIGNATURE-----
|
@ -1,63 +0,0 @@
|
||||
Index: mtools-4.0.31/mformat.c
|
||||
===================================================================
|
||||
--- mtools-4.0.31.orig/mformat.c
|
||||
+++ mtools-4.0.31/mformat.c
|
||||
@@ -19,6 +19,7 @@
|
||||
*/
|
||||
|
||||
#define DONT_NEED_WAIT
|
||||
+#define DONT_NEED_IN
|
||||
|
||||
#include "sysincludes.h"
|
||||
#include "msdos.h"
|
||||
@@ -44,7 +45,7 @@
|
||||
|
||||
#ifdef OS_linux
|
||||
#include "linux/hdreg.h"
|
||||
-#include "linux/fs.h"
|
||||
+#include "sys/mount.h"
|
||||
|
||||
#endif
|
||||
|
||||
Index: mtools-4.0.31/mpartition.c
|
||||
===================================================================
|
||||
--- mtools-4.0.31.orig/mpartition.c
|
||||
+++ mtools-4.0.31/mpartition.c
|
||||
@@ -17,6 +17,7 @@
|
||||
* mformat.c
|
||||
*/
|
||||
#define DONT_NEED_WAIT
|
||||
+#define DONT_NEED_IN
|
||||
|
||||
#include "sysincludes.h"
|
||||
#include "msdos.h"
|
||||
@@ -33,7 +34,7 @@
|
||||
|
||||
#ifdef OS_linux
|
||||
#include "linux/hdreg.h"
|
||||
-#include "linux/fs.h"
|
||||
+#include "sys/mount.h"
|
||||
#endif
|
||||
|
||||
static void set_offset(hsc *h, unsigned long offset,
|
||||
Index: mtools-4.0.31/sysincludes.h
|
||||
===================================================================
|
||||
--- 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
|
||||
+#ifndef DONT_NEED_IN
|
||||
#include <netinet/tcp.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>
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 14 10:28:38 UTC 2022 - pgajdos@suse.com
|
||||
|
||||
- fix build
|
||||
- deleted patches
|
||||
- mtools-prototypes.diff (not needed)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 10 20:35:16 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- update to 4.0.40:
|
||||
* Better compatibility with legacy platforms
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 00:37:45 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: mtools
|
||||
Version: 4.0.39
|
||||
Version: 4.0.40
|
||||
Release: 0
|
||||
Summary: Tools to access MS-DOS filesystems without kernel drivers
|
||||
License: GPL-3.0-or-later
|
||||
@ -28,7 +28,6 @@ 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
|
||||
Patch5: %{name}-prototypes.diff
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: texinfo
|
||||
Requires: glibc-locale-base
|
||||
@ -53,7 +52,6 @@ mounting it. This subpackage contains the documentation for it.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
Loading…
Reference in New Issue
Block a user