[Glibc-bsd-commits] r2063 - in trunk/ufsutils/debian: . patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Fri Dec 7 21:47:16 UTC 2007 

Author: ps-guest
Date: 2007-12-07 21:47:16 +0000 (Fri, 07 Dec 2007)
New Revision: 2063

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/control
   trunk/ufsutils/debian/patches/00_libport.patch
   trunk/ufsutils/debian/patches/00_mount.patch
   trunk/ufsutils/debian/patches/00_param.patch
   trunk/ufsutils/debian/patches/01_libdisklabel.patch
   trunk/ufsutils/debian/patches/01_libufs.patch
   trunk/ufsutils/debian/patches/02_badsect.ufs.patch
   trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch
   trunk/ufsutils/debian/patches/02_dump.ufs.patch
   trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
   trunk/ufsutils/debian/patches/02_ffsinfo.patch
   trunk/ufsutils/debian/patches/02_fsck.ufs.patch
   trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
   trunk/ufsutils/debian/patches/02_growfs.ufs.patch
   trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
   trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
   trunk/ufsutils/debian/patches/03_ufsmount.patch
   trunk/ufsutils/debian/patches/99_makefiles.patch
   trunk/ufsutils/debian/rules
   trunk/ufsutils/debian/upstream.sh
Log:
* enable all features on kfreebsd,
  on linux unbuildable



Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/changelog	2007-12-07 21:47:16 UTC (rev 2063)
@@ -4,8 +4,8 @@
   * Add build-dependency on quilt, and use quilt in debian/rules
   * New upstream snapshot of RELENG_7
   * Include all needed sources in debian/upstream.sh
-  * Make it build much cleanly on kfreebsd (it might broke linux)
-    ino_t is int32 on kfreebsd-any !!!
+  * Make it build much cleanly on kfreebsd - ino_t is int32 on kfreebsd-any !!!
+  * Currently unbuildable on linux
 
  -- Guillem Jover <guillem at debian.org>  Fri, 07 Dec 2007 18:49:11 +0100
 

Modified: trunk/ufsutils/debian/control
===================================================================
--- trunk/ufsutils/debian/control	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/control	2007-12-07 21:47:16 UTC (rev 2063)
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 5), quilt, libedit-dev, libncurses5-dev
+Build-Depends: debhelper (>= 5), quilt, libedit-dev, libncurses5-dev, libfreebsd-dev, libbsd-dev
 Standards-Version: 3.6.2
 
 Package: ufsutils

Modified: trunk/ufsutils/debian/patches/00_libport.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_libport.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/00_libport.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,8 +1,9 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/include/port/port.h ufsutils.new/include/port/port.h
---- ufsutils.orig/include/port/port.h	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/include/port/port.h	2004-05-16 21:34:09.000000000 +0200
-@@ -0,0 +1,11 @@
+Index: ufsutils/include/port/port.h
+===================================================================
+--- /dev/null
++++ ufsutils/include/port/port.h
+@@ -0,0 +1,30 @@
 +#ifndef LIBPORT_H
 +#define LIBPORT_H
 +
@@ -12,11 +13,31 @@
 +#define __printflike(x,y)
 +#define __FBSDID(x)
 +
++#ifdef __FreeBSD_kernel__
++
++#  include <sys/param.h>
++#  include <sys/disk.h>
++#  include <sys/ioctl.h>
++
++#  define SF_SNAPSHOT   0x00200000
++
++/* all features are available */
++
++#  define HAVE_BSD_DISKLABEL 1
++#  define HAVE_BSD_ERRNO 1
++#  define HAVE_BSD_MOUNT 1
++#  define HAVE_BSD_SIGNALS 1
++#  define HAVE_BSD_STATFS 1
++#  define HAVE_BSD_SYSCTL 1
++#  define HAVE_UFS_SNAPSHOT 1
++
 +#endif
 +
-diff -Naur ufsutils.orig/include/port/random.h ufsutils.new/include/port/random.h
---- ufsutils.orig/include/port/random.h	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/include/port/random.h	2004-05-16 21:41:03.000000000 +0200
++#endif
+Index: ufsutils/include/port/random.h
+===================================================================
+--- /dev/null
++++ ufsutils/include/port/random.h
 @@ -0,0 +1,11 @@
 +#ifndef LIBPORT_RANDOM_H
 +#define LIBPORT_RANDOM_H
@@ -29,9 +50,10 @@
 +
 +#endif
 +
-diff -Naur ufsutils.orig/include/port/string.h ufsutils.new/include/port/string.h
---- ufsutils.orig/include/port/string.h	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/include/port/string.h	2004-05-16 21:29:54.000000000 +0200
+Index: ufsutils/include/port/string.h
+===================================================================
+--- /dev/null
++++ ufsutils/include/port/string.h
 @@ -0,0 +1,10 @@
 +#ifndef LIBPORT_STRING_H
 +#define LIBPORT_STRING_H
@@ -43,40 +65,13 @@
 +
 +#endif
 +
-diff -Naur ufsutils.orig/include/sys/disklabel.h ufsutils.new/include/sys/disklabel.h
---- ufsutils.orig/include/sys/disklabel.h	2004-04-30 05:41:43.000000000 +0200
-+++ ufsutils.new/include/sys/disklabel.h	2004-05-21 05:12:28.000000000 +0200
-@@ -33,10 +33,11 @@
- #ifndef _SYS_DISKLABEL_H_
- #define	_SYS_DISKLABEL_H_
- 
-+#include <stddef.h>
- #ifndef _KERNEL
- #include <sys/types.h>
- #endif
--#include <sys/ioccom.h>
-+//#include <sys/ioccom.h>
- 
- /*
-  * Disk description table, see disktab(5)
-diff -Naur ufsutils.orig/include/sys/ucred.h ufsutils.new/include/sys/ucred.h
---- ufsutils.orig/include/sys/ucred.h	2004-04-30 05:41:53.000000000 +0200
-+++ ufsutils.new/include/sys/ucred.h	2004-05-20 22:56:03.000000000 +0200
-@@ -33,6 +33,8 @@
- #ifndef _SYS_UCRED_H_
- #define	_SYS_UCRED_H_
- 
-+#include <sys/types.h>
-+
- /*
-  * Credentials.
-  *
-diff -Naur ufsutils.orig/libport/arc4random.c ufsutils.new/libport/arc4random.c
---- ufsutils.orig/libport/arc4random.c	2004-04-30 05:28:37.000000000 +0200
-+++ ufsutils.new/libport/arc4random.c	2004-05-20 22:49:03.000000000 +0200
+Index: ufsutils/libport/arc4random.c
+===================================================================
+--- ufsutils.orig/libport/arc4random.c
++++ ufsutils/libport/arc4random.c
 @@ -26,16 +26,11 @@
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.12 2007/05/25 10:40:33 delphij Exp $");
  
 -#include "namespace.h"
  #include <sys/types.h>
@@ -114,7 +109,7 @@
  
  static struct arc4_stream rs;
  static int rs_initialized;
-@@ -109,10 +93,10 @@
+@@ -105,10 +89,10 @@
  
  	gettimeofday(&rdat.tv, NULL);
  	rdat.pid = getpid();
@@ -128,10 +123,11 @@
  	} 
  	/* fd < 0?  Ah, what the heck. We'll just take whatever was on the
  	 * stack... */
