checked in

OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=7

mtools-4.0.10-aliasing.diff

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

mtools-4.0.10-autoconf.diff

@@ -1,8 +1,6 @@
-Index: configure.in
+--- configure.in
-===================================================================
---- configure.in.orig
 +++ configure.in
-@@ -110,10 +110,10 @@ dnl
+@@ -95,10 +95,10 @@
  dnl
  AC_MSG_CHECKING(whether llseek declared in unistd.h)
  AC_CACHE_VAL(mtools_cv_have_llseek_prototype,
@@ -15,7 +13,7 @@ Index: configure.in
  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
+@@ -106,13 +106,13 @@
  
  AC_MSG_CHECKING(whether lseek64 declared in unistd.h)
  AC_CACHE_VAL(mtools_cv_have_lseek64_prototype,
@@ -31,7 +29,7 @@ Index: configure.in
  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
+@@ -145,12 +145,12 @@
  dnl
  AC_DEFUN(SFS_CHECK_OFF_T_64,
  [AC_CACHE_CHECK(for 64-bit off_t, sfs_cv_off_t_64,

mtools-4.0.10-fat-bits.diff

@@ -1,8 +1,6 @@
-Index: fat.c
+--- fat.c
-===================================================================
---- fat.c.orig
 +++ fat.c
-@@ -722,7 +722,7 @@ static int old_fat_read(Fs_t *This, unio
+@@ -704,7 +704,7 @@
  	if(check_media_type(This,boot, tot_sectors))
  		return -1;
  

mtools-4.0.10-file-close.diff

@@ -0,0 +1,10 @@
+--- mformat.c
++++ mformat.c
+@@ -1160,6 +1160,7 @@
+ 		}
+ 		read(fd, buf, blocksize);
+ 		keepBoot = 1;
++                close(fd);
+ 	}
+ 	if(!keepBoot && !(used_dev.use_2m & 0x7f)) {
+ 		memset((char *)boot, '\0', Fs.sector_size);

mtools-4.0.10-help-flag.diff

@@ -0,0 +1,47 @@
+diff -upr mtools-4.0.10/mattrib.c mtools-4.0.10.new/mattrib.c
+--- mtools-4.0.10/mattrib.c	2009-03-03 07:10:13.000000000 +0100
++++ mtools-4.0.10.new/mattrib.c	2009-10-23 09:07:45.000000000 +0200
+@@ -168,6 +168,7 @@ void mattrib(int argc, char **argv, int
+ 	int concise;
+ 	int replay;
+ 	char *ptr;
++        int wantUsage;
+ 
+ 	arg.add = 0;
+ 	arg.remove = 0xff;
+@@ -176,11 +177,16 @@ void mattrib(int argc, char **argv, int
+ 	view = 0;
+ 	concise = 0;
+ 	replay = 0;
++
++        wantUsage = 0;
+ 	
+ 	if(helpFlag(argc, argv))
+ 		usage(0);
+-	while ((c = getopt(argc, argv, "i:/ahrsAHRSXph")) != EOF) {
++	while ((c = getopt(argc, argv, "i:/ahrsAHRSXp")) != EOF) {
+ 		switch (c) {
++                        case 'h':
++                                wantUsage = 1;
++                                /* FALL TROUGH */
+ 			default:
+ 				arg.remove &= ~letterToCode(c);
+ 				break;
+@@ -196,13 +202,15 @@ void mattrib(int argc, char **argv, int
+ 			case 'X':
+ 				concise = 1;
+ 				break;
+-			case 'h':
+-				usage(0);
+ 			case '?':
+ 				usage(1);
+ 		}
+ 	}
+ 
++        if(optind == argc && wantUsage) {
++                usage(0);
++        }
++
+ 	for(;optind < argc;optind++) {
+ 		switch(argv[optind][0]) {
+ 			case '+':

mtools-4.0.10-overflow.diff

@@ -0,0 +1,11 @@
+--- mpartition.c
++++ mpartition.c
+@@ -514,7 +514,7 @@ void mpartition(int argc, char **argv, i
+ 			read(fd, (char *) buf, 512);
+ 		}
+ 		memset((char *)(partTable+1), 0, 4*sizeof(*partTable));
+-		set_dword(((unsigned char*)buf)+510, 0xaa55);
++		set_word(((unsigned char*)buf)+510, 0xaa55);
+ 	}
+ 
+ 	/* check for boot signature, and place it if needed */

mtools-4.0.10-prototypes.diff

@@ -1,8 +1,6 @@
-Index: mformat.c
+--- mformat.c
-===================================================================
---- mformat.c.orig
 +++ mformat.c
-@@ -19,6 +19,7 @@
+@@ -3,6 +3,7 @@
   */
  
  #define DONT_NEED_WAIT
@@ -10,7 +8,7 @@ Index: mformat.c
  
  #include "sysincludes.h"
  #include "msdos.h"
-@@ -48,7 +49,7 @@
+@@ -31,7 +32,7 @@
  
  #define _LINUX_STRING_H_
  #define kdev_t int
@@ -19,11 +17,9 @@ Index: mformat.c
  #undef _LINUX_STRING_H_
  
  #endif
-Index: mpartition.c
+--- mpartition.c
-===================================================================
---- mpartition.c.orig
 +++ mpartition.c
-@@ -17,6 +17,7 @@
+@@ -2,6 +2,7 @@
   * mformat.c
   */
  #define DONT_NEED_WAIT
@@ -31,7 +27,7 @@ Index: mpartition.c
  
  #include "sysincludes.h"
  #include "msdos.h"
-@@ -35,7 +36,7 @@
+@@ -20,7 +21,7 @@
  
  #define _LINUX_STRING_H_
  #define kdev_t int
@@ -40,11 +36,9 @@ Index: mpartition.c
  #undef _LINUX_STRING_H_
  
  #endif
-Index: sysincludes.h
+--- sysincludes.h
-===================================================================
---- sysincludes.h.orig
 +++ sysincludes.h
-@@ -331,12 +331,16 @@ typedef unsigned int uid_t;
+@@ -268,12 +268,16 @@
  #endif
  
  #ifdef HAVE_NETINET_IN_H

mtools-4.0.10-script.diff

@@ -0,0 +1,18 @@
+--- scripts/mcomp
++++ scripts/mcomp
+@@ -3,5 +3,5 @@
+ dosfile=$1
+ shift
+ 
+-mcopy $dosfile - | cmp $@
++mcopy $dosfile - | cmp "$@"
+ 
+--- scripts/mxtar
++++ scripts/mxtar
+@@ -5,5 +5,5 @@
+ shift
+ shift
+ 
+-mcopy $dosfile - | tar $taropt - $@
++mcopy $dosfile - | tar $taropt - "$@"
+ 

mtools-4.0.10.tar.bz2

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

mtools-4.0.12-file-close.diff

@@ -1,12 +0,0 @@
-Index: mformat.c
-===================================================================
---- mformat.c.orig
-+++ mformat.c
-@@ -1163,6 +1163,7 @@ void mformat(int argc, char **argv, int
- 			exit(1);
- 		}
- 		keepBoot = 1;
-+                close(fd);
- 	}
- 	if(!keepBoot && !(used_dev.use_2m & 0x7f)) {
- 		memset(boot.characters, '\0', Fs.sector_size);

mtools-4.0.12-script.diff

@@ -1,22 +0,0 @@
-Index: scripts/mcomp
-===================================================================
---- scripts/mcomp.orig
-+++ scripts/mcomp
-@@ -24,5 +24,5 @@ fi
- dosfile=$1
- shift
- 
--mcopy $dosfile - | cmp $@
-+mcopy $dosfile - | cmp "$@"
- 
-Index: scripts/mxtar
-===================================================================
---- scripts/mxtar.orig
-+++ scripts/mxtar
-@@ -21,5 +21,5 @@ dosfile=$2
- shift
- shift
- 
--mcopy $dosfile - | tar $taropt - $@
-+mcopy $dosfile - | tar $taropt - "$@"
- 

mtools-4.0.12.tar.bz2

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

mtools.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Tue Nov 24 15:29:20 CET 2009 - pgajdos@suse.cz
-
-- updated to 4.0.12 (see NEWS)
-  - removed upstreamed help-flag.diff and overflow.diff
-
 -------------------------------------------------------------------
 Fri Oct 23 11:25:37 CEST 2009 - pgajdos@suse.cz
 

mtools.spec

@@ -20,7 +20,7 @@
 
 Name:           mtools
 BuildRequires:  libpng texlive-latex xorg-x11 xorg-x11-devel
-Version:        4.0.12
+Version:        4.0.10
 Release:        5
 AutoReqProv:    on
 Group:          System/Filesystems
@@ -34,7 +34,9 @@ Patch2:         %{name}-%{version}-script.diff
 Patch3:         %{name}-%{version}-aliasing.diff
 Patch4:         %{name}-%{version}-fat-bits.diff
 Patch5:         %{name}-%{version}-prototypes.diff
+Patch6:         %{name}-%{version}-overflow.diff
 Patch7:         %{name}-%{version}-file-close.diff
+Patch8:         %{name}-%{version}-help-flag.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -96,7 +98,9 @@ Authors:
 %patch3
 %patch4
 %patch5
+%patch6
 %patch7
+%patch8 -p1
 
 %build
 %{suse_update_config -f}