Changes 3.9.9:

* Large disk fixes, especially for Solaris
* Floppyd robustness
* Zip 250 support in mzip
* Protect against division by zero when reading BSD disks
* Fixed parsing of Unix filenames ending with slash
* Fixes for floppyd to work with current protocol version of floppyd
* Warn for invalid partition numbers
* Support for geometry-less Atari disks
* Support for byte-swapping disks
* Fixed max numbers of sectors for FAT12 and FAT16
See ChangeLog for details

7 files changed, 61 insertions, 57 deletions

diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index fb007bb3104..c98b6e939d6 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2003/08/09 11:25:13 seb Exp $
+# $NetBSD: Makefile,v 1.31 2003/12/11 16:05:40 adam Exp $
 #
 
-DISTNAME=	mtools-3.9.7
-PKGREVISION=	2
+DISTNAME=	mtools-3.9.9
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.tux.org/pub/tux/knaff/mtools/
+MASTER_SITES=	http://www.tux.org/pub/knaff/mtools/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www.tux.org/pub/knaff/mtools/
@@ -12,10 +12,10 @@ COMMENT=	FAT (MS-DOS, Atari) disk access tools
 
 NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
 
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
-USE_MAKEINFO=	YES
-INFO_FILES=	mtools.info
+GNU_CONFIGURE=		YES
+USE_GMAKE=		YES
+USE_MAKEINFO=		YES
+INFO_FILES=		mtools.info
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST
index e451ec269eb..d829b2d4d46 100644
--- a/sysutils/mtools/PLIST
+++ b/sysutils/mtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/08/05 20:21:42 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/11 16:05:40 adam Exp $
 ${NOFLOPPYD}bin/floppyd
 ${NOFLOPPYD}bin/floppyd_installtest
 bin/lz
@@ -22,7 +22,6 @@ bin/mmount
 bin/mmove
 bin/mpartition
 bin/mrd
-bin/mread
 bin/mren
 bin/mshowfat
 bin/mtools
@@ -34,6 +33,7 @@ bin/tgz
 bin/uz
 info/mtools.info
 ${NOFLOPPYD}man/man1/floppyd.1
+${NOFLOPPYD}man/man1/floppyd_installtest.1
 man/man1/mattrib.1
 man/man1/mbadblocks.1
 man/man1/mcat.1
@@ -44,6 +44,7 @@ man/man1/mdeltree.1
 man/man1/mdir.1
 man/man1/mdu.1
 man/man1/mformat.1
+man/man1/minfo.1
 man/man1/mkmanifest.1
 man/man1/mlabel.1
 man/man1/mmd.1
@@ -51,7 +52,6 @@ man/man1/mmount.1
 man/man1/mmove.1
 man/man1/mpartition.1
 man/man1/mrd.1
-man/man1/mread.1
 man/man1/mren.1
 man/man1/mshowfat.1
 man/man1/mtools.1
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index 903cc659ac6..2c7a387d930 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/08/05 20:21:42 seb Exp $
+$NetBSD: distinfo,v 1.5 2003/12/11 16:05:40 adam Exp $
 
-SHA1 (mtools-3.9.7.tar.gz) = b54f8a7041854edb5c17b116b3d77e4d088aedfb
-Size (mtools-3.9.7.tar.gz) = 282769 bytes
-SHA1 (patch-aa) = 7ae1660f3beeda8774e9df0eb21d01a0233a6ad6
-SHA1 (patch-ab) = 7549dceacff03ad9116bb45fd30e60088cf8fa93
-SHA1 (patch-ac) = 3b807b102f832095cb0e7734393655f99a205897
-SHA1 (patch-ad) = 4165cf8850f4e2d8e5d610133f2d776b7f2ccb90
+SHA1 (mtools-3.9.9.tar.bz2) = 91198d52fa405eff1ac9eec57cadcc86d06b6ef1
+Size (mtools-3.9.9.tar.bz2) = 262148 bytes
+SHA1 (patch-aa) = 4c04697a01eefcceef176a7816f367f95b06878c
+SHA1 (patch-ab) = 29ccd93cc6f2a2cf0020e91cbeaeac9d5e1a0fe4
+SHA1 (patch-ac) = 84d959c35ec65679e003f50ef6a6fb2e62ff272e
+SHA1 (patch-ad) = 891ed493888708d9fb835d9249852555938a84a0
 SHA1 (patch-af) = 0e2e1037be4da5f7c876cb5c9f54950e4726f6d0
diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa
index e2024d38d2e..7cefe1906bf 100644
--- a/sysutils/mtools/patches/patch-aa
+++ b/sysutils/mtools/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2003/08/05 20:21:43 seb Exp $
+$NetBSD: patch-aa,v 1.8 2003/12/11 16:05:40 adam Exp $
 
---- Makefile.in.orig	2000-05-14 18:14:59.000000000 +0000
+--- Makefile.in.orig	2003-02-16 21:55:16.000000000 +0000
 +++ Makefile.in
 @@ -11,7 +11,6 @@ USERCFLAGS = 
  USERLDFLAGS =
@@ -8,8 +8,8 @@ $NetBSD: patch-aa,v 1.7 2003/08/05 20:21:43 seb Exp $
  
 -MAKEINFO = makeinfo
  TEXI2DVI = texi2dvi
+ TEXI2PDF = texi2pdf
  TEXI2HTML = texi2html
- 
 @@ -49,6 +48,7 @@ LN_S        = @LN_S@
  
  INSTALL         = @INSTALL@
@@ -22,12 +22,12 @@ $NetBSD: patch-aa,v 1.7 2003/08/05 20:21:43 seb Exp $
  .SUFFIXES: .o .c
  .SUFFIXES: .o .c
  
--MAN1 = floppyd.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \
-+MAN1 = @MANFLOPPYD@ mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \
- mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
- mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
- MAN1EXT	= 1
-@@ -256,7 +256,7 @@ install-links: $(bindir)/mtools
+-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
++MAN1 = @MANFLOPPYD@ @MANFLOPPYD_INSTTEST@ mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
+ mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 mkmanifest.1 \
+ mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
+ mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
+@@ -257,7 +257,7 @@ install-links: $(bindir)/mtools
  install-scripts: $(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(bindir)
  	@for j in $(SCRIPTS) ; do \
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
index 865b31fc88e..f5bf03278ce 100644
--- a/sysutils/mtools/patches/patch-ab
+++ b/sysutils/mtools/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $
+$NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $
 
---- configure.orig	2000-05-28 12:22:06.000000000 +0200
-+++ configure	2003-05-22 17:57:40.000000000 +0200
-@@ -2626,7 +2626,7 @@
+--- configure.orig	2003-02-16 11:06:45.000000000 +0000
++++ configure
+@@ -5202,7 +5202,7 @@ if [ $host_os3 = hpux ] ; then
  fi
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $
      LDFLAGS="$LDFLAGS -z"
  fi
  
-@@ -2908,7 +2908,7 @@
+@@ -5471,7 +5471,7 @@ else
  
    # It would also be nice to do this for all -L options, not just this one.
    if test -n "$x_libraries"; then
@@ -19,37 +19,40 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $
 +    X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
-@@ -3443,7 +3443,7 @@
+     case `(uname -sr) 2>/dev/null` in
+@@ -6337,7 +6337,7 @@ fi
  
    # Check for libraries that X11R6 Xt/Xaw programs need.
-   ac_save_LDFLAGS="$LDFLAGS"
+   ac_save_LDFLAGS=$LDFLAGS
 -  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
 +  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
    # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
    # check for ICE first), but we must link in the order -lSM -lICE or
    # we get undefined symbols.  So assume we have SM if we have ICE.
-@@ -3644,6 +3644,7 @@
+@@ -6722,6 +6722,8 @@ if test X$use_floppyd = Xyes; then
      fi
      FLOPPYD="floppyd floppyd_installtest"
      BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
 +    MANFLOPPYD="floppyd.1"
-     cat >> confdefs.h <<\EOF
++    MANFLOPPYD_INSTTEST="floppyd_installtest.1"
+ 
+ cat >>confdefs.h <<\_ACEOF
  #define USE_FLOPPYD 1
- EOF
-@@ -3651,6 +3652,7 @@
+@@ -6730,6 +6732,8 @@ _ACEOF
  else
      FLOPPYD=
      BINFLOPPYD=
 +    MANFLOPPYD=
++    MANFLOPPYD_INSTTEST=
  fi
  
  
-@@ -3823,6 +3825,7 @@
- s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
- s%@FLOPPYD@%$FLOPPYD%g
- s%@BINFLOPPYD@%$BINFLOPPYD%g
+@@ -7327,6 +7331,8 @@ s,@X_LIBS@,$X_LIBS,;t t
+ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+ s,@FLOPPYD@,$FLOPPYD,;t t
+ s,@BINFLOPPYD@,$BINFLOPPYD,;t t
 +s%@MANFLOPPYD@%$MANFLOPPYD%g
- s%@extraincludedir@%$extraincludedir%g
- s%@extralibdir@%$extralibdir%g
- s%@MACHDEPLIBS@%$MACHDEPLIBS%g
++s%@MANFLOPPYD_INSTTEST@%$MANFLOPPYD_INSTTEST%g
+ s,@extraincludedir@,$extraincludedir,;t t
+ s,@extralibdir@,$extralibdir,;t t
+ s,@MACHDEPLIBS@,$MACHDEPLIBS,;t t
diff --git a/sysutils/mtools/patches/patch-ac b/sysutils/mtools/patches/patch-ac
index 4ee53ac9948..43a1f533e3b 100644
--- a/sysutils/mtools/patches/patch-ac
+++ b/sysutils/mtools/patches/patch-ac
@@ -1,7 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2001/02/28 10:26:02 wiz Exp $
---- floppyd.c.orig	Sun May 28 13:20:30 2000
-+++ floppyd.c	Wed Feb 14 13:42:45 2001
-@@ -574,7 +574,7 @@
+$NetBSD: patch-ac,v 1.7 2003/12/11 16:05:40 adam Exp $
+
+--- floppyd.c.orig	2002-11-02 10:55:24.000000000 +0000
++++ floppyd.c
+@@ -583,7 +583,7 @@ static uid_t getuserid(char *user)
  		}
  	else
  		{
@@ -9,8 +10,8 @@ $NetBSD: patch-ac,v 1.6 2001/02/28 10:26:02 wiz Exp $
 +			uid = getuserid("nobody");
  		}
  
- #ifdef DEBUG
-@@ -600,7 +600,7 @@
+ #if DEBUG
+@@ -609,7 +609,7 @@ static uid_t getgroupid(uid_t uid)
  		}
  	else
  		{
@@ -18,4 +19,4 @@ $NetBSD: patch-ac,v 1.6 2001/02/28 10:26:02 wiz Exp $
 +			gid = getgroupid(uid);
  		}
  
- #ifdef DEBUG
+ #if DEBUG
diff --git a/sysutils/mtools/patches/patch-ad b/sysutils/mtools/patches/patch-ad
index bd205d67b07..883c9c2566a 100644
--- a/sysutils/mtools/patches/patch-ad
+++ b/sysutils/mtools/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2003/05/22 16:16:04 salo Exp $
+$NetBSD: patch-ad,v 1.4 2003/12/11 16:05:40 adam Exp $
 
---- devices.c.orig	2000-05-28 12:20:54.000000000 +0200
-+++ devices.c	2003-05-22 17:35:16.000000000 +0200
-@@ -798,7 +798,7 @@
+--- devices.c.orig	2002-05-01 10:17:50.000000000 +0000
++++ devices.c
+@@ -799,7 +799,7 @@ struct device devices[] = {
  #endif /* __FreeBSD__ */
   
  /*** /jes -- for ALR 486 DX4/100 ***/