-diff -Naur ufsutils.orig/libport/blockdev.c ufsutils.new/libport/blockdev.c
---- ufsutils.orig/libport/blockdev.c	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/libport/blockdev.c	2004-06-30 15:58:31.000000000 +0200
-@@ -0,0 +1,91 @@
+Index: ufsutils/libport/blockdev.c
+===================================================================
+--- /dev/null
++++ ufsutils/libport/blockdev.c
+@@ -0,0 +1,92 @@
 +/*
 + * Copyright (C) 2004 Guillem Jover <guillem at debian.org>
 + * All rights reserved.
@@ -163,6 +159,7 @@
 +#include <sys/types.h>
 +#include <sys/ioctl.h>
 +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
++#include <sys/param.h>
 +#if defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version >= 500000
 +#include <sys/disk.h>
 +#endif
@@ -223,9 +220,10 @@
 +
 +	return size;
 +}
-diff -Naur ufsutils.orig/include/port/blockdev.h ufsutils.new/include/port/blockdev.h
---- ufsutils.orig/include/port/blockdev.h	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/include/port/blockdev.h	2004-06-29 22:17:29.000000000 +0200
+Index: ufsutils/include/port/blockdev.h
+===================================================================
+--- /dev/null
++++ ufsutils/include/port/blockdev.h
 @@ -0,0 +1,9 @@
 +#ifndef LIBPORT_BLOCKDEV_H
 +#define LIBPORT_BLOCKDEV_H
@@ -236,9 +234,10 @@
 +
 +#endif
 +
-diff -Naur ufsutils.orig/libport/Makefile ufsutils.new/libport/Makefile
---- ufsutils.orig/libport/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/libport/Makefile	2004-06-29 22:54:03.000000000 +0200
+Index: ufsutils/libport/Makefile
+===================================================================
+--- /dev/null
++++ ufsutils/libport/Makefile
 @@ -0,0 +1,13 @@
 +LIB = port
 +LIB_type = static

Modified: trunk/ufsutils/debian/patches/00_mount.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_mount.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/00_mount.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,8 +1,8 @@
 #DPATCHLEVEL=1
-Index: ufsutils/include/sys/mount.h
+Index: ufsutils/freebsd/sys/mount.h
 ===================================================================
---- ufsutils.orig/include/sys/mount.h	2007-09-12 18:31:32.000000000 +0200
-+++ ufsutils/include/sys/mount.h	2007-12-07 18:58:42.000000000 +0100
+--- ufsutils.orig/freebsd/sys/mount.h
++++ ufsutils/freebsd/sys/mount.h
 @@ -34,14 +34,11 @@
  #define _SYS_MOUNT_H_
  
@@ -22,7 +22,7 @@
  
  /*
   * File identifier.
-@@ -60,6 +56,7 @@
+@@ -60,6 +57,7 @@
   */
  #define	MFSNAMELEN	16		/* length of type name including null */
  #define	MNAMELEN	88		/* size of on/from name bufs */
@@ -30,7 +30,7 @@
  #define	STATFS_VERSION	0x20030518	/* current version number */
  struct statfs {
  	uint32_t f_version;		/* structure version number */
-@@ -209,6 +206,7 @@
+@@ -209,6 +207,7 @@
  } while (0)
  
  #endif /* _KERNEL */
@@ -38,7 +38,7 @@
  
  /*
   * User specifiable flags.
-@@ -383,6 +381,7 @@
+@@ -383,6 +382,7 @@
  	char		*np_index;	/* Index file */
  };
  
@@ -46,7 +46,7 @@
  /*
   * Filesystem configuration information. One of these exists for each
   * type of filesystem supported by the kernel. These are searched at
-@@ -420,6 +419,7 @@
+@@ -420,6 +420,7 @@
  	int	vfc_flags;
  };
  #endif
@@ -54,7 +54,7 @@
  
  /*
   * NB: these flags refer to IMPLEMENTATION properties, not properties of
-@@ -484,6 +484,7 @@
+@@ -484,6 +485,7 @@
  #define VQ_FLAG4000	0x4000	/* placeholder */
  #define VQ_FLAG8000	0x8000	/* placeholder */
  
@@ -62,7 +62,7 @@
  #ifdef _KERNEL
  /* Point a sysctl request at a vfsidctl's data. */
  #define VCTLTOREQ(vc, req)						\
-@@ -739,5 +740,5 @@
+@@ -739,5 +741,5 @@
  __END_DECLS
  
  #endif /* _KERNEL */

Modified: trunk/ufsutils/debian/patches/00_param.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_param.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/00_param.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,8 +1,8 @@
 #DPATCHLEVEL=1
-Index: a/include/sys/param.h
+Index: ufsutils/freebsd/sys/param.h
 ===================================================================
---- a.orig/include/sys/param.h	2006-10-24 17:02:40.000000000 +0200
-+++ a/include/sys/param.h	2007-01-18 10:50:17.000000000 +0100
+--- ufsutils.orig/freebsd/sys/param.h
++++ ufsutils/freebsd/sys/param.h
 @@ -38,6 +38,7 @@
  #ifndef _SYS_PARAM_H_
  #define _SYS_PARAM_H_
@@ -21,7 +21,7 @@
  
  #define	MAXCOMLEN	19		/* max command name remembered */
  #define	MAXINTERP	32		/* max interpreter file name length */
-@@ -83,6 +86,7 @@
+@@ -83,6 +87,7 @@
  #define MAXHOSTNAMELEN	256		/* max hostname size */
  #define SPECNAMELEN	63		/* max length of devicename */
  
@@ -29,7 +29,7 @@
  /* More types and definitions used throughout the kernel. */
  #ifdef _KERNEL
  #include <sys/cdefs.h>
-@@ -106,6 +110,7 @@
+@@ -106,6 +111,7 @@
  #ifndef _KERNEL
  #include <sys/limits.h>
  #endif
