OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mtools?expand=0&rev=3

mtools-3.9.10-memset.diff

@@ -1,13 +0,0 @@
---- fat.c
-+++ fat.c
-@@ -447,8 +447,8 @@
- 		InfoSector_t *infoSector;
- 		infoSector = (InfoSector_t *) safe_malloc(This->sector_size);
- 		set_dword(infoSector->signature1, INFOSECT_SIGNATURE1);
--		memset(infoSector->filler1, sizeof(infoSector->filler1),0);
--		memset(infoSector->filler2, sizeof(infoSector->filler2),0);
-+		memset(infoSector->filler1,0,sizeof(infoSector->filler1));
-+		memset(infoSector->filler2,0,sizeof(infoSector->filler2));
- 		set_dword(infoSector->signature2, INFOSECT_SIGNATURE2);
- 		set_dword(infoSector->pos, This->last);
- 		set_dword(infoSector->count, This->freeSpace);

mtools-3.9.10.tar.bz2

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

mtools-3.9.11-autoconf.diff

@@ -1,22 +1,3 @@
---- Makefile.in
-+++ Makefile.in
-@@ -26,11 +26,13 @@
- srcdir=@srcdir@
- VPATH=@srcdir@
- 
-+DESTDIR =
-+
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
--bindir      = @bindir@
--infodir     = @infodir@
--mandir      = @mandir@
-+bindir      = $(DESTDIR)@bindir@
-+infodir     = $(DESTDIR)@infodir@
-+mandir      = $(DESTDIR)@mandir@
- sysconfdir  = @sysconfdir@
- 
- CC         = @CC@
 --- configure.in
 +++ configure.in
 @@ -95,10 +95,10 @@

mtools-3.9.11-fat-bits.diff

@@ -1,6 +1,6 @@
 --- fat.c
 +++ fat.c
-@@ -706,7 +706,7 @@
+@@ -704,7 +704,7 @@
  	if(check_media_type(This,boot, tot_sectors))
  		return -1;
  

mtools-3.9.11-prototypes.diff

@@ -17,26 +17,6 @@
  #undef _LINUX_STRING_H_
  
  #endif
---- mmount.c
-+++ mmount.c
-@@ -60,7 +60,7 @@
- 		if ( argc > 2 )
- 			execvp("mount", argv + 1 );
- 		else
--			execlp("mount", "mount", name, 0);
-+			execlp("mount", "mount", name, NULL);
- 		perror("exec mount");
- 		exit(1);
- 	default:
-@@ -77,7 +77,7 @@
- 	if ( argc > 2 )
- 		execvp("mount", argv);
- 	else
--		execlp("mount", "mount","-r", name, 0);
-+		execlp("mount", "mount","-r", name, NULL);
- 	exit(1);
- }
- 
 --- mpartition.c
 +++ mpartition.c
 @@ -2,6 +2,7 @@

mtools-3.9.11.tar.bz2

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

mtools.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jun  5 12:11:14 CEST 2007 - prusnak@suse.cz
+
+- updated to 3.9.11
+  * fixed reading of boot sector
+  * fixed mlabel on read-only disks
+  * added sizecode printing on minfo
+  * support for config parameters after -i file
+- drop obsolete patches:
+  * memset.diff (included in update)
+
 -------------------------------------------------------------------
 Sun Apr 22 22:40:14 CEST 2007 - ro@suse.de
 

mtools.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package mtools (Version 3.9.10)
+# spec file for package mtools (Version 3.9.11)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
 
 Name:           mtools
 BuildRequires:  libpng texlive-latex xorg-x11 xorg-x11-devel
-Version:        3.9.10
+Version:        3.9.11
-Release:        58
+Release:        1
 Autoreqprov:    on
 Group:          System/Filesystems
 License:        GNU General Public License (GPL)
-URL:            http://www.tux.org/pub/knaff/mtools/index.html
+URL:            http://mtools.linux.lu/
 Summary:        Access Files on an MS-DOS File System
 Source:         %{name}-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-conf.diff
@@ -26,7 +26,6 @@ Patch2:         %{name}-%{version}-script.diff
 Patch3:         %{name}-%{version}-aliasing.diff
 Patch4:         %{name}-%{version}-fat-bits.diff
 Patch5:         %{name}-%{version}-prototypes.diff
-Patch6:         %{name}-%{version}-memset.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %package floppyd
 Group:          System/Filesystems
@@ -67,19 +66,14 @@ Authors:
 %patch3
 %patch4
 %patch5
-%patch6
 
 %build
 %{suse_update_config -f}
 autoconf --force
-CC=gcc INSTALL_PROGRAM="install" CFLAGS="$RPM_OPT_FLAGS" \
+export CC=gcc
-./configure \
+export INSTALL_PROGRAM="install"
---build=%{_target_cpu}-suse-linux \
+%configure \
---prefix=%{_prefix} \
+    --includedir=/usr/src/linux/include
---sysconfdir=%{_sysconfdir} \
---mandir=%{_mandir} \
---infodir=%{_infodir} \
---includedir=/usr/src/linux/include 
 make all dvi info
 
 %install
@@ -104,6 +98,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/f*
 
 %changelog
+* Tue Jun 05 2007 - prusnak@suse.cz
+- updated to 3.9.11
+  * fixed reading of boot sector
+  * fixed mlabel on read-only disks
+  * added sizecode printing on minfo
+  * support for config parameters after -i file
+- drop obsolete patches:
+  * memset.diff (included in update)
 * Sun Apr 22 2007 - ro@suse.de
 - use texlive for building
 * Mon Feb 06 2006 - mjancar@suse.cz