From 616c4b4b6f04201ecb651a76ccf948a796e233403c63ed1e8e1966b3a4173a84 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Fri, 28 Dec 2018 18:06:07 +0000
Subject: [PATCH] - mtools 4.0.23:   * Address lots of compiler warnings
 (assignments between different types)   * Network speedup fixes for floppyd
 (TCP_CORK)   * Typo fixes   * Explicitly pass available target buffer size
 for character   set conversions - refreshed:   % mtools-prototypes.diff

OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=56
---
 mtools-4.0.22.tar.bz2     |  3 ---
 mtools-4.0.22.tar.bz2.sig |  6 ------
 mtools-4.0.23.tar.bz2     |  3 +++
 mtools-4.0.23.tar.bz2.sig |  6 ++++++
 mtools-prototypes.diff    | 24 ++++++++++++------------
 mtools.changes            | 12 ++++++++++++
 mtools.spec               |  6 +++---
 7 files changed, 36 insertions(+), 24 deletions(-)
 delete mode 100644 mtools-4.0.22.tar.bz2
 delete mode 100644 mtools-4.0.22.tar.bz2.sig
 create mode 100644 mtools-4.0.23.tar.bz2
 create mode 100644 mtools-4.0.23.tar.bz2.sig

diff --git a/mtools-4.0.22.tar.bz2 b/mtools-4.0.22.tar.bz2
deleted file mode 100644
index 2d5b9bb..0000000
--- a/mtools-4.0.22.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:652c0f22004b00e62a432d0aa7d6af51ef2c91a4b7168a9e2fa693aa928f5023
-size 431185
diff --git a/mtools-4.0.22.tar.bz2.sig b/mtools-4.0.22.tar.bz2.sig
deleted file mode 100644
index e703bf0..0000000
--- a/mtools-4.0.22.tar.bz2.sig
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQThUfj1SuT06QGfA3vIBjGyb0MZYQUCXAQbbgAKCRDIBjGyb0MZ
-YdA3AJ4ggypF6i7dq9Fxfama6fo3UIhwoACfe7QL4VEEeYgO2Vu5dzyyktZ8RbE=
-=Ftg6
------END PGP SIGNATURE-----
diff --git a/mtools-4.0.23.tar.bz2 b/mtools-4.0.23.tar.bz2
new file mode 100644
index 0000000..7eb7850
--- /dev/null
+++ b/mtools-4.0.23.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f188db26751aeb5692a79b2380b440ecc05fd1848a52f869d7ca1193f2ef8ee3
+size 418592
diff --git a/mtools-4.0.23.tar.bz2.sig b/mtools-4.0.23.tar.bz2.sig
new file mode 100644
index 0000000..9111023
--- /dev/null
+++ b/mtools-4.0.23.tar.bz2.sig
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQThUfj1SuT06QGfA3vIBjGyb0MZYQUCXA2pLwAKCRDIBjGyb0MZ
+YVp+AJ40pR6GxrsSfEGxLdhY03TIer/L8gCeJaa3xjL1BLzvvovF0thAZc9C6Q0=
+=Umnk
+-----END PGP SIGNATURE-----
diff --git a/mtools-prototypes.diff b/mtools-prototypes.diff
index 7ab746e..e034526 100644
--- a/mtools-prototypes.diff
+++ b/mtools-prototypes.diff
@@ -1,7 +1,7 @@
-Index: mformat.c
+Index: mtools-4.0.23/mformat.c
 ===================================================================
---- mformat.c.orig
-+++ 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
 @@ -19,6 +19,7 @@
   */
  
@@ -19,10 +19,10 @@ Index: mformat.c
  #undef _LINUX_STRING_H_
  
  #endif
-Index: mpartition.c
+Index: mtools-4.0.23/mpartition.c
 ===================================================================
---- mpartition.c.orig
-+++ 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
 @@ -17,6 +17,7 @@
   * mformat.c
   */
@@ -40,16 +40,16 @@ Index: mpartition.c
  #undef _LINUX_STRING_H_
  
  #endif
-Index: sysincludes.h
+Index: mtools-4.0.23/sysincludes.h
 ===================================================================
---- sysincludes.h.orig
-+++ sysincludes.h
-@@ -331,12 +331,16 @@ typedef unsigned int uid_t;
+--- 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;
  #endif
  
- #ifdef HAVE_NETINET_IN_H
+ #ifdef HAVE_NETINET_TCP_H
 +#ifndef DONT_NEED_IN
- #include <netinet/in.h>
+ #include <netinet/tcp.h>
  #endif
 +#endif
  
diff --git a/mtools.changes b/mtools.changes
index d3bbf2e..e9344c4 100644
--- a/mtools.changes
+++ b/mtools.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Dec 28 18:03:42 UTC 2018 - Petr Gajdos <pgajdos@suse.com>
+
+- mtools 4.0.23:
+  * Address lots of compiler warnings (assignments between different types)
+  * Network speedup fixes for floppyd (TCP_CORK)
+  * Typo fixes
+  * Explicitly pass available target buffer size for character
+  set conversions
+- refreshed:
+  % mtools-prototypes.diff
+
 -------------------------------------------------------------------
 Tue Dec 11 13:57:02 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/mtools.spec b/mtools.spec
index ea3e85d..9c69056 100644
--- a/mtools.spec
+++ b/mtools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           mtools
-Version:        4.0.22
+Version:        4.0.23
 Release:        0
 Summary:        Tools to access MS-DOS filesystems without kernel drivers
 License:        GPL-3.0-or-later
@@ -50,7 +50,7 @@ XDF support for OS/2 is also provided.
 %package doc
 Summary:        Documentation for mtools, a toolset for MS-DOS filesystem access
 License:        GPL-3.0-or-later AND GFDL-1.3-only
-Group:          Documentation/PDF
+Group:          Documentation/Other
 Requires:       %{name} = %{version}
 
 %description doc
@@ -63,7 +63,7 @@ mounting it. This subpackage contains the documentation for it.
 %patch1
 %patch3
 %patch4
-%patch5
+%patch5 -p1
 
 %build
 autoreconf -fi