@@ -37,7 +37,7 @@
  
  #ifndef _NO_NAMESPACE_POLLUTION
  
-@@ -183,7 +188,9 @@
+@@ -183,7 +189,9 @@
  #define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
  #define	PDROP	0x200	/* OR'd with pri to stop re-entry of interlock mutex */
  
@@ -47,7 +47,7 @@
  
  #define	NBBY	8		/* number of bits in a byte */
  #define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-@@ -256,6 +263,7 @@
+@@ -256,6 +264,7 @@
  #define	MIN(a,b) (((a)<(b))?(a):(b))
  #define	MAX(a,b) (((a)>(b))?(a):(b))
  
@@ -55,7 +55,7 @@
  #ifdef _KERNEL
  /*
   * Basic byte order function prototypes for non-inline functions.
-@@ -319,4 +327,5 @@
+@@ -319,4 +328,5 @@
  #define __OpenSolaris_version 20060731
  #endif
  

Modified: trunk/ufsutils/debian/patches/01_libdisklabel.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libdisklabel.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/01_libdisklabel.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/libdisklabel/Makefile ufsutils.new/libdisklabel/Makefile
---- ufsutils.orig/libdisklabel/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/libdisklabel/Makefile	2004-05-16 21:38:08.000000000 +0200
+Index: ufsutils/libdisklabel/Makefile
+===================================================================
+--- /dev/null
++++ ufsutils/libdisklabel/Makefile
 @@ -0,0 +1,10 @@
 +LIB = disklabel
 +LIB_type = static
@@ -13,9 +14,10 @@
 +
 +include ../Makefile.common
 +
-diff -Naur ufsutils.orig/libdisklabel/getdisklabel.c ufsutils.new/libdisklabel/getdisklabel.c
---- ufsutils.orig/libdisklabel/getdisklabel.c	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/libdisklabel/getdisklabel.c	2004-05-03 12:33:48.000000000 +0200
+Index: ufsutils/libdisklabel/getdisklabel.c
+===================================================================
+--- /dev/null
++++ ufsutils/libdisklabel/getdisklabel.c
 @@ -0,0 +1,8 @@
 +#include <stdlib.h>
 +#include <sys/disklabel.h>

Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/01_libufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,8 +1,8 @@
 #DPATCHLEVEL=1
 Index: ufsutils/include/ufs/ffs/fs.h
 ===================================================================
---- ufsutils.orig/include/ufs/ffs/fs.h	2007-12-07 19:29:33.767834000 +0100
-+++ ufsutils/include/ufs/ffs/fs.h	2007-12-07 19:30:02.000000000 +0100
+--- ufsutils.orig/include/ufs/ffs/fs.h
++++ ufsutils/include/ufs/ffs/fs.h
 @@ -33,6 +33,9 @@
  #ifndef _UFS_FFS_FS_H_
  #define _UFS_FFS_FS_H_
@@ -15,8 +15,8 @@
   * A filesystem consists of a number of cylinder groups.
 Index: ufsutils/include/ufs/ufs/dinode.h
 ===================================================================
---- ufsutils.orig/include/ufs/ufs/dinode.h	2007-12-07 19:29:33.792676000 +0100
-+++ ufsutils/include/ufs/ufs/dinode.h	2007-12-07 19:30:02.000000000 +0100
+--- ufsutils.orig/include/ufs/ufs/dinode.h
++++ ufsutils/include/ufs/ufs/dinode.h
 @@ -68,6 +68,8 @@
  #ifndef _UFS_UFS_DINODE_H_
  #define	_UFS_UFS_DINODE_H_
@@ -28,8 +28,8 @@
   * normal purposes and historically bad blocks were linked to inode 1, thus
 Index: ufsutils/include/ufs/ufs/dir.h
 ===================================================================
---- ufsutils.orig/include/ufs/ufs/dir.h	2007-12-07 19:29:33.826139000 +0100
-+++ ufsutils/include/ufs/ufs/dir.h	2007-12-07 19:30:02.000000000 +0100
+--- ufsutils.orig/include/ufs/ufs/dir.h
++++ ufsutils/include/ufs/ufs/dir.h
 @@ -38,6 +38,8 @@
  #ifndef _UFS_UFS_DIR_H_
  #define	_UFS_UFS_DIR_H_
@@ -41,8 +41,8 @@
   * practice this seems unlikely. So, we define the type doff_t as a 32-bit
 Index: ufsutils/libufs/Makefile
 ===================================================================
---- ufsutils.orig/libufs/Makefile	2007-12-07 19:29:33.857065000 +0100
-+++ ufsutils/libufs/Makefile	2007-12-07 19:30:26.000000000 +0100
+--- ufsutils.orig/libufs/Makefile
++++ ufsutils/libufs/Makefile
 @@ -1,26 +1,15 @@
  # $FreeBSD: src/lib/libufs/Makefile,v 1.14 2006/10/31 21:21:48 pjd Exp $
  

Modified: trunk/ufsutils/debian/patches/02_badsect.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_badsect.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_badsect.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/badsect.ufs/Makefile ufsutils.new/badsect.ufs/Makefile
---- ufsutils.orig/badsect.ufs/Makefile	2003-02-22 22:33:42.000000000 +0100
-+++ ufsutils.new/badsect.ufs/Makefile	2004-05-16 21:36:51.000000000 +0200
+Index: ufsutils/badsect.ufs/Makefile
+===================================================================
+--- ufsutils.orig/badsect.ufs/Makefile
++++ ufsutils/badsect.ufs/Makefile
 @@ -1,9 +1,13 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
  # $FreeBSD: src/sbin/badsect/Makefile,v 1.8 2003/02/22 21:33:42 johan Exp $

Modified: trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,8 +1,8 @@
 #DPATCHLEVEL=1
 Index: ufsutils/bsdlabel/bsdlabel.c
 ===================================================================
---- ufsutils.orig/bsdlabel/bsdlabel.c	2006-10-20 15:10:27.000000000 +0200
-+++ ufsutils/bsdlabel/bsdlabel.c	2007-12-07 19:02:08.000000000 +0100
+--- ufsutils.orig/bsdlabel/bsdlabel.c
++++ ufsutils/bsdlabel/bsdlabel.c
 @@ -60,7 +60,9 @@
  #include <sys/file.h>
  #include <sys/stat.h>
@@ -83,8 +83,8 @@
  		loclab.d_ntracks = 16;
 Index: ufsutils/bsdlabel/Makefile
 ===================================================================
---- ufsutils.orig/bsdlabel/Makefile	2006-08-22 09:51:09.000000000 +0200
-+++ ufsutils/bsdlabel/Makefile	2007-12-07 19:05:39.000000000 +0100
+--- ufsutils.orig/bsdlabel/Makefile
++++ ufsutils/bsdlabel/Makefile
 @@ -4,14 +4,8 @@
  .PATH: ${.CURDIR}/../../sys/geom
  

Modified: trunk/ufsutils/debian/patches/02_dump.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dump.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_dump.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/dump.ufs/Makefile ufsutils.new/dump.ufs/Makefile
---- ufsutils.orig/dump.ufs/Makefile	2003-11-14 14:07:38.000000000 +0100
-+++ ufsutils.new/dump.ufs/Makefile	2004-05-13 07:17:48.000000000 +0200
+Index: ufsutils/dump.ufs/Makefile
+===================================================================
+--- ufsutils.orig/dump.ufs/Makefile
++++ ufsutils/dump.ufs/Makefile
 @@ -15,9 +15,14 @@
  
  PROG=	dump

Modified: trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/dumpfs.ufs/dumpfs.c ufsutils.new/dumpfs.ufs/dumpfs.c
---- ufsutils.orig/dumpfs.ufs/dumpfs.c	2004-04-09 21:58:27.000000000 +0200
-+++ ufsutils.new/dumpfs.ufs/dumpfs.c	2004-05-13 08:22:40.000000000 +0200
+Index: ufsutils/dumpfs.ufs/dumpfs.c
+===================================================================
+--- ufsutils.orig/dumpfs.ufs/dumpfs.c
++++ ufsutils/dumpfs.ufs/dumpfs.c
 @@ -62,6 +62,7 @@
  #include <fcntl.h>
  #include <fstab.h>
@@ -10,9 +11,10 @@
  #include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
-diff -Naur ufsutils.orig/dumpfs.ufs/Makefile ufsutils.new/dumpfs.ufs/Makefile
---- ufsutils.orig/dumpfs.ufs/Makefile	2003-11-14 14:13:23.000000000 +0100
-+++ ufsutils.new/dumpfs.ufs/Makefile	2004-05-16 21:37:03.000000000 +0200
+Index: ufsutils/dumpfs.ufs/Makefile
+===================================================================
+--- ufsutils.orig/dumpfs.ufs/Makefile
++++ ufsutils/dumpfs.ufs/Makefile
 @@ -1,9 +1,13 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
  # $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9 2003/11/14 13:13:23 johan Exp $

Modified: trunk/ufsutils/debian/patches/02_ffsinfo.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_ffsinfo.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_ffsinfo.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/bsdlabel/Makefile ufsutils.new/bsdlabel/Makefile
---- ufsutils.orig/ffsinfo/Makefile	2004-04-01 22:31:48.000000000 +0200
-+++ ufsutils.new/ffsinfo/Makefile	2004-05-25 10:20:01.000000000 +0200
+Index: ufsutils/ffsinfo/Makefile
+===================================================================
+--- ufsutils.orig/ffsinfo/Makefile
++++ ufsutils/ffsinfo/Makefile
 @@ -4,16 +4,12 @@
  # $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.7 2004/04/01 20:31:48 johan Exp $
  #

Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,8 +1,8 @@
 #DPATCHLEVEL=1
 Index: ufsutils/fsck.ufs/ea.c
 ===================================================================
---- ufsutils.orig/fsck.ufs/ea.c	2007-12-07 20:12:55.802672000 +0100
-+++ ufsutils/fsck.ufs/ea.c	2007-12-07 20:13:27.000000000 +0100
+--- ufsutils.orig/fsck.ufs/ea.c
++++ ufsutils/fsck.ufs/ea.c
 @@ -38,7 +38,7 @@
  
  #include <sys/param.h>
@@ -14,8 +14,8 @@
  #include <ufs/ufs/dir.h>
 Index: ufsutils/fsck.ufs/fsck_ffs.8
 ===================================================================
---- ufsutils.orig/fsck.ufs/fsck_ffs.8	2007-12-07 20:12:55.826237000 +0100
-+++ ufsutils/fsck.ufs/fsck_ffs.8	2007-12-07 20:13:27.000000000 +0100
+--- ufsutils.orig/fsck.ufs/fsck_ffs.8
++++ ufsutils/fsck.ufs/fsck_ffs.8
 @@ -30,11 +30,11 @@
  .\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $
  .\"
@@ -39,8 +39,8 @@
  .Xr reboot 8
 Index: ufsutils/fsck.ufs/fsutil.c
 ===================================================================
---- ufsutils.orig/fsck.ufs/fsutil.c	2007-12-07 20:12:55.849909000 +0100
-+++ ufsutils/fsck.ufs/fsutil.c	2007-12-07 20:13:27.000000000 +0100
+--- ufsutils.orig/fsck.ufs/fsutil.c
++++ ufsutils/fsck.ufs/fsutil.c
 @@ -38,7 +38,9 @@
  #include <sys/param.h>
  #include <sys/time.h>
@@ -123,8 +123,8 @@
  }
 Index: ufsutils/fsck.ufs/inode.c
 ===================================================================
---- ufsutils.orig/fsck.ufs/inode.c	2007-12-07 20:12:55.873602000 +0100
-+++ ufsutils/fsck.ufs/inode.c	2007-12-07 20:13:27.000000000 +0100
+--- ufsutils.orig/fsck.ufs/inode.c
++++ ufsutils/fsck.ufs/inode.c
 @@ -36,7 +36,7 @@
  __FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $");
  
@@ -144,8 +144,8 @@
  
 Index: ufsutils/fsck.ufs/main.c
 ===================================================================
---- ufsutils.orig/fsck.ufs/main.c	2007-12-07 20:12:55.898546000 +0100
-+++ ufsutils/fsck.ufs/main.c	2007-12-07 20:14:13.000000000 +0100
+--- ufsutils.orig/fsck.ufs/main.c
++++ ufsutils/fsck.ufs/main.c
 @@ -45,9 +45,16 @@
  #include <sys/stat.h>
  #include <sys/file.h>
@@ -163,13 +163,7 @@
  #include <sys/uio.h>
  #include <sys/disklabel.h>
  
-@@ -58,18 +65,24 @@
- #include <errno.h>
- #include <fstab.h>
- #include <grp.h>
-+#if 0
- #include <mntopts.h>
-+#endif
+@@ -62,14 +69,18 @@
  #include <paths.h>
  #include <stdint.h>
  #include <string.h>
@@ -189,7 +183,7 @@
  
  int
  main(int argc, char *argv[])
-@@ -78,10 +91,11 @@
+@@ -78,10 +89,11 @@
  	struct rlimit rlimit;
  	struct itimerval itimerval;
  	int ret = 0;
@@ -202,7 +196,7 @@
  		switch (ch) {
  		case 'b':
  			skipclean = 0;
-@@ -125,6 +139,7 @@
+@@ -125,6 +137,7 @@
  			yflag = 0;
  			break;
  
@@ -210,7 +204,7 @@
  		case 'p':
  			preen++;
  			break;
-@@ -135,20 +150,22 @@
+@@ -135,20 +148,22 @@
  			break;
  
  		default:
@@ -235,7 +229,7 @@
  	if (bkgrdflag) {
  		signal(SIGALRM, alarmhandler);
  		itimerval.it_interval.tv_sec = 5;
-@@ -195,8 +212,10 @@
+@@ -195,8 +210,10 @@
  	ufs2_daddr_t n_ffree, n_bfree;
  	struct dups *dp;
  	struct statfs *mntp;
@@ -246,7 +240,7 @@
  	ufs2_daddr_t blks;
  	struct iovec *iov;
  	char errmsg[255];
-@@ -218,10 +237,12 @@
+@@ -218,10 +235,12 @@
  	 * if it is listed among the mounted file systems. Failing that
  	 * check to see if it is listed in /etc/fstab.
  	 */
