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

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2009-01-05 12:55:24 +0000 (Mon, 05 Jan 2009)
New Revision: 2337

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/00_mount.patch
   trunk/ufsutils/debian/upstream.sh
Log:
* ufsutils - new upstream version (RELENG_7_1_0_RELEASE), target experimental as lenny is close



Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2009-01-05 11:00:08 UTC (rev 2336)
+++ trunk/ufsutils/debian/changelog	2009-01-05 12:55:24 UTC (rev 2337)
@@ -1,3 +1,11 @@
+ufsutils (7.1-1) experimental; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream version (RELENG_7_1_0_RELEASE)
+  * Target experimental as lenny is close
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 05 Jan 2009 13:13:13 +0100
+
 ufsutils (7.0-2) unstable; urgency=low
 
   * debian/patches/01_libufs.patch Link libufs with libbsd.

Modified: trunk/ufsutils/debian/patches/00_mount.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_mount.patch	2009-01-05 11:00:08 UTC (rev 2336)
+++ trunk/ufsutils/debian/patches/00_mount.patch	2009-01-05 12:55:24 UTC (rev 2337)
@@ -3,26 +3,26 @@
 ===================================================================
 --- ufsutils.orig/freebsd/sys/mount.h
 +++ ufsutils/freebsd/sys/mount.h
-@@ -34,14 +34,11 @@
+@@ -34,14 +34,10 @@
  #define _SYS_MOUNT_H_
  
  #include <sys/ucred.h>
 -#include <sys/queue.h>
 -#ifdef _KERNEL
+-#include <sys/lock.h>
 -#include <sys/lockmgr.h>
--#include <sys/_lock.h>
 -#include <sys/_mutex.h>
 -#endif
+-
+-typedef struct fsid { int32_t val[2]; } fsid_t;	/* filesystem id type */
 +#include <stdint.h>
 +#include <sys/vfs.h>
 +#include <sys/types.h>
 +#include <sys/socket.h>
  
--typedef struct fsid { int32_t val[2]; } fsid_t;	/* filesystem id type */
- 
  /*
   * File identifier.
-@@ -60,6 +57,7 @@
+@@ -60,6 +56,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 +207,7 @@
+@@ -210,6 +207,7 @@
  } while (0)
  
  #endif /* _KERNEL */
@@ -38,7 +38,7 @@
  
  /*
   * User specifiable flags.
-@@ -383,6 +382,7 @@
+@@ -384,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 +420,7 @@
+@@ -421,6 +420,7 @@
  	int	vfc_flags;
  };
  #endif
@@ -54,7 +54,7 @@
  
  /*
   * NB: these flags refer to IMPLEMENTATION properties, not properties of
-@@ -484,6 +485,7 @@
+@@ -485,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 +741,5 @@
+@@ -741,5 +742,5 @@
  __END_DECLS
  
  #endif /* _KERNEL */

Modified: trunk/ufsutils/debian/upstream.sh
===================================================================
--- trunk/ufsutils/debian/upstream.sh	2009-01-05 11:00:08 UTC (rev 2336)
+++ trunk/ufsutils/debian/upstream.sh	2009-01-05 12:55:24 UTC (rev 2337)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_0_0_RELEASE
+RELENG=RELENG_7_1_0_RELEASE
 
 srcs=" \
 	src/sbin/badsect:badsect.ufs \