svn commit: r303038 - in head/usr.sbin/makefs: . ffs

[Ed Maste]

Author: emaste
Date: Tue Jul 19 18:40:54 2016
New Revision: 303038
URL: https://svnweb.freebsd.org/changeset/base/303038

Log:
  makefs: sync NetBSD IDs with upstream for changes that we already have
  
  May 22 21:51:39 2011 +0000 (christos):
  
      From Nathan Whitehorn (nwhitehorn at freebsd dot org):
      Add code to generate bootable ISOs on Powermac and CHRP systems.
      Synthesize some partition maps (APM and MBR, respectively) pointing
      to (a) the whole disk, and (b) relevant El Torito boot images that
      have been added by other code. These partition maps are a little
      bit funny looking, but they seem to work. FreeBSD has been using
      this successfully in their release generation on powerpc, as well
      as generating all non-SPARC install media. SPARC support could
      probably be added as an extension of this patch.
  
  makefs.8 1.33
  
  Tue Aug 23 17:09:11 2011 +0000 (christos):
  
      PR/45285: Martin Matuska: makefs does not properly convert ISO level 1 and 2
      filenames (buffer overflow)
  
      makefs does not properly verify the maximum filename length in the
      special "." case for both ISO level 1 and ISO level 2 filename
      conversion.  This creates broken images or causes a buffer overflow
      (ISO level 2).
  
      ISO level 1:
      If a filename contains only dots or up to 8 characters followed by
      dots the 8+3 limit check doesn't work.
  
      ISO level 2:
      If a filename contains a dot in the first 30 characters and a dot
      on the 30th character, the length limit check doesn't work and the
      buffer is overflowed.
  
      $ mkdir level1
      $ touch level1/12345............
      $ makefs -t cd9660 -o isolevel=1 test.iso level1
  
      $ mkdir level2
      $ touch level2/1234567890.2345678901234567.....34567890123456789012345
      $ makefs -t cd9660 -o isolevel=2 test.iso level2
  
  cd9660.c 1.32
  
  Sun Oct 9 21:33:43 2011 +0000 (christos):
  
      add support for setting the ufs label. (Nathan Whitehorn)
  
  ffs.c 1.45
  ffs.h 1.2
  mkfs.c 1.22
  makefs.8 1.37
  
  Obtained from:	NetBSD

Modified:
  head/usr.sbin/makefs/cd9660.c
  head/usr.sbin/makefs/ffs.c
  head/usr.sbin/makefs/ffs.h
  head/usr.sbin/makefs/ffs/mkfs.c
  head/usr.sbin/makefs/makefs.8

Modified: head/usr.sbin/makefs/cd9660.c
==============================================================================
--- head/usr.sbin/makefs/cd9660.c	Tue Jul 19 18:31:19 2016	(r303037)
+++ head/usr.sbin/makefs/cd9660.c	Tue Jul 19 18:40:54 2016	(r303038)
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.c,v 1.31 2011/08/06 23:25:19 christos Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.32 2011/08/23 17:09:11 christos Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan

Modified: head/usr.sbin/makefs/ffs.c
==============================================================================
--- head/usr.sbin/makefs/ffs.c	Tue Jul 19 18:31:19 2016	(r303037)
+++ head/usr.sbin/makefs/ffs.c	Tue Jul 19 18:40:54 2016	(r303038)
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.c,v 1.44 2009/04/28 22:49:26 joerg Exp $	*/
+/*	$NetBSD: ffs.c,v 1.45 2011/10/09 22:49:26 christos Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.

Modified: head/usr.sbin/makefs/ffs.h
==============================================================================
--- head/usr.sbin/makefs/ffs.h	Tue Jul 19 18:31:19 2016	(r303037)
+++ head/usr.sbin/makefs/ffs.h	Tue Jul 19 18:40:54 2016	(r303038)
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.h,v 1.1 2004/12/20 20:51:42 jmc Exp $	*/
+/*	$NetBSD: ffs.h,v 1.2 2004/12/20 20:51:42 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001-2003 Wasabi Systems, Inc.

Modified: head/usr.sbin/makefs/ffs/mkfs.c
==============================================================================
--- head/usr.sbin/makefs/ffs/mkfs.c	Tue Jul 19 18:31:19 2016	(r303037)
+++ head/usr.sbin/makefs/ffs/mkfs.c	Tue Jul 19 18:40:54 2016	(r303038)
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkfs.c,v 1.20 2004/06/24 22:30:13 lukem Exp $	*/
+/*	$NetBSD: mkfs.c,v 1.22 2011/10/09 22:30:13 christos Exp $	*/
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.

Modified: head/usr.sbin/makefs/makefs.8
==============================================================================
--- head/usr.sbin/makefs/makefs.8	Tue Jul 19 18:31:19 2016	(r303037)
+++ head/usr.sbin/makefs/makefs.8	Tue Jul 19 18:40:54 2016	(r303038)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: makefs.8,v 1.32 2009/01/20 20:47:25 bjh21 Exp $
+.\"	$NetBSD: makefs.8,v 1.33 2011/05/22 21:51:39 christos Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
 .\" All rights reserved.