@@ -259,7 +253,7 @@
  		filesys = blockcheck(filesys);
  	/*
  	 * If -F flag specified, check to see whether a background check
-@@ -239,8 +260,10 @@
+@@ -239,8 +258,10 @@
  		if ((sblock.fs_flags & FS_DOSOFTDEP) == 0)
  			exit(5);	/* Not running soft updates */
  		size = MIBSIZE;
@@ -270,7 +264,7 @@
  		if ((mntp == NULL && sblock.fs_clean == 1) ||
  		    (mntp != NULL && (sblock.fs_flags & FS_UNCLEAN) == 0))
  			exit(7);	/* Filesystem clean, report it now */
-@@ -278,6 +301,7 @@
+@@ -278,6 +299,7 @@
  	 *	return created snapshot file
  	 *	if not found, clear bkgrdflag and proceed with normal fsck
  	 */
@@ -278,7 +272,7 @@
  	if (bkgrdflag) {
  		if (mntp == NULL) {
  			bkgrdflag = 0;
-@@ -365,6 +389,7 @@
+@@ -365,6 +387,7 @@
  				filesys = snapname;
  		}
  	}
@@ -286,7 +280,7 @@
  
  	switch (setup(filesys)) {
  	case 0:
-@@ -372,7 +397,9 @@
+@@ -372,7 +395,9 @@
  			pfatal("CAN'T CHECK FILE SYSTEM.");
  		return (0);
  	case -1:
@@ -296,7 +290,7 @@
  		pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree +
  		    sblock.fs_frag * sblock.fs_cstotal.cs_nbfree));
  		printf("(%lld frags, %lld blocks, %.1f%% fragmentation)\n",
-@@ -392,8 +419,10 @@
+@@ -392,8 +417,10 @@
  	 */
  	if (preen == 0) {
  		printf("** Last Mounted on %s\n", sblock.fs_fsmnt);
@@ -307,7 +301,7 @@
  		printf("** Phase 1 - Check Blocks and Sizes\n");
  	}
  	pass1();
-@@ -492,8 +521,13 @@
+@@ -492,8 +519,13 @@
  	/*
  	 * Check to see if the file system is mounted read-write.
  	 */
@@ -321,7 +315,7 @@
  	ckfini(resolved);
  
  	for (cylno = 0; cylno < sblock.fs_ncg; cylno++)
-@@ -536,6 +570,8 @@
+@@ -536,6 +568,8 @@
  	 * it unless it is read-write, so we can continue using it
  	 * as safely as possible.
  	 */
@@ -330,7 +324,7 @@
  	if (mntp->f_flags & MNT_RDONLY) {
  		/*
  		 * XXX: Need to kick out MNT_ROOTFS until we fix
-@@ -558,8 +594,12 @@
+@@ -558,8 +592,12 @@
  		return (1);
  	}
  	return (0);
@@ -343,7 +337,7 @@
  /*
   * Get the mount point information for name.
   */
-@@ -599,13 +639,14 @@
+@@ -599,13 +637,14 @@
  	statfsp = NULL;
  	return (statfsp);
  }
@@ -362,8 +356,8 @@
  }
 Index: ufsutils/fsck.ufs/pass1.c
 ===================================================================
---- ufsutils.orig/fsck.ufs/pass1.c	2007-12-07 20:12:55.922248000 +0100
-+++ ufsutils/fsck.ufs/pass1.c	2007-12-07 20:13:27.000000000 +0100
+--- ufsutils.orig/fsck.ufs/pass1.c
++++ ufsutils/fsck.ufs/pass1.c
 @@ -317,9 +317,11 @@
  	inoinfo(inumber)->ino_type = IFTODT(mode);
  	badblk = dupblk = 0;
@@ -378,8 +372,8 @@
  	if (sblock.fs_magic == FS_UFS2_MAGIC && dp->dp2.di_extsize > 0) {
 Index: ufsutils/fsck.ufs/setup.c
 ===================================================================
---- ufsutils.orig/fsck.ufs/setup.c	2007-12-07 20:12:55.945794000 +0100
-+++ ufsutils/fsck.ufs/setup.c	2007-12-07 20:13:27.000000000 +0100
+--- ufsutils.orig/fsck.ufs/setup.c
++++ ufsutils/fsck.ufs/setup.c
 @@ -36,11 +36,14 @@
  __FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50 2006/10/31 22:06:56 pjd Exp $");
  
@@ -464,8 +458,8 @@
  }
 Index: ufsutils/fsck.ufs/utilities.c
 ===================================================================
---- ufsutils.orig/fsck.ufs/utilities.c	2007-12-07 20:12:55.969243000 +0100
-+++ ufsutils/fsck.ufs/utilities.c	2007-12-07 20:13:27.000000000 +0100
+--- ufsutils.orig/fsck.ufs/utilities.c
++++ ufsutils/fsck.ufs/utilities.c
 @@ -108,14 +108,16 @@
  	return (origname);
  }
@@ -487,9 +481,9 @@
  }
 Index: ufsutils/fsck.ufs/Makefile
 ===================================================================
---- ufsutils.orig/fsck.ufs/Makefile	2007-12-07 20:12:55.999974000 +0100
-+++ ufsutils/fsck.ufs/Makefile	2007-12-07 20:14:33.000000000 +0100
-@@ -1,19 +1,17 @@
+--- ufsutils.orig/fsck.ufs/Makefile
++++ ufsutils/fsck.ufs/Makefile
+@@ -1,19 +1,18 @@
  # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18 2007/09/19 01:24:19 rodrigc Exp $
  #	@(#)Makefile	8.2 (Berkeley) 4/27/95
  
@@ -512,11 +506,12 @@
 +MAN = fsck_ffs.8:fsck.ufs.8
 +UFS_SRCS = ../include/ufs/ffs/ffs_subr.c ../include/ufs/ffs/ffs_tables.c
 +LIBSRCS= dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c \
-+	pass4.c pass5.c setup.c utilities.c $(UFS_SRCS) gjournal.c
++	pass4.c pass5.c setup.c utilities.c $(UFS_SRCS) gjournal.c \
++	../mount/getmntopts.c
  
 -.PATH:	${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount
 +LDADD = -L../libport -lport -L. -l$(LIB) -L../libufs -lufs
-+INCLUDES = -I. -I../libufs
++INCLUDES = -I. -I../libufs -I../mount
 +
 +include ../Makefile.common
  

Modified: trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsdb.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_fsdb.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,8 +1,8 @@
 #DPATCHLEVEL=1
-Index: uf-a/fsdb.ufs/fsdb.8
+Index: ufsutils/fsdb.ufs/fsdb.8
 ===================================================================
---- uf-a.orig/fsdb.ufs/fsdb.8	2006-09-22 13:20:10.000000000 +0200
-+++ uf-a/fsdb.ufs/fsdb.8	2007-01-18 10:41:04.000000000 +0100
+--- ufsutils.orig/fsdb.ufs/fsdb.8
++++ ufsutils/fsdb.ufs/fsdb.8
 @@ -263,7 +263,7 @@
  .Nm
  does not implement.
@@ -12,10 +12,10 @@
  beyond what
  .Xr fsck 8
  can repair.
-Index: uf-a/fsdb.ufs/fsdb.c
+Index: ufsutils/fsdb.ufs/fsdb.c
 ===================================================================
---- uf-a.orig/fsdb.ufs/fsdb.c	2006-09-22 13:20:10.000000000 +0200
-+++ uf-a/fsdb.ufs/fsdb.c	2007-01-18 11:12:31.000000000 +0100
+--- ufsutils.orig/fsdb.ufs/fsdb.c
++++ ufsutils/fsdb.ufs/fsdb.c
 @@ -35,13 +35,13 @@
  
  #include <sys/param.h>
@@ -50,10 +50,10 @@
  static void 
  usage(void)
  {
-Index: uf-a/fsdb.ufs/fsdbutil.c
+Index: ufsutils/fsdb.ufs/fsdbutil.c
 ===================================================================
---- uf-a.orig/fsdb.ufs/fsdbutil.c	2006-09-22 13:20:10.000000000 +0200
-+++ uf-a/fsdb.ufs/fsdbutil.c	2007-01-18 11:12:19.000000000 +0100
+--- ufsutils.orig/fsdb.ufs/fsdbutil.c
++++ ufsutils/fsdb.ufs/fsdbutil.c
 @@ -41,7 +41,6 @@
  #include <stdint.h>
  #include <string.h>
@@ -81,10 +81,10 @@
  static int charsperline(void);
  static int printindir(ufs2_daddr_t blk, int level, char *bufp);
  static void printblocks(ino_t inum, union dinode *dp);
-Index: uf-a/fsdb.ufs/Makefile
+Index: ufsutils/fsdb.ufs/Makefile
 ===================================================================
---- uf-a.orig/fsdb.ufs/Makefile	2004-10-09 17:56:34.000000000 +0200
-+++ uf-a/fsdb.ufs/Makefile	2007-01-18 10:46:15.000000000 +0100
+--- ufsutils.orig/fsdb.ufs/Makefile
++++ ufsutils/fsdb.ufs/Makefile
 @@ -2,15 +2,13 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
  # $FreeBSD: src/sbin/fsdb/Makefile,v 1.19 2004/10/09 15:56:34 le Exp $

Modified: trunk/ufsutils/debian/patches/02_growfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_growfs.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_growfs.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,9 +1,13 @@
 #DPATCHLEVEL=1
-Index: uf-a/growfs.ufs/growfs.c
+Index: ufsutils/growfs.ufs/growfs.c
 ===================================================================
---- uf-a.orig/growfs.ufs/growfs.c	2007-01-18 11:14:06.000000000 +0100
-+++ uf-a/growfs.ufs/growfs.c	2007-01-18 11:14:17.000000000 +0100
-@@ -54,7 +54,6 @@
+--- ufsutils.orig/growfs.ufs/growfs.c
++++ ufsutils/growfs.ufs/growfs.c
+@@ -51,10 +51,10 @@
+ 
+ /* ********************************************************** INCLUDES ***** */
+ #include <sys/param.h>
++#define rounddown(x, y) (((x)/(y))*(y))
  #include <sys/disklabel.h>
  #include <sys/ioctl.h>
  #include <sys/stat.h>
@@ -11,7 +15,7 @@
  
  #include <stdio.h>
  #include <paths.h>
-@@ -1930,10 +1929,12 @@
+@@ -1929,10 +1929,12 @@
     int sectorsize;
     off_t mediasize;
  
@@ -24,7 +28,7 @@
  
     if (sectorsize <= 0)
         errx(1, "bogus sectorsize: %d", sectorsize);
-@@ -2289,9 +2290,11 @@
+@@ -2288,9 +2290,11 @@
  		}
  		lp->d_checksum=sum;
  
@@ -36,7 +40,7 @@
  	}
  	free(lp);
  
-@@ -2315,8 +2318,10 @@
+@@ -2314,8 +2318,10 @@
  	if (!lab)
  		errx(1, "malloc failed");
  
@@ -47,10 +51,10 @@
  
      unlabeled++;
  
-Index: uf-a/growfs.ufs/Makefile
+Index: ufsutils/growfs.ufs/Makefile
 ===================================================================
---- uf-a.orig/growfs.ufs/Makefile	2007-01-18 11:14:06.000000000 +0100
-+++ uf-a/growfs.ufs/Makefile	2007-01-18 11:14:17.000000000 +0100
+--- ufsutils.orig/growfs.ufs/Makefile
++++ ufsutils/growfs.ufs/Makefile
 @@ -6,14 +6,18 @@
  
  #GFSDBG=

Modified: trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_mkfs.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_mkfs.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/mkfs.ufs/mkfs.c ufsutils.new/mkfs.ufs/mkfs.c
---- ufsutils.orig/mkfs.ufs/mkfs.c	2004-04-09 21:58:33.000000000 +0200
-+++ ufsutils.new/mkfs.ufs/mkfs.c	2004-05-13 08:22:41.000000000 +0200
+Index: ufsutils/mkfs.ufs/mkfs.c
+===================================================================
+--- ufsutils.orig/mkfs.ufs/mkfs.c
++++ ufsutils/mkfs.ufs/mkfs.c
 @@ -53,6 +53,7 @@
  #include <stdint.h>
  #include <stdio.h>
@@ -10,9 +11,10 @@
  #include <sys/param.h>
  #include <sys/time.h>
  #include <sys/types.h>
-diff -Naur ufsutils.orig/mkfs.ufs/newfs.c ufsutils.new/mkfs.ufs/newfs.c
---- ufsutils.orig/mkfs.ufs/newfs.c	2004-04-09 21:58:34.000000000 +0200
-+++ ufsutils.new/mkfs.ufs/newfs.c	2004-06-29 22:43:50.000000000 +0200
+Index: ufsutils/mkfs.ufs/newfs.c
+===================================================================
+--- ufsutils.orig/mkfs.ufs/newfs.c
++++ ufsutils/mkfs.ufs/newfs.c
 @@ -55,7 +55,6 @@
   */
  #include <sys/param.h>
@@ -21,7 +23,7 @@
  #include <sys/disklabel.h>
  #include <sys/file.h>
  #include <sys/mount.h>
-@@ -137,6 +136,7 @@
+@@ -140,6 +139,7 @@
  static char	device[MAXPATHLEN];
  static char	*disktype;
  static int	unlabeled;
@@ -29,16 +31,16 @@
  
  static struct disklabel *getdisklabel(char *s);
  static void rewritelabel(char *s, struct disklabel *lp);
-@@ -153,6 +153,8 @@
+@@ -156,6 +156,8 @@
  	int ch, i;
  	off_t mediasize;
  
 +	progname = argv[0];
 +
  	while ((ch = getopt(argc, argv,
- 	    "EL:NO:RS:T:Ua:b:c:d:e:f:g:h:i:lm:o:s:")) != -1)
+ 	    "EJL:NO:RS:T:Ua:b:c:d:e:f:g:h:i:lm:no:s:")) != -1)
  		switch (ch) {
-@@ -286,12 +288,19 @@
+@@ -297,12 +299,19 @@
  	}
  	if (fstat(disk.d_fd, &st) < 0)
  		err(1, "%s", special);
@@ -59,7 +61,7 @@
  		if (fssize == 0)
  			fssize = mediasize / sectorsize;
  		else if (fssize > mediasize / sectorsize)
-@@ -364,7 +373,7 @@
+@@ -375,7 +384,7 @@
  			pp->p_size *= secperblk;
  	}
  	mkfs(pp, special);
@@ -68,7 +70,7 @@
  		if (realsectorsize != DEV_BSIZE)
  			pp->p_size /= realsectorsize / DEV_BSIZE;
  		if (!Nflag && bcmp(pp, &oldpartition, sizeof(oldpartition)))
-@@ -377,6 +386,7 @@
+@@ -388,6 +397,7 @@
  struct disklabel *
  getdisklabel(char *s)
  {
@@ -76,7 +78,7 @@
  	static struct disklabel lab;
  	struct disklabel *lp;
  
-@@ -388,6 +398,7 @@
+@@ -399,6 +409,7 @@
  		if (lp != NULL)
  			return (lp);
  	}
@@ -84,7 +86,7 @@
  	return (NULL);
  }
  
-@@ -398,8 +409,10 @@
+@@ -409,8 +420,10 @@
  		return;
  	lp->d_checksum = 0;
  	lp->d_checksum = dkcksum(lp);
@@ -95,7 +97,7 @@
  }
  
  static void
-@@ -407,7 +420,7 @@
+@@ -418,7 +431,7 @@
  {
  	fprintf(stderr,
  	    "usage: %s [ -fsoptions ] special-device%s\n",
@@ -103,10 +105,11 @@
 +	    progname,
  	    " [device-type]");
  	fprintf(stderr, "where fsoptions are:\n");
- 	fprintf(stderr, "\t-L volume label to add to superblock\n");
-diff -Naur ufsutils.orig/mkfs.ufs/Makefile ufsutils.new/mkfs.ufs/Makefile
---- ufsutils.orig/mkfs.ufs/Makefile	2003-02-11 04:06:45.000000000 +0100
-+++ ufsutils.new/mkfs.ufs/Makefile	2004-06-29 22:56:48.000000000 +0200
+ 	fprintf(stderr, "\t-J Enable journaling via gjournal\n");
+Index: ufsutils/mkfs.ufs/Makefile
+===================================================================
+--- ufsutils.orig/mkfs.ufs/Makefile
++++ ufsutils/mkfs.ufs/Makefile
 @@ -1,17 +1,20 @@
  #	@(#)Makefile	8.2 (Berkeley) 3/27/94
  # $FreeBSD: src/sbin/newfs/Makefile,v 1.22 2003/02/11 03:06:45 jmallett Exp $

Modified: trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_tunefs.ufs.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/02_tunefs.ufs.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/tunefs.ufs/tunefs.c ufsutils.new/tunefs.ufs/tunefs.c
---- ufsutils.orig/tunefs.ufs/tunefs.c	2004-04-09 21:58:40.000000000 +0200
-+++ ufsutils.new/tunefs.ufs/tunefs.c	2004-05-16 23:15:29.000000000 +0200
+Index: ufsutils/tunefs.ufs/tunefs.c
+===================================================================
+--- ufsutils.orig/tunefs.ufs/tunefs.c
++++ ufsutils/tunefs.ufs/tunefs.c
 @@ -48,8 +48,15 @@
  #include <sys/mount.h>
  #include <sys/disklabel.h>
@@ -31,7 +32,7 @@
  
  	if (argc < 3)
  		usage();
-@@ -228,9 +239,11 @@
+@@ -241,9 +252,11 @@
  		goto err;
  	if (disk.d_name != special) {
  		special = disk.d_name;
@@ -43,7 +44,7 @@
  	}
  
  	if (pflag) {
-@@ -369,6 +382,7 @@
+@@ -402,6 +415,7 @@
  	if (sbwrite(&disk, Aflag) == -1)
  		goto err;
  	ufs_disk_close(&disk);
@@ -51,7 +52,7 @@
  	if (active) {
  		bzero(&args, sizeof(args));
  		if (mount("ufs", on,
-@@ -376,6 +390,7 @@
+@@ -409,6 +423,7 @@
  			err(9, "%s: reload", special);
  		warnx("file system reloaded");
  	}
@@ -59,9 +60,10 @@
  	exit(0);
  err:
  	if (disk.d_error != NULL)
-diff -Naur ufsutils.orig/tunefs.ufs/Makefile ufsutils.new/tunefs.ufs/Makefile
---- ufsutils.orig/tunefs.ufs/Makefile	2003-01-23 09:15:05.000000000 +0100
-+++ ufsutils.new/tunefs.ufs/Makefile	2004-05-16 21:39:19.000000000 +0200
+Index: ufsutils/tunefs.ufs/Makefile
+===================================================================
+--- ufsutils.orig/tunefs.ufs/Makefile
++++ ufsutils/tunefs.ufs/Makefile
 @@ -1,9 +1,12 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
  # $FreeBSD: src/sbin/tunefs/Makefile,v 1.8 2003/01/23 08:15:05 ru Exp $

Modified: trunk/ufsutils/debian/patches/03_ufsmount.patch
===================================================================
--- trunk/ufsutils/debian/patches/03_ufsmount.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/03_ufsmount.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils/include/ufs/ufs/ufsmount.h ufsutils/include/ufs/ufs/ufsmount.h
---- ufsutils/include/ufs/ufs/ufsmount.h	2007-01-18 14:08:22.000000000 +0100
-+++ ufsutils/include/ufs/ufs/ufsmount.h	2007-01-18 14:08:22.000000000 +0100
+Index: ufsutils/include/ufs/ufs/ufsmount.h
+===================================================================
+--- ufsutils.orig/include/ufs/ufs/ufsmount.h
++++ ufsutils/include/ufs/ufs/ufsmount.h
 @@ -33,8 +33,6 @@
  #ifndef _UFS_UFS_UFSMOUNT_H_
  #define _UFS_UFS_UFSMOUNT_H_

Modified: trunk/ufsutils/debian/patches/99_makefiles.patch
===================================================================
--- trunk/ufsutils/debian/patches/99_makefiles.patch	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/patches/99_makefiles.patch	2007-12-07 21:47:16 UTC (rev 2063)
@@ -1,7 +1,8 @@
 #DPATCHLEVEL=1
-diff -Naur ufsutils.orig/Makefile ufsutils.new/Makefile
---- ufsutils.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/Makefile	2004-05-03 12:38:33.000000000 +0200
+Index: ufsutils/Makefile
+===================================================================
+--- /dev/null
++++ ufsutils/Makefile
 @@ -0,0 +1,28 @@
 +#
 +# ufsutils Makefile
@@ -31,10 +32,11 @@
 +
 +.PHONY: all clean install $(SUBDIRS) $(clean_targets) $(install_targets)
 +
-diff -Naur ufsutils.orig/Makefile.common ufsutils.new/Makefile.common
---- ufsutils.orig/Makefile.common	1970-01-01 01:00:00.000000000 +0100
-+++ ufsutils.new/Makefile.common	2004-05-16 23:17:22.000000000 +0200
-@@ -0,0 +1,90 @@
+Index: ufsutils/Makefile.common
+===================================================================
+--- /dev/null
++++ ufsutils/Makefile.common
+@@ -0,0 +1,92 @@
 +#
 +# $Id: Makefile.common 45 2004-05-03 11:07:29Z guillem $
 +#
@@ -47,8 +49,10 @@
 +mandir = $(datadir)/man
 +man8dir = $(mandir)/man8
 +
++LDADD += -lbsd -lfreebsd
 +CFLAGS ?= -Wall -g -O2
 +ALL_CFLAGS += -I../include -include port/port.h -D_GNU_SOURCE
++# -DHAVE_BSD_ERRNO -DHAVE_BSD_SIGNALS -DHAVE_BSD_STATFS -DHAVE_BSD_DISKLABEL -DHAVE_BSD_MOUNT -DHAVE_UFS_SNAPSHOT -DHAVE_BSD_SYSCTL
 +
 +INSTALL = install
 +INSTALL_PROG = $(INSTALL)

Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/rules	2007-12-07 21:47:16 UTC (rev 2063)
@@ -21,12 +21,6 @@
 CFLAGS += -D_FILE_OFFSET_BITS=64
 endif
 
-# on GNU/kFreeBSD every feature should be available
-ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
-CFLAGS += -DHAVE_BSD_ERRNO -DHAVE_BSD_SIGNALS -DHAVE_BSD_STATFS
-# not yet: -DHAVE_BSD_DISKLABEL -DHAVE_BSD_MOUNT -DHAVE_UFS_SNAPSHOT -DHAVE_BSD_SYSCTL
-endif
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else

Modified: trunk/ufsutils/debian/upstream.sh
===================================================================
--- trunk/ufsutils/debian/upstream.sh	2007-12-07 18:32:38 UTC (rev 2062)
+++ trunk/ufsutils/debian/upstream.sh	2007-12-07 21:47:16 UTC (rev 2063)
@@ -17,14 +17,15 @@
 	src/sbin/bsdlabel:bsdlabel \
 	src/sbin/sunlabel:sunlabel \
 	src/sbin/ffsinfo:ffsinfo \
+	src/sbin/mount:mount \
 	src/lib/libufs:libufs \
 	src/sys/ufs:include"
 
 include_files=" \
-	src/sys/sys/disklabel.h:include/sys \
-	src/sys/sys/mount.h:include/sys \
-	src/sys/sys/param.h:include/sys \
-	src/sys/sys/ucred.h:include/sys"
+	src/sys/sys/disklabel.h:freebsd/sys \
+	src/sys/sys/mount.h:freebsd/sys \
+	src/sys/sys/param.h:freebsd/sys \
+	src/sys/sys/ucred.h:freebsd/sys"
 	
 libc_files=" \
 	src/lib/libc/gen/arc4random.c:libport \
@@ -64,9 +65,9 @@
 
 cvs -z3 -d $ANONCVS co -r $RELENG $repos
 
-rm -rf badsect.ufs bsdlabel dump.ufs dumpfs.ufs ffsinfo fsck.ufs fsdb.ufs growfs.ufs include libufs libport mkfs.ufs sunlabel tunefs.ufs libdisklabel
+rm -rf badsect.ufs bsdlabel dump.ufs dumpfs.ufs ffsinfo freebsd fsck.ufs fsdb.ufs growfs.ufs include libufs libport mkfs.ufs sunlabel tunefs.ufs libdisklabel
 
-mkdir -p include/sys libport
+mkdir -p include libport freebsd/sys
 
 echo "-> Moving upstream sources to the proper place ..."
 move_repo $srcs

More information about the Glibc-bsd-commits mailing list