>Number:         12203
>Category:       pkg
>Synopsis:       mtools update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 14 04:02:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Administrator
>Release:        1.5 with today's /usr/pkgsrc
>Organization:
piuha.net
>Environment:
System: NetBSD ws220 1.5 NetBSD 1.5 (WS21) #0: Tue Feb 13 18:36:34 EET 2001 root@ws220:/usr/src/sys/arch/i386/compile/WS21 i386


>Description:

I updated the mtools package to the latest version.

	1) Apply the following patch
	2) remove patches/patch-ad and patches/patch-ae

	
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/mtools/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile	2000/12/07 14:11:36	1.20
+++ Makefile	2001/02/14 11:55:17
@@ -1,13 +1,10 @@
 # $NetBSD: Makefile,v 1.20 2000/12/07 14:11:36 is Exp $
 #
 
-DISTNAME=	mtools-3.9.5
-PKGNAME=	mtools-3.9.5nb1
+DISTNAME=	mtools-3.9.7
+PKGNAME=	mtools-3.9.7
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/knaff/mtools/
-
-PATCH_SITES=	ftp://ftp.tux.org/pub/tux/knaff/mtools/
-PATCHFILES=	mtools-3.9.5-0905.diff.gz
 
 MAINTAINER=	is@netbsd.org
 HOMEPAGE=	http://www.tux.org/pub/knaff/mtools/
Index: files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/mtools/files/md5,v
retrieving revision 1.5
diff -u -r1.5 md5
--- md5	1999/06/02 20:09:02	1.5
+++ md5	2001/02/14 11:55:17
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.5 1999/06/02 20:09:02 christos Exp $
+$NetBSD$
 
-MD5 (mtools-3.9.5.tar.gz) = 124289b95012cd19673b047dc7c40fd5
-MD5 (mtools-3.9.5-0905.diff.gz) = 3853530fbd84ee06ce99e870efedeafb
+MD5 (mtools-3.9.7.tar.gz) = 6be028b20b5f94e74107442d972efe22
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/mtools/files/patch-sum,v
retrieving revision 1.4
diff -u -r1.4 patch-sum
--- patch-sum	2000/12/07 14:16:19	1.4
+++ patch-sum	2001/02/14 11:55:17
@@ -1,8 +1,6 @@
 $NetBSD: patch-sum,v 1.4 2000/12/07 14:16:19 is Exp $
 
-MD5 (patch-aa) = edf769ee7f71b1bac02185b003eff69f
-MD5 (patch-ab) = 24f199476d294f5d136b27a4a1053825
-MD5 (patch-ac) = 514d49464ae21e296bfa27f0f9023834
-MD5 (patch-ad) = 3c1e5aba6d4bb0d82052f08c1de94867
-MD5 (patch-ae) = 30bfddbbc43f7a9a196f280215ce8d77
+MD5 (patch-aa) = 2dc1f6b82f8ca08ecb571c2ad1ab0806
+MD5 (patch-ab) = 901c67dc21b0aeb3a4e25f555474da52
+MD5 (patch-ac) = 153311c6ca72a9ad4453d0eef56b7847
 MD5 (patch-af) = 6bae0a40bef6ebfe67eae12537a3467b
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/mtools/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patch-aa	1998/08/07 11:14:06	1.3
+++ patch-aa	2001/02/14 11:55:17
@@ -1,16 +1,14 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:14:06 agc Exp $
-
---- Makefile.in.orig	Mon Feb 16 08:24:09 1998
-+++ Makefile.in	Mon Feb 16 08:24:40 1998
-@@ -47,6 +47,7 @@
+--- Makefile.in.orig	Sun May 14 21:14:59 2000
++++ Makefile.in	Wed Feb 14 13:47:02 2001
+@@ -49,6 +49,7 @@
  
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT  = ${BSD_INSTALL_SCRIPT}
  INSTALL_DATA    = @INSTALL_DATA@
+ INSTALL_INFO	= @INSTALL_INFO@
  
- .SUFFIXES:
-@@ -195,7 +196,7 @@
+@@ -256,7 +257,7 @@
  install-scripts: $(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(bindir)
  	@for j in $(SCRIPTS) ; do \
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/mtools/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patch-ab	2000/09/26 02:46:38	1.2
+++ patch-ab	2001/02/14 11:55:17
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2000/09/26 02:46:38 hubertf Exp $
-
---- configure.orig	Tue Sep 26 04:39:41 2000
-+++ configure
-@@ -2471,7 +2471,7 @@
+--- configure.orig	Sun May 28 13:22:06 2000
++++ configure	Wed Feb 14 13:47:25 2001
+@@ -2626,7 +2626,7 @@
  fi
  
  
@@ -11,7 +9,7 @@
      LDFLAGS="$LDFLAGS -z"
  fi
  
-@@ -2753,7 +2753,7 @@
+@@ -2908,7 +2908,7 @@
  
    # It would also be nice to do this for all -L options, not just this one.
    if test -n "$x_libraries"; then
@@ -20,7 +18,7 @@
      # 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
-@@ -3288,7 +3288,7 @@
+@@ -3443,7 +3443,7 @@
  
    # Check for libraries that X11R6 Xt/Xaw programs need.
    ac_save_LDFLAGS="$LDFLAGS"
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/mtools/patches/patch-ac,v
retrieving revision 1.4
diff -u -r1.4 patch-ac
--- patch-ac	2000/01/04 17:49:43	1.4
+++ patch-ac	2001/02/14 11:55:17
@@ -1,25 +1,20 @@
-$NetBSD: patch-ac,v 1.4 2000/01/04 17:49:43 bouyer Exp $
-
---- floppyd.c.old	Mon Dec 13 18:11:58 1999
-+++ floppyd.c	Mon Dec 13 18:16:52 1999
-@@ -85,7 +85,9 @@
+--- floppyd.c.orig	Sun May 28 13:20:30 2000
++++ floppyd.c	Wed Feb 14 13:42:45 2001
+@@ -574,7 +574,7 @@
+ 		}
+ 	else
+ 		{
+-			uid = 65535;
++			uid = getuserid("nobody");
+ 		}
  
- typedef unsigned char Byte;
- typedef unsigned long Dword;
-+#ifndef OS_solaris2
- typedef unsigned long ipaddr_t;
-+#endif
+ #ifdef DEBUG
+@@ -600,7 +600,7 @@
+ 		}
+ 	else
+ 		{
+-			gid = 65535;
++			gid = getgroupid(uid);
+ 		}
  
- enum Opcodes {
- 	OP_READ,
-@@ -758,8 +760,8 @@
- 	int			run_as_server = 0;
- 	ipaddr_t		bind_ip = INADDR_ANY;
- 	short			bind_port = FLOPPYD_DEFAULT_PORT;
--	uid_t			run_uid = 65535;
--	gid_t			run_gid = 65535;
-+	uid_t			run_uid = getuserid("nobody");
-+	gid_t			run_gid = getgroupid(run_uid);
- 	int			sock;
- 	int			port_is_supplied = 0;
- 	int			no_local = 0;
+ #ifdef DEBUG

--- /dev/null	Wed Feb 14 13:58:00 2001
+++ patches/patch-af	Thu Dec  7 16:11:37 2000
@@ -0,0 +1,40 @@
+$NetBSD: patch-af,v 1.1 2000/12/07 14:11:37 is Exp $
+
+--- init.c.orig	Fri Mar 19 09:57:59 1999
++++ init.c
+@@ -27,15 +27,30 @@
+  */
+ static int read_boot(Stream_t *Stream, struct bootsector * boot, int size)
+ {	
++	int rc;
++	char *buf;
++
++	buf = (char *)boot;
++
+ 	/* read the first sector, or part of it */
+ 	if(!size)
+ 		size = BOOTSIZE;
+-	if(size > 1024)
+-		size = 1024;
+ 
+-	if (force_read(Stream, (char *) boot, 0, size) != size)
+-		return -1;
+-	return 0;
++	if (size > sizeof(struct bootsector)) {
++		buf = malloc(size);
++		if (!buf)
++			return(-1);
++	}
++
++	rc = 0;
++	if (force_read(Stream, buf, 0, size) != size)
++		rc = -1;
++	
++	if (buf != (char *)boot) {
++		memcpy(boot, buf, sizeof(struct bootsector));
++		free(buf);
++	}
++	return rc;
+ }
+ 
+ static int fs_flush(Stream_t *Stream)
>Release-Note:
>Audit-Trail:
>Unformatted: