forked from pool/mtools
Petr Gajdos
9f34f85fc8
* Added missing -i option to mshortname * New mshortname command * Fix floppyd for disks bigger than 2 Gig * Remove obsolete -z flag * Remove now unsupported AC_USE_SYSTEM_EXTENSIONS * Fixed output formatting of mdir if MTOOLS_DOTTED_DIR is set * Mformat now correctly writes backup boot sector * Fixed signedness of serial number in mlabel * Fixed buffer size problem in mlabel * Make mlabel write backup boot sector if FAT32 * Catch situation where both clear and new label are given to mlabel * Quote filename parameters to scripts * Mformat: Close file descriptor for boot sector * Added lzip support to scripts/uz * Added Tot_sectors option to mformat * Fixed hidden sector handling in mformat * Minfo generates mformat command lines containing new -T option * Mlabel prints error if label too long - removed upstreamed patches: * script.diff * file_close.diff * initialize.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=17
64 lines
1.2 KiB
Diff
64 lines
1.2 KiB
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